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>

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 (file)
index 0000000..d62db93
--- /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
+                       {\r
+                               if (dst->isPageRef())\r
+                               {\r
+-                                      Ref dstr = dst->getPageRef();\r
+-                                      pagNum = pdfDoc->findPage(dstr.num, dstr.gen);\r
++                                      pagNum = pdfDoc->findPage(dst->getPageRef());\r
+                               }\r
+                               else\r
+                                       pagNum = dst->getPageNum();\r
+@@ -451,8 +450,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
+                                       {\r
+                                               if (dstn->isPageRef())\r
+                                               {\r
+-                                                      Ref dstr = dstn->getPageRef();\r
+-                                                      pagNum = pdfDoc->findPage(dstr.num, dstr.gen);\r
++                                                      pagNum = pdfDoc->findPage(dstn->getPageRef());\r
+                                               }\r
+                                               else\r
+                                                       pagNum = dstn->getPageNum();\r
+@@ -931,8 +929,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+                               {\r
+                                       if (dst->isPageRef())\r
+                                       {\r
+-                                              Ref dstr = dst->getPageRef();\r
+-                                              pagNum = pdfDoc->findPage(dstr.num, dstr.gen);\r
++                                              pagNum = pdfDoc->findPage(dst->getPageRef());\r
+                                       }\r
+                                       else\r
+                                               pagNum = dst->getPageNum();\r
+@@ -955,8 +952,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+                                               {\r
+                                                       if (dstn->isPageRef())\r
+                                                       {\r
+-                                                              Ref dstr = dstn->getPageRef();\r
+-                                                              pagNum = pdfDoc->findPage(dstr.num, dstr.gen);\r
++                                                              pagNum = pdfDoc->findPage(dstn->getPageRef());\r
+                                                       }\r
+                                                       else\r
+                                                               pagNum = dstn->getPageNum();\r
+-- 
+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 f11d0cd098366b6e8ec7cc28de104dd1996e6fe1..a889616acc01456afef9ffdccfa3ac11085f234e 100644 (file)
--- 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
 }