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

[Antonio Rojas]

    Date: Friday, December 14, 2018 @ 20:09:47
  Author: arojas
Revision: 342349

Fix build with poppler 0.72

Added:
  libreoffice-still/trunk/libreoffice-poppler-0.72.patch
Modified:
  libreoffice-still/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |    4 ++++
 libreoffice-poppler-0.72.patch |   20 ++++++++++++++++++++
 2 files changed, 24 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-14 20:06:30 UTC (rev 342348)
+++ PKGBUILD	2018-12-14 20:09:47 UTC (rev 342349)
@@ -57,6 +57,7 @@
 	make-pyuno-work-with-system-wide-module-install.diff
 	poppler-0.70.patch
         libreoffice-poppler-0.71.patch
+        libreoffice-poppler-0.72.patch
 	emfio.patch
 	libreoffice-still.sh libreoffice-still.csh)
 noextract=(boost_1_65_1.tar.bz2
@@ -102,6 +103,7 @@
             'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
             '4cac21ffdb711803c0d5372c6b0ba04f1310afa7907081fdd01c11e68c1785bf'
             'ffe1698d3db3320a9213a459e7619f4962c9792a8b256ea0fe2b7e0af1df430a'
+            'dc8b5b0d1a4a1fed4f5cab048cd7ecd78630725458311bcbfe0a660c82357b49'
             '8b4815788be087940750b775690b5890c4cf9e121f11006a72ccab834f212abb'
             '52e90a5a3d8d5b626caa51675b601aba508463c2b9caa98d07cfa35220fc0b22'
             '531de4133cb6ff5c841e4251fdafe69521ccd195f5933eb8c113291d3eff183a')
@@ -143,6 +145,8 @@
 	patch -Np1 -i ../poppler-0.70.patch
         # fix build with poppler 0.71
         patch -p1 -i ../libreoffice-poppler-0.71.patch
+        # fix build with poppler 0.72
+        patch -p1 -i ../libreoffice-poppler-0.72.patch
 
 	#use the CFLAGS but remove the LibO overridden ones
 	for i in $CFLAGS; do

Added: libreoffice-poppler-0.72.patch
===================================================================
--- libreoffice-poppler-0.72.patch	                        (rev 0)
+++ libreoffice-poppler-0.72.patch	2018-12-14 20:09:47 UTC (rev 342349)
@@ -0,0 +1,20 @@
+--- libreoffice-6.1.3.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig	2018-12-14 20:04:01.633697240 +0000
++++ libreoffice-6.1.3.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	2018-12-14 20:04:18.020410653 +0000
+@@ -555,7 +555,7 @@
+     LinkAction* pAction = link->getAction();
+     if (pAction && pAction->getKind() == actionURI)
+     {
+-        const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
++        const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
+ 
+         std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) );
+ 
+@@ -757,7 +757,7 @@
+ 
+             aFont = it->second;
+ 
+-            std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) );
++            std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) );
+             printf( " %d %d %d %d %f %d %s",
+                     aFont.isEmbedded,
+                     aFont.isBold,