[arch-commits] Commit in libreoffice-fresh/trunk (2 files)

[Antonio Rojas]

    Date: Sunday, March 1, 2020 @ 09:49:59
  Author: arojas
Revision: 376445

Fix build with poppler 0.86

Added:
  libreoffice-fresh/trunk/libreoffice-poppler-0.86.patch
Modified:
  libreoffice-fresh/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |    8 ++++++--
 libreoffice-poppler-0.86.patch |   15 +++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-01 09:21:26 UTC (rev 376444)
+++ PKGBUILD	2020-03-01 09:49:59 UTC (rev 376445)
@@ -57,7 +57,8 @@
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	make-pyuno-work-with-system-wide-module-install.diff
 	soffice-template.desktop.in 
-	libreoffice-fresh.sh libreoffice-fresh.csh)
+	libreoffice-fresh.sh libreoffice-fresh.csh
+        libreoffice-poppler-0.86.patch)
 noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
            798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
            a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@@ -101,12 +102,15 @@
             'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
             'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
             'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a'
-            'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1')
+            'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1'
+            'f52ef5d64d7a74ca90bc96614260566720130d91f3764874eac673f6b3336b5e')
 
 prepare() {
 
 	cd libreoffice-$_LOver
 
+        patch -p1 -i ../libreoffice-poppler-0.86.patch # Fix build with poppler 0.86
+
 	# move external sources into place
 	mkdir "${srcdir}"/ext_sources && pushd "${srcdir}"/ext_sources
 	for source in "${noextract[@]}"; do

Added: libreoffice-poppler-0.86.patch
===================================================================
--- libreoffice-poppler-0.86.patch	                        (rev 0)
+++ libreoffice-poppler-0.86.patch	2020-03-01 09:49:59 UTC (rev 376445)
@@ -0,0 +1,15 @@
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index e9c2a407c279..16ad04bf660a 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
+     if (!(pAction && pAction->getKind() == actionURI))
+         return;
+ 
+-#if POPPLER_CHECK_VERSION(0, 72, 0)
++#if POPPLER_CHECK_VERSION(0, 86, 0)
++    const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str();
++#elif POPPLER_CHECK_VERSION(0, 72, 0)
+     const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
+ #else
+     const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();