diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2023-04-24 21:16:02 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2023-04-25 06:17:16 +0200 |
| commit | 8495069bed0d51a21ff609f7036ff40d73ff07a8 (patch) | |
| tree | f79ef32faa8b73823c89fab25dcc333628427f17 /gnu/packages/patches/scribus-1.5.8-poppler-22.2.0-2.patch | |
| parent | 7fc2c442c85aefe21e61502f50b27651b043b5cd (diff) | |
| download | guix-8495069bed0d51a21ff609f7036ff40d73ff07a8.tar.gz guix-8495069bed0d51a21ff609f7036ff40d73ff07a8.zip | |
gnu: scribus: Fix build with latest poppler.
* gnu/packages/patches/scribus-1.5.8-poppler-22.03.0.patch,
gnu/packages/patches/scribus-1.5.8-poppler-22.04.0.patch,
gnu/packages/patches/scribus-1.5.8-poppler-22.09.0.patch,
gnu/packages/patches/scribus-1.5.8-poppler-22.2.0-1.patch,
gnu/packages/patches/scribus-1.5.8-poppler-22.2.0-2.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/scribus.scm (scribus)[source]: Add patches.
[arguments]: Enable WANT_CPP17 option.
Diffstat (limited to 'gnu/packages/patches/scribus-1.5.8-poppler-22.2.0-2.patch')
| -rw-r--r-- | gnu/packages/patches/scribus-1.5.8-poppler-22.2.0-2.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/gnu/packages/patches/scribus-1.5.8-poppler-22.2.0-2.patch b/gnu/packages/patches/scribus-1.5.8-poppler-22.2.0-2.patch new file mode 100644 index 0000000000..73beac2d70 --- /dev/null +++ b/gnu/packages/patches/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;
+ }
+
|