diff --git a/0001-Fix-build-with-poppler-0.73.0.patch b/0001-Fix-build-with-poppler-0.73.0.patch index 4bf975e..a089726 100644 --- a/0001-Fix-build-with-poppler-0.73.0.patch +++ b/0001-Fix-build-with-poppler-0.73.0.patch @@ -3,6 +3,7 @@ From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 25 Jan 2019 21:56:28 +0100 Subject: [PATCH] Fix build with poppler-0.73.0 +Code by Marek Kasik. --- .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 30 +++++++++---------- .../pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 30 +++++++++---------- @@ -50,6 +51,15 @@ index 06e4faead..6d196d7d1 100644 std::vector aEsc( lcl_escapeLineFeeds(pURI) ); +@@ -578,7 +578,7 @@ void PDFOutDev::restoreState(GfxState*) + printf( "restoreState\n" ); + } + +-void PDFOutDev::setDefaultCTM(double *pMat) ++void PDFOutDev::setDefaultCTM(const double *pMat) + { + assert(pMat); + @@ -753,7 +753,7 @@ void PDFOutDev::updateFont(GfxState *state) aFont = it->second; @@ -123,7 +133,7 @@ diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/sourc index 7e65f085d..2dd2fff96 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -151,17 +151,17 @@ namespace pdfi +@@ -151,22 +151,22 @@ namespace pdfi // Does this device use upside-down coordinates? // (Upside-down means (0,0) is the top left corner of the page.) @@ -145,6 +155,12 @@ index 7e65f085d..2dd2fff96 100644 //----- initialization and control + // Set default transform matrix. +- virtual void setDefaultCTM(double *ctm) override; ++ virtual void setDefaultCTM(const double *ctm) override; + + // Start a page. + virtual void startPage(int pageNum, GfxState *state @@ -233,40 +233,40 @@ namespace pdfi //----- image drawing diff --git a/libreoffice.spec b/libreoffice.spec index 2eec1ec..0835474 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: 2%{?libo_prerelease}%{?dist} +Release: 3%{?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/ @@ -2172,6 +2172,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Sat Jan 26 2019 Marek Kasik - 1:6.1.4.2-3 +- Additional fixes needed for rebuild + * Fri Jan 25 2019 Marek Kasik - 1:6.1.4.2-2 - Rebuild for poppler-0.73.0