| 1 |
commit: 4ffdbba60050b08a2f1546481e699b65c69e1529 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 2 20:00:57 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 2 20:26:42 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ffdbba6 |
| 7 |
|
| 8 |
app-office/scribus: Fix build with app-text/poppler-0.84.0 |
| 9 |
|
| 10 |
Reported-by: Erik Zeek <zeekec <AT> gmail.com> |
| 11 |
Thanks-to: Julien Papasian <julien.papasian <AT> gmail.com> |
| 12 |
Closes: https://bugs.gentoo.org/704482 |
| 13 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
.../scribus/files/scribus-1.5.5-poppler-0.84.patch | 34 ++++++++++++++++++++++ |
| 17 |
app-office/scribus/scribus-1.5.5.ebuild | 3 +- |
| 18 |
2 files changed, 36 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
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 |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..de1f39411e8 |
| 23 |
--- /dev/null |
| 24 |
+++ b/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch |
| 25 |
@@ -0,0 +1,34 @@ |
| 26 |
+From 3742559924136c2471ab15081c5b600dd5feaeb0 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Jean Ghali <jghali@×××××××××××.fr> |
| 28 |
+Date: Sat, 28 Dec 2019 21:32:29 +0000 |
| 29 |
+Subject: [PATCH] Fix failure to build with poppler 0.84.0 |
| 30 |
+ |
| 31 |
+git-svn-id: svn://scribus.net/trunk/Scribus@23429 11d20701-8431-0410-a711-e3c959e3b870 |
| 32 |
+--- |
| 33 |
+ scribus/plugins/import/pdf/slaoutput.cpp | 6 ++++++ |
| 34 |
+ 1 file changed, 6 insertions(+) |
| 35 |
+ |
| 36 |
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp |
| 37 |
+index ffcfa8450b..d788f9f06c 100644 |
| 38 |
+--- a/scribus/plugins/import/pdf/slaoutput.cpp |
| 39 |
++++ b/scribus/plugins/import/pdf/slaoutput.cpp |
| 40 |
+@@ -1189,6 +1189,11 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA) |
| 41 |
+ catalog = catA; |
| 42 |
+ pdfDoc = doc; |
| 43 |
+ updateGUICounter = 0; |
| 44 |
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 84, 0) |
| 45 |
++ m_fontEngine = new SplashFontEngine(true, true, true, true); |
| 46 |
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 61, 0) |
| 47 |
++ m_fontEngine = new SplashFontEngine(globalParams->getEnableFreeType(), true, true, true); |
| 48 |
++#else |
| 49 |
+ m_fontEngine = new SplashFontEngine( |
| 50 |
+ #if HAVE_T1LIB_H |
| 51 |
+ globalParams->getEnableT1lib(), |
| 52 |
+@@ -1199,6 +1204,7 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA) |
| 53 |
+ true, |
| 54 |
+ #endif |
| 55 |
+ true); |
| 56 |
++#endif |
| 57 |
+ } |
| 58 |
+ |
| 59 |
+ void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *) |
| 60 |
|
| 61 |
diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild |
| 62 |
index cd725acf6b8..88bcd5cc441 100644 |
| 63 |
--- a/app-office/scribus/scribus-1.5.5.ebuild |
| 64 |
+++ b/app-office/scribus/scribus-1.5.5.ebuild |
| 65 |
@@ -1,4 +1,4 @@ |
| 66 |
-# Copyright 1999-2019 Gentoo Authors |
| 67 |
+# Copyright 1999-2020 Gentoo Authors |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
|
| 70 |
EAPI=7 |
| 71 |
@@ -70,6 +70,7 @@ PATCHES=( |
| 72 |
# upstream svn trunk |
| 73 |
"${FILESDIR}"/${P}-poppler-0.82.patch |
| 74 |
"${FILESDIR}"/${P}-poppler-0.83.patch |
| 75 |
+ "${FILESDIR}"/${P}-poppler-0.84.patch |
| 76 |
# non(?)-upstreamable |
| 77 |
"${FILESDIR}"/${PN}-1.5.3-fpic.patch |
| 78 |
"${FILESDIR}"/${P}-docdir.patch |
Archives