summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2022-02-10 20:37:43 +0100
committerMiroslav Šulc <fordfrog@gentoo.org>2022-02-10 20:37:43 +0100
commita7e4e34c72ef8b2df011b995ba3c85fac10a5394 (patch)
tree521f390e276d8fc086f14ed5e24e4b9a97adeeec /app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-2.patch
parentx11-misc/xautolock: drop project desktop-misc (diff)
downloadgentoo-a7e4e34c72ef8b2df011b995ba3c85fac10a5394.tar.gz
gentoo-a7e4e34c72ef8b2df011b995ba3c85fac10a5394.tar.bz2
gentoo-a7e4e34c72ef8b2df011b995ba3c85fac10a5394.zip
app-office/scribus: added patches for poppler 2.22.0
Bug: https://bugs.gentoo.org/833086 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-2.patch')
-rw-r--r--app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-2.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-2.patch b/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-2.patch
new file mode 100644
index 000000000000..73beac2d70d0
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-2.patch
@@ -0,0 +1,28 @@
+From f75c1613db67f4067643d0218a2db3235e42ec9f Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Thu, 3 Feb 2022 19:46:13 +0000
+Subject: [PATCH] Small update vs latest code in poppler
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24885 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index 3650c96f52..a6f4e00fa9 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -3072,10 +3072,10 @@ void SlaOutputDev::updateFont(GfxState *state)
+ delete id;
+ else
+ {
+- if (!(fontLoc = gfxFont->locateFont(xref, nullptr)))
++ fontLoc = gfxFont->locateFont((xref) ? xref : pdfDoc->getXRef(), nullptr);
++ if (!fontLoc)
+ {
+- error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+