summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-05-02 00:39:17 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-05-08 18:59:33 +0200
commit2a4647be178539e6fd9882b37212e2c58b8128dc (patch)
tree83169c70f5daccb3b48307fe27e68e078ef0e0dd /app-office/scribus
parentsci-libs/gdal: Fix build with poppler-0.75 and poppler-0.76 (diff)
downloadgentoo-2a4647be178539e6fd9882b37212e2c58b8128dc.tar.gz
gentoo-2a4647be178539e6fd9882b37212e2c58b8128dc.tar.bz2
gentoo-2a4647be178539e6fd9882b37212e2c58b8128dc.zip
app-office/scribus: Fix build against poppler-0.76
Package-Manager: Portage-2.3.66, Repoman-2.3.12 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_pre20190429-poppler-0.76.patch59
-rw-r--r--app-office/scribus/scribus-1.5.5_pre20190429.ebuild2
2 files changed, 61 insertions, 0 deletions
diff --git a/app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch b/app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch
new file mode 100644
index 00000000000..d62db93663e
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch
@@ -0,0 +1,59 @@
+From aeea6a2ed4cb15ce8c35bb83066ef03e4e04b29b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 2 May 2019 00:08:12 +0200
+Subject: [PATCH] Fix build with poppler-0.76
+
+findPage(int num, int gen) -> findPage(const Ref ref)
+
+https://gitlab.freedesktop.org/poppler/poppler/commit/244c7d6926463b079b1f96e34d9e4451d352942e
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index fe9794a65..b25082de6 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -429,8 +429,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
+ {
+ if (dst->isPageRef())
+ {
+- Ref dstr = dst->getPageRef();
+- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
++ pagNum = pdfDoc->findPage(dst->getPageRef());
+ }
+ else
+ pagNum = dst->getPageNum();
+@@ -451,8 +450,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
+ {
+ if (dstn->isPageRef())
+ {
+- Ref dstr = dstn->getPageRef();
+- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
++ pagNum = pdfDoc->findPage(dstn->getPageRef());
+ }
+ else
+ pagNum = dstn->getPageNum();
+@@ -931,8 +929,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ {
+ if (dst->isPageRef())
+ {
+- Ref dstr = dst->getPageRef();
+- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
++ pagNum = pdfDoc->findPage(dst->getPageRef());
+ }
+ else
+ pagNum = dst->getPageNum();
+@@ -955,8 +952,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ {
+ if (dstn->isPageRef())
+ {
+- Ref dstr = dstn->getPageRef();
+- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
++ pagNum = pdfDoc->findPage(dstn->getPageRef());
+ }
+ else
+ pagNum = dstn->getPageNum();
+--
+2.21.0
+
diff --git a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
index f11d0cd0983..a889616acc0 100644
--- a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
@@ -122,6 +122,8 @@ src_prepare() {
-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
+ has_version ">=app-text/poppler-0.76.0" PATCHES+=( "${FILESDIR}"/${P}-poppler-0.76.patch )
+
cmake-utils_src_prepare
}