From fb6e837ff92de03b6b27fea629e483495abd565e Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Fri, 17 Jan 2020 12:34:06 +0100 Subject: [PATCH] Rebuild for poppler-0.84.0 --- 0001-Fix-build-with-poppler-0.83.patch | 73 ++++++++++++++++++++++++++ libreoffice.spec | 6 ++- 2 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-build-with-poppler-0.83.patch diff --git a/0001-Fix-build-with-poppler-0.83.patch b/0001-Fix-build-with-poppler-0.83.patch new file mode 100644 index 0000000..3ecd08f --- /dev/null +++ b/0001-Fix-build-with-poppler-0.83.patch @@ -0,0 +1,73 @@ +From 9065cd8d9a19864f6b618f2dc10daf577badd9ee Mon Sep 17 00:00:00 2001 +From: Martin Milata +Date: Wed, 4 Dec 2019 02:37:40 +0100 +Subject: [PATCH] Fix build with poppler-0.83 + +Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9 +Reviewed-on: https://gerrit.libreoffice.org/84384 +Tested-by: Jenkins +Reviewed-by: Michael Stahl +--- + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 +++++++ + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++ + sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4 ++++ + 3 files changed, 15 insertions(+) + +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index 26048177e..e9c2a407c 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -491,11 +491,18 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const + gfree(pBuf); + } + ++#if POPPLER_CHECK_VERSION(0, 83, 0) ++void PDFOutDev::printPath( const GfxPath* pPath ) ++#else + void PDFOutDev::printPath( GfxPath* pPath ) ++#endif + { + int nSubPaths = pPath ? pPath->getNumSubpaths() : 0; + for( int i=0; igetSubpath( i ); + const int nPoints = pSub->getNumPoints(); + +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +index 02f6b59f6..2e7d2186f 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +@@ -149,7 +149,11 @@ namespace pdfi + + int parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const; + void writeFontFile( GfxFont* gfxFont ) const; ++#if POPPLER_CHECK_VERSION(0, 83, 0) ++ static void printPath( const GfxPath* pPath ); ++#else + static void printPath( GfxPath* pPath ); ++#endif + + public: + explicit PDFOutDev( PDFDoc* pDoc ); +diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +index 42178b650..b1a54bd09 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +@@ -68,7 +68,11 @@ int main(int argc, char **argv) + } + + // read config file ++#if POPPLER_CHECK_VERSION(0, 83, 0) ++ globalParams = std::make_unique(); ++#else + globalParams = new GlobalParams(); ++#endif + globalParams->setErrQuiet(true); + #if defined(_MSC_VER) + globalParams->setupBaseFonts(nullptr); +-- +2.24.1 + diff --git a/libreoffice.spec b/libreoffice.spec index 857cb9f..14029dd 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -54,7 +54,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 4%{?libo_prerelease}%{?dist} +Release: 5%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -247,6 +247,7 @@ Patch3: 0001-setting-has-default-true-on-an-element-in-a-GtkPopov.patch Patch4: 0001-Resolves-rhbz-1766990-starmath-might-not-be-availabl.patch Patch5: 0001-rhbz-1773525-reducing-the-amount-of-saved-search-rep.patch Patch6: 0002-rhbz-1773525-wrong-elements-removed-from-saved-entri.patch +Patch7: 0001-Fix-build-with-poppler-0.83.patch %if 0%{?rhel} # not upstreamed @@ -2139,6 +2140,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Fri Jan 17 2020 Marek Kasik - 1:6.3.3.2-5 +- Rebuild for poppler-0.84.0 + * Wed Nov 27 2019 Caolán McNamara - 1:6.3.3.2-4 - rhbz#1776774 undo rhbz#156677 and stop customizing math.desktop