Accepting request 667058 from home:iznogood:branches:LibreOffice:Factory

- Replace libreoffice-poppler-0.71.patch with
  libreoffice-poppler-0.72.patch and apply it conditionally. Fix
  build with poppler 0.72.

OBS-URL: https://build.opensuse.org/request/show/667058
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=738

libreoffice-poppler-0.72.patch

@@ -1,3 +1,49 @@
+From 557ee0a0f4e40b934c72515f41f3a605803ddb1d Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Wed, 24 Oct 2018 17:48:53 +0300
+Subject: [PATCH] fix build with poppler 0.70
+
+---
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++++
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index 575a90acb..99219f7e6 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -578,7 +578,11 @@ void PDFOutDev::restoreState(GfxState*)
+     printf( "restoreState\n" );
+ }
+ 
++#if POPPLER_CHECK_VERSION(0, 70, 0)
++void PDFOutDev::setDefaultCTM(const double *pMat)
++#else
+ void PDFOutDev::setDefaultCTM(double *pMat)
++#endif
+ {
+     assert(pMat);
+ 
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index da021a2a0..27440f2bb 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -166,7 +166,11 @@ namespace pdfi
+         //----- initialization and control
+ 
+         // Set default transform matrix.
++#if POPPLER_CHECK_VERSION(0, 70, 0)
++        virtual void setDefaultCTM(const double *ctm) override;
++#else
+         virtual void setDefaultCTM(double *ctm) override;
++#endif
+ 
+         // Start a page.
+         virtual void startPage(int pageNum, GfxState *state
+-- 
+2.19.1
+
+
 diff -ru libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.cxx libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
 --- libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.cxx	2018-11-01 20:43:55.802520387 +0000
 +++ libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	2018-11-01 20:44:33.399286879 +0000
@@ -167,3 +213,26 @@ diff -ru libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl
          rDoc.processLinks(&aOutDev, i);
      }
 
+
+--- 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,
+
+

libreoffice.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 18 20:41:07 UTC 2019 - bjorn.lie@gmail.com
+
+- Replace libreoffice-poppler-0.71.patch with
+  libreoffice-poppler-0.72.patch and apply it conditionally. Fix
+  build with poppler 0.72.
+
 -------------------------------------------------------------------
 Fri Dec 21 15:01:49 UTC 2018 - Andras Timar <andras.timar@collabora.com>
 

libreoffice.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libreoffice
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -105,8 +105,8 @@ Patch4:         libreoffice-java-sched.patch
 Patch5:         old-boost.patch
 Patch6:         0001-call-System.runFinalizersOnExit-by-reflection-since-.patch
 Patch11:        boost_1_69.patch
-# PATCH-FIX-UPSTREAM libreoffice-poppler-0.71.patch -- Fix build with poppler 0.71
+# PATCH-FIX-UPSTREAM libreoffice-poppler-0.72.patch -- Fix build with poppler 0.72
-Patch12:        libreoffice-poppler-0.71.patch
+Patch12:        libreoffice-poppler-0.72.patch
 # [Bug 1112113] LO-L3: [PPTX] SmartArt: Basic rendering of Accent Process and Continuous Block Process
 Patch13:        bsc1112113.patch
 # try to save space by using hardlinks
@@ -956,7 +956,9 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %patch4 -p1
 %patch6 -p1
 %patch11 -p1
+if pkg-config --atleast-version=0.72 poppler; then
 %patch12 -p1
+fi
 %patch13 -p1
 %patch990 -p1