Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2020-01-19 20:55:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Sun Jan 19 20:55:29 2020 rev:192 rq:764894 version:6.4.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2020-01-11 14:37:26.689123181 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice.new.26092/libreoffice.changes 2020-01-19 20:57:39.772057351 +0100 @@ -1,0 +2,13 @@ +Wed Jan 15 12:17:45 UTC 2020 - Bjørn Lie <[email protected]> + +- Add lo-Fix-build-with-poppler-0.83.patch: Fix build with + poppler-0.83. + +------------------------------------------------------------------- +Tue Jan 14 08:06:37 UTC 2020 - Tomáš Chvátal <[email protected]> + +- Update to 6.4.0.2: + * RC2 of 6.4 release +- Drop merged patch 0001-tdf-129879-Fix-wrong-order-of-buttons.patch + +------------------------------------------------------------------- Old: ---- 0001-tdf-129879-Fix-wrong-order-of-buttons.patch libreoffice-6.4.0.1.tar.xz libreoffice-6.4.0.1.tar.xz.asc libreoffice-help-6.4.0.1.tar.xz libreoffice-help-6.4.0.1.tar.xz.asc libreoffice-translations-6.4.0.1.tar.xz libreoffice-translations-6.4.0.1.tar.xz.asc New: ---- libreoffice-6.4.0.2.tar.xz libreoffice-6.4.0.2.tar.xz.asc libreoffice-help-6.4.0.2.tar.xz libreoffice-help-6.4.0.2.tar.xz.asc libreoffice-translations-6.4.0.2.tar.xz libreoffice-translations-6.4.0.2.tar.xz.asc lo-Fix-build-with-poppler-0.83.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.YIDS63/_old 2020-01-19 20:57:47.548061436 +0100 +++ /var/tmp/diff_new_pack.YIDS63/_new 2020-01-19 20:57:47.548061436 +0100 @@ -50,7 +50,7 @@ %bcond_with system_gpgme %endif Name: libreoffice -Version: 6.4.0.1 +Version: 6.4.0.2 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -98,7 +98,8 @@ # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff -Patch4: 0001-tdf-129879-Fix-wrong-order-of-buttons.patch +# PATCH-FIX-UPSTREAM lo-Fix-build-with-poppler-0.83.patch +Patch4: lo-Fix-build-with-poppler-0.83.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff # save time by relying on rpm check rather than doing stupid find+grep ++++++ libreoffice-6.4.0.1.tar.xz -> libreoffice-6.4.0.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-6.4.0.1.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.26092/libreoffice-6.4.0.2.tar.xz differ: char 26, line 1 ++++++ libreoffice-help-6.4.0.1.tar.xz -> libreoffice-help-6.4.0.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-help-6.4.0.1.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.26092/libreoffice-help-6.4.0.2.tar.xz differ: char 26, line 1 ++++++ libreoffice-translations-6.4.0.1.tar.xz -> libreoffice-translations-6.4.0.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-6.4.0.1.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.26092/libreoffice-translations-6.4.0.2.tar.xz differ: char 27, line 1 ++++++ lo-Fix-build-with-poppler-0.83.patch ++++++ >From 9065cd8d9a19864f6b618f2dc10daf577badd9ee Mon Sep 17 00:00:00 2001 From: Martin Milata <[email protected]> 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 <[email protected]> --- 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 26048177e87d..e9c2a407c279 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; i<nSubPaths; i++ ) { +#if POPPLER_CHECK_VERSION(0, 83, 0) + const +#endif GfxSubpath* pSub = pPath->getSubpath( 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 02f6b59f6f15..2e7d2186f9a1 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 42178b650cdd..b1a54bd09c5f 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<GlobalParams>(); +#else globalParams = new GlobalParams(); +#endif globalParams->setErrQuiet(true); #if defined(_MSC_VER) globalParams->setupBaseFonts(nullptr);
