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

[Antonio Rojas]

    Date: Friday, December 14, 2018 @ 20:06:30
  Author: arojas
Revision: 342348

Fix build with poppler 0.72

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-14 20:02:34 UTC (rev 342347)
+++ PKGBUILD	2018-12-14 20:06:30 UTC (rev 342348)
@@ -56,6 +56,7 @@
 	make-pyuno-work-with-system-wide-module-install.diff
 	poppler-0.70.patch
         libreoffice-poppler-0.71.patch
+        libreoffice-poppler-0.72.patch
 	0001-Update-mdds-to-1.4.1.patch
 	0001-Update-orcus-to-0.14.0.patch
 	libreoffice-fresh.sh libreoffice-fresh.csh)
@@ -99,6 +100,7 @@
             'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
             '4cac21ffdb711803c0d5372c6b0ba04f1310afa7907081fdd01c11e68c1785bf'
             'ffe1698d3db3320a9213a459e7619f4962c9792a8b256ea0fe2b7e0af1df430a'
+            'dc8b5b0d1a4a1fed4f5cab048cd7ecd78630725458311bcbfe0a660c82357b49'
             '8e8460302a7febc9a29b32b98fb77c85910ccadc65c73e0e9997dc5aabaaeb2a'
             '60560283a5e22acad7f341b16dff4a654559b36db5d49b1e59f3bb9ae9b2336c'
             '28c97effbe55e43a1370ab141c676cec9daba9e3dc408bec78136dfefc892a8b'
@@ -132,6 +134,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
 
 	# fix build with new mdds 1.4.x, liborcus 0.14.x
 #	sed -i "s:mdds-1.2 >= 1.2.3:mdds-1.4 >= 1.4.2:" configure.ac

Added: libreoffice-poppler-0.72.patch
===================================================================
--- libreoffice-poppler-0.72.patch	                        (rev 0)
+++ libreoffice-poppler-0.72.patch	2018-12-14 20:06:30 UTC (rev 342348)
@@ -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,