diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-09 07:46:25 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-09 07:46:25 +0100 |
| commit | 058532bdd8953feefbd84fd7514822886c7f1a7e (patch) | |
| tree | dd29b23b04df1e30a03b93d53a339f6fcd817285 /gnu/packages/patches/scribus-1.5.8-poppler-22.2.0-2.patch | |
| parent | 19fc252ab7e86ad1443a8d16f68467c61bf23179 (diff) | |
| parent | 1bc05c6f6d56ad9e0e31d7f1cc75545a65e3d0f3 (diff) | |
| download | guix-058532bdd8953feefbd84fd7514822886c7f1a7e.tar.gz guix-058532bdd8953feefbd84fd7514822886c7f1a7e.zip | |
Merge branch 'master' into emacs-team
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, 0 insertions, 28 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 deleted file mode 100644 index 73beac2d70..0000000000 --- a/gnu/packages/patches/scribus-1.5.8-poppler-22.2.0-2.patch +++ /dev/null @@ -1,28 +0,0 @@ -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;
- }
-
|