commit: 4ffdbba60050b08a2f1546481e699b65c69e1529 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jan 2 20:00:57 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jan 2 20:26:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ffdbba6
app-office/scribus: Fix build with app-text/poppler-0.84.0 Reported-by: Erik Zeek <zeekec <AT> gmail.com> Thanks-to: Julien Papasian <julien.papasian <AT> gmail.com> Closes: https://bugs.gentoo.org/704482 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../scribus/files/scribus-1.5.5-poppler-0.84.patch | 34 ++++++++++++++++++++++ app-office/scribus/scribus-1.5.5.ebuild | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) 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 00000000000..de1f39411e8 --- /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 <[email protected]> +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 cd725acf6b8..88bcd5cc441 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
