diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-01-02 21:00:57 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-01-02 21:26:42 +0100 |
| commit | 4ffdbba60050b08a2f1546481e699b65c69e1529 (patch) | |
| tree | a56a83224ed2147eef17e1422d7b6335a078353f /app-office/scribus | |
| parent | sci-chemistry/gromacs: Version bump (diff) | |
| download | gentoo-4ffdbba60050b08a2f1546481e699b65c69e1529.tar.gz gentoo-4ffdbba60050b08a2f1546481e699b65c69e1529.tar.bz2 gentoo-4ffdbba60050b08a2f1546481e699b65c69e1529.zip | |
app-office/scribus: Fix build with app-text/poppler-0.84.0
Reported-by: Erik Zeek <zeekec@gmail.com>
Thanks-to: Julien Papasian <julien.papasian@gmail.com>
Closes: https://bugs.gentoo.org/704482
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-office/scribus')
| -rw-r--r-- | app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch | 34 | ||||
| -rw-r--r-- | app-office/scribus/scribus-1.5.5.ebuild | 3 |
2 files changed, 36 insertions, 1 deletions
diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch b/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch new file mode 100644 index 000000000000..de1f39411e8e --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch @@ -0,0 +1,34 @@ +From 3742559924136c2471ab15081c5b600dd5feaeb0 Mon Sep 17 00:00:00 2001 +From: Jean Ghali <jghali@libertysurf.fr> +Date: Sat, 28 Dec 2019 21:32:29 +0000 +Subject: [PATCH] Fix failure to build with poppler 0.84.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@23429 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/slaoutput.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index ffcfa8450b..d788f9f06c 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -1189,6 +1189,11 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA) + catalog = catA;
+ pdfDoc = doc;
+ updateGUICounter = 0;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 84, 0)
++ m_fontEngine = new SplashFontEngine(true, true, true, true);
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 61, 0)
++ m_fontEngine = new SplashFontEngine(globalParams->getEnableFreeType(), true, true, true);
++#else
+ m_fontEngine = new SplashFontEngine(
+ #if HAVE_T1LIB_H
+ globalParams->getEnableT1lib(),
+@@ -1199,6 +1204,7 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA) + true,
+ #endif
+ true);
++#endif
+ }
+
+ void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *)
diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild index cd725acf6b87..88bcd5cc4410 100644 --- a/app-office/scribus/scribus-1.5.5.ebuild +++ b/app-office/scribus/scribus-1.5.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -70,6 +70,7 @@ PATCHES=( # upstream svn trunk "${FILESDIR}"/${P}-poppler-0.82.patch "${FILESDIR}"/${P}-poppler-0.83.patch + "${FILESDIR}"/${P}-poppler-0.84.patch # non(?)-upstreamable "${FILESDIR}"/${PN}-1.5.3-fpic.patch "${FILESDIR}"/${P}-docdir.patch |