[arch-commits] Commit in libreoffice-fresh/trunk (5 files)
Andreas Radke
andyrtr at archlinux.org
Mon Jan 21 08:41:32 UTC 2019
Date: Monday, January 21, 2019 @ 08:41:31
Author: andyrtr
Revision: 344547
upgpkg: libreoffice-fresh 6.1.4-4
fix AppStream data file location FS#61413; use upstream poppler fixes; don't run tests - they break build to often and aren't useful fon nondebug production builds; minor cleanups
Modified:
libreoffice-fresh/trunk/PKGBUILD
libreoffice-fresh/trunk/libreoffice-poppler-0.71.patch
libreoffice-fresh/trunk/libreoffice-poppler-0.72.patch
libreoffice-fresh/trunk/libreoffice-poppler-0.73.patch
Deleted:
libreoffice-fresh/trunk/poppler-0.70.patch
--------------------------------+
PKGBUILD | 59 +++------
libreoffice-poppler-0.71.patch | 186 +++++++++++++++++++++++-------
libreoffice-poppler-0.72.patch | 43 ++++++-
libreoffice-poppler-0.73.patch | 235 +++++++++++++++++++++++++++++++++++++--
poppler-0.70.patch | 45 -------
5 files changed, 429 insertions(+), 139 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-01-21 02:35:51 UTC (rev 344546)
+++ PKGBUILD 2019-01-21 08:41:31 UTC (rev 344547)
@@ -12,7 +12,7 @@
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
_LOver=6.1.4.2
pkgver=6.1.4
-pkgrel=3
+pkgrel=4
arch=('x86_64')
license=('LGPL3')
url="http://www.libreoffice.org/"
@@ -22,7 +22,7 @@
'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
'libmspub' 'harfbuzz-icu' 'nss' 'hicolor-icon-theme'
'desktop-file-utils' 'shared-mime-info' 'gtk2' 'gst-plugins-base-libs'
- 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant' #'glu'
+ 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant'
'gperf' 'gtk3' 'qt5-base' 'plasma-framework' 'cppunit' 'beanshell' 'clucene'
'junit' 'libmythes' 'libwpg' 'java-environment=8' 'postgresql-libs' 'libgl'
'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds'
@@ -38,7 +38,6 @@
_additional_source_url="http://dev-www.libreoffice.org/src"
_additional_source_url2="http://dev-www.libreoffice.org/extern"
source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
- #${_additional_source_url}/boost_1_66_0.tar.bz2
${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip # keep old bundled version, new system version ftbs
${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@@ -54,16 +53,14 @@
${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar # for test suite
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
make-pyuno-work-with-system-wide-module-install.diff
- poppler-0.70.patch
- libreoffice-poppler-0.71.patch
- libreoffice-poppler-0.72.patch
- libreoffice-poppler-0.73.patch
- libreoffice-boost-1.69.patch
+ libreoffice-poppler-0.71.patch
+ libreoffice-poppler-0.72.patch
+ libreoffice-poppler-0.73.patch
+ libreoffice-boost-1.69.patch
0001-Update-mdds-to-1.4.1.patch
0001-Update-orcus-to-0.14.0.patch
libreoffice-fresh.sh libreoffice-fresh.csh)
-noextract=(#boost_1_66_0.tar.bz2
- 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
@@ -100,10 +97,9 @@
'702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769'
'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
- '4cac21ffdb711803c0d5372c6b0ba04f1310afa7907081fdd01c11e68c1785bf'
- 'ffe1698d3db3320a9213a459e7619f4962c9792a8b256ea0fe2b7e0af1df430a'
- 'dc8b5b0d1a4a1fed4f5cab048cd7ecd78630725458311bcbfe0a660c82357b49'
- '69337273a8a125be1c9e066b955306659b19066c3c82b61c62bcb62234e2e1ad'
+ 'aeeb7d0b6e9a7c0eead9eb1f0d491ba26177a11417ed2b82b8286ea0bd081776'
+ '9a284e9be6bea6b207926cd340dad1ab5bfee730134126d7ca78109ca96e0217'
+ '521fdc2bd1032421c4dec2a241f41b97b55b5122986555e2a1d113b451d5ac05'
'5099c5e7818a327b661c45c0bd218835c1e70b14861b5112525da1d48beebf8c'
'8e8460302a7febc9a29b32b98fb77c85910ccadc65c73e0e9997dc5aabaaeb2a'
'60560283a5e22acad7f341b16dff4a654559b36db5d49b1e59f3bb9ae9b2336c'
@@ -121,11 +117,6 @@
done
popd
- # don't run broken tests
- sed -i "/CppunitTest_sd_export_ooxml2/d" sd/Module_sd.mk
- sed -i "/CppunitTest_sw_ww8export2/d" sw/Module_sw.mk
- sed -i "/CppunitTest_emfio_emf_test/d" emfio/Module_emfio.mk
-
# unowinreg.dll must be a file not a symlink or the result will become a broken symlink
# /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
@@ -134,21 +125,18 @@
# fix not upstreamable pyuno paths - FS#54250
patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
- # fix build with poppler 0.70
- 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 poppler 0.73
- patch -p1 -i ../libreoffice-poppler-0.73.patch
- # fix build with boost 1.69 (freebsd)
- patch -p0 -i ../libreoffice-boost-1.69.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 poppler 0.73
+ patch -p1 -i ../libreoffice-poppler-0.73.patch
+ # fix build with boost 1.69 (freebsd)
+ patch -p0 -i ../libreoffice-boost-1.69.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
patch -Np1 -i ../0001-Update-mdds-to-1.4.1.patch
-# sed -i "s:liborcus-0.13 >= 0.13.3:liborcus-0.14 >= 0.14.1:" configure.ac
patch -Np1 -i ../0001-Update-orcus-to-0.14.0.patch
#use the CFLAGS but remove the LibO overridden ones
@@ -250,7 +238,7 @@
--disable-dependency-tracking
touch src.downloaded
- make build
+ make build-nocheck
mkdir ${srcdir}/fakeinstall
make DESTDIR=${srcdir}/fakeinstall distro-pack-install
@@ -292,11 +280,11 @@
package_libreoffice-fresh() {
pkgdesc="LibreOffice branch which contains new features and program enhancements"
depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'libwps'
- 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' # 'dbus-glib'
+ 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl'
'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu'
'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
'libmspub' 'harfbuzz-icu' 'nss' 'clucene' 'hicolor-icon-theme'
- 'desktop-file-utils' 'shared-mime-info' 'libpagemaker' #'glu'
+ 'desktop-file-utils' 'shared-mime-info' 'libpagemaker'
'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient'
'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'gpgme' 'libnumbertext'
@@ -359,6 +347,7 @@
rm -rf ${pkgdir}/usr/share/libreoffice/sdk
# add application descriptions
+ install -dm755 ${pkgdir}/usr/share/metainfo
install -v -m644 ${srcdir}/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \
- ${pkgdir}/usr/share/appdata
+ ${pkgdir}/usr/share/metainfo
}
Modified: libreoffice-poppler-0.71.patch
===================================================================
--- libreoffice-poppler-0.71.patch 2019-01-21 02:35:51 UTC (rev 344546)
+++ libreoffice-poppler-0.71.patch 2019-01-21 08:41:31 UTC (rev 344547)
@@ -1,7 +1,31 @@
-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
-@@ -514,7 +514,7 @@
+From c85bd2c443b9a509b028a90ee9e766929e63089f Mon Sep 17 00:00:00 2001
+From: Mike Kaganski <mike.kaganski at collabora.com>
+Date: Tue, 20 Nov 2018 08:45:38 +0100
+Subject: poppler dropped GBool since 0.71
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+See https://lists.freedesktop.org/archives/libreoffice/2018-November/081410.html
+
+Change-Id: I258e08894486a925bed50a3a4232b6e805af6784
+Reviewed-on: https://gerrit.libreoffice.org/63625
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
+(cherry picked from commit 5e8bdd9203dd642111c62a6668ee665a20d4ba19)
+Reviewed-on: https://gerrit.libreoffice.org/66374
+Reviewed-by: Caolán McNamara <caolanm at redhat.com>
+Tested-by: Caolán McNamara <caolanm at redhat.com>
+---
+ .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 22 +++++++-------
+ .../pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 35 +++++++++++++---------
+ 2 files changed, 32 insertions(+), 25 deletions(-)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index 06e4fae..6e4bf8a 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -514,7 +514,7 @@ void PDFOutDev::printPath( GfxPath* pPath )
PDFOutDev::PDFOutDev( PDFDoc* pDoc ) :
m_pDoc( pDoc ),
m_aFontMap(),
@@ -10,56 +34,56 @@
m_bSkipImages(false)
{
}
-@@ -943,11 +943,11 @@
+@@ -939,11 +939,11 @@ void PDFOutDev::endTextObject(GfxState*)
}
void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
- int width, int height, GBool invert,
-+ int width, int height, bool invert,
++ int width, int height, poppler_bool invert,
#if POPPLER_CHECK_VERSION(0, 12, 0)
- GBool /*interpolate*/,
-+ bool /*interpolate*/,
++ poppler_bool /*interpolate*/,
#endif
- GBool /*inlineImg*/ )
-+ bool /*inlineImg*/ )
++ poppler_bool /*inlineImg*/ )
{
if (m_bSkipImages)
return;
-@@ -976,9 +976,9 @@
+@@ -972,9 +972,9 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
int width, int height, GfxImageColorMap* colorMap,
#if POPPLER_CHECK_VERSION(0, 12, 0)
- GBool /*interpolate*/,
-+ bool /*interpolate*/,
++ poppler_bool /*interpolate*/,
#endif
- int* maskColors, GBool /*inlineImg*/ )
-+ int* maskColors, bool /*inlineImg*/ )
++ int* maskColors, poppler_bool /*inlineImg*/ )
{
if (m_bSkipImages)
return;
-@@ -1027,13 +1027,13 @@
+@@ -1023,13 +1023,13 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str,
int width, int height,
GfxImageColorMap* colorMap,
#if POPPLER_CHECK_VERSION(0, 12, 0)
- GBool /*interpolate*/,
-+ bool /*interpolate*/,
++ poppler_bool /*interpolate*/,
#endif
Stream* maskStr,
int maskWidth, int maskHeight,
- GBool maskInvert
-+ bool maskInvert
++ poppler_bool maskInvert
#if POPPLER_CHECK_VERSION(0, 12, 0)
- , GBool /*maskInterpolate*/
-+ , bool /*maskInterpolate*/
++ , poppler_bool /*maskInterpolate*/
#endif
)
{
-@@ -1049,13 +1049,13 @@
+@@ -1045,13 +1045,13 @@ void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str,
int width, int height,
GfxImageColorMap* colorMap,
#if POPPLER_CHECK_VERSION(0, 12, 0)
- GBool /*interpolate*/,
-+ bool /*interpolate*/,
++ poppler_bool /*interpolate*/,
#endif
Stream* maskStr,
int maskWidth, int maskHeight,
@@ -66,68 +90,83 @@
GfxImageColorMap* maskColorMap
#if POPPLER_CHECK_VERSION(0, 12, 0)
- , GBool /*maskInterpolate*/
-+ , bool /*maskInterpolate*/
++ , poppler_bool /*maskInterpolate*/
#endif
)
{
-diff -ru libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.hxx libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
---- libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.hxx 2018-11-01 20:43:55.802520387 +0000
-+++ libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2018-11-01 20:44:33.402620221 +0000
-@@ -151,17 +151,17 @@
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index 7e65f08..88b8837 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -130,6 +130,13 @@ namespace pdfi
+ { return const_cast<GooString &>(familyName); }
+ };
++ // Versions before 0.15 defined GBool as int; 0.15 redefined it as bool; 0.71 dropped GBool
++#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 71
++ typedef GBool poppler_bool;
++#else
++ typedef bool poppler_bool;
++#endif
++
+ class PDFOutDev : public OutputDev
+ {
+ // not owned by this class
+@@ -151,17 +158,17 @@ namespace pdfi
+
// Does this device use upside-down coordinates?
// (Upside-down means (0,0) is the top left corner of the page.)
- virtual GBool upsideDown() override { return gTrue; }
-+ virtual bool upsideDown() override { return true; }
++ virtual poppler_bool upsideDown() override { return true; }
// Does this device use drawChar() or drawString()?
- virtual GBool useDrawChar() override { return gTrue; }
-+ virtual bool useDrawChar() override { return true; }
++ virtual poppler_bool useDrawChar() override { return true; }
// Does this device use beginType3Char/endType3Char? Otherwise,
// text in Type 3 fonts will be drawn with drawChar/drawString.
- virtual GBool interpretType3Chars() override { return gFalse; }
-+ virtual bool interpretType3Chars() override { return false; }
++ virtual poppler_bool interpretType3Chars() override { return false; }
// Does this device need non-text content?
- virtual GBool needNonText() override { return gTrue; }
-+ virtual bool needNonText() override { return true; }
++ virtual poppler_bool needNonText() override { return true; }
//----- initialization and control
-@@ -237,40 +237,40 @@
+@@ -233,40 +240,40 @@ namespace pdfi
//----- image drawing
virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
- int width, int height, GBool invert,
-+ int width, int height, bool invert,
++ int width, int height, poppler_bool invert,
#if POPPLER_CHECK_VERSION(0, 12, 0)
- GBool interpolate,
-+ bool interpolate,
++ poppler_bool interpolate,
#endif
- GBool inlineImg) override;
-+ bool inlineImg) override;
++ poppler_bool inlineImg) override;
virtual void drawImage(GfxState *state, Object *ref, Stream *str,
int width, int height, GfxImageColorMap *colorMap,
#if POPPLER_CHECK_VERSION(0, 12, 0)
- GBool interpolate,
-+ bool interpolate,
++ poppler_bool interpolate,
#endif
- int *maskColors, GBool inlineImg) override;
-+ int *maskColors, bool inlineImg) override;
++ int *maskColors, poppler_bool inlineImg) override;
virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
int width, int height,
GfxImageColorMap *colorMap,
#if POPPLER_CHECK_VERSION(0, 12, 0)
- GBool interpolate,
-+ bool interpolate,
++ poppler_bool interpolate,
#endif
Stream *maskStr, int maskWidth, int maskHeight,
- GBool maskInvert
-+ bool maskInvert
++ poppler_bool maskInvert
#if POPPLER_CHECK_VERSION(0, 12, 0)
- , GBool maskInterpolate
-+ , bool maskInterpolate
++ , poppler_bool maskInterpolate
#endif
) override;
virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
@@ -135,7 +174,7 @@
GfxImageColorMap *colorMap,
#if POPPLER_CHECK_VERSION(0, 12, 0)
- GBool interpolate,
-+ bool interpolate,
++ poppler_bool interpolate,
#endif
Stream *maskStr,
int maskWidth, int maskHeight,
@@ -142,15 +181,75 @@
GfxImageColorMap *maskColorMap
#if POPPLER_CHECK_VERSION(0, 12, 0)
- , GBool maskInterpolate
-+ , bool maskInterpolate
++ , poppler_bool maskInterpolate
#endif
) override;
-diff -ru libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl.cxx libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
---- libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl.cxx 2018-11-01 20:43:55.802520387 +0000
-+++ libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx 2018-11-01 20:44:33.402620221 +0000
-@@ -69,7 +69,7 @@
+--
+cgit v1.1
+
+From 704ff8be10ecfb39be064bd08b2f9c11312e3428 Mon Sep 17 00:00:00 2001
+From: Aleksei Nikiforov <darktemplar at basealt.ru>
+Date: Thu, 22 Nov 2018 17:54:00 +0300
+Subject: Fix build with poppler 0.71
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: I470ece9dc4766e10e1ccb5e99b25a8d8cc4cbf38
+Reviewed-on: https://gerrit.libreoffice.org/63860
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
+(cherry picked from commit 8ff41a26caf51544699863c89598d37d93dc1b21)
+Reviewed-on: https://gerrit.libreoffice.org/66375
+Reviewed-by: Aleksei Nikiforov <darktemplar at basealt.ru>
+Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
+Reviewed-by: Caolán McNamara <caolanm at redhat.com>
+Tested-by: Caolán McNamara <caolanm at redhat.com>
+---
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++++
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
+ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4 ++--
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index 6e4bf8a..df0288d 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, 71, 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 88b8837..37a03bc 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -173,7 +173,11 @@ namespace pdfi
+ //----- initialization and control
+
+ // Set default transform matrix.
++#if POPPLER_CHECK_VERSION(0, 71, 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
+diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+index b536a71..f2049a6 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+@@ -69,7 +69,7 @@ int main(int argc, char **argv)
+
// read config file
globalParams = new GlobalParams();
- globalParams->setErrQuiet(gTrue);
@@ -158,7 +257,7 @@
#if defined(_MSC_VER)
globalParams->setupBaseFonts(nullptr);
#endif
-@@ -143,7 +143,7 @@
+@@ -145,7 +145,7 @@ int main(int argc, char **argv)
i,
PDFI_OUTDEV_RESOLUTION,
PDFI_OUTDEV_RESOLUTION,
@@ -167,3 +266,6 @@
rDoc.processLinks(&aOutDev, i);
}
+--
+cgit v1.1
+
Modified: libreoffice-poppler-0.72.patch
===================================================================
--- libreoffice-poppler-0.72.patch 2019-01-21 02:35:51 UTC (rev 344546)
+++ libreoffice-poppler-0.72.patch 2019-01-21 08:41:31 UTC (rev 344547)
@@ -1,20 +1,51 @@
---- 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 @@
+From a5a188d5bbb99f6e305dad6f81b9e3760aa32676 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm at gentoo.org>
+Date: Tue, 8 Jan 2019 11:24:40 +0100
+Subject: Fix build with poppler-0.72
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: I0664d1b39e97b7555c0a3cba442db52b84f37134
+Reviewed-on: https://gerrit.libreoffice.org/65960
+Tested-by: Jenkins
+Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
+(cherry picked from commit 65a6c9ae4791188ffcecf489073cf38873ce5e17)
+Reviewed-on: https://gerrit.libreoffice.org/66376
+Reviewed-by: Caolán McNamara <caolanm at redhat.com>
+Tested-by: Caolán McNamara <caolanm at redhat.com>
+---
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index df0288d..9c65fc2 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -555,7 +555,11 @@ void PDFOutDev::processLink(Link* link, Catalog*)
LinkAction* pAction = link->getAction();
if (pAction && pAction->getKind() == actionURI)
{
-- const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
++#if POPPLER_CHECK_VERSION(0, 72, 0)
+ const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
++#else
+ const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
++#endif
std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) );
-@@ -757,7 +757,7 @@
+@@ -757,7 +761,11 @@ void PDFOutDev::updateFont(GfxState *state)
aFont = it->second;
-- std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) );
++#if POPPLER_CHECK_VERSION(0, 72, 0)
+ std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) );
++#else
+ std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) );
++#endif
printf( " %d %d %d %d %f %d %s",
aFont.isEmbedded,
aFont.isBold,
+--
+cgit v1.1
+
Modified: libreoffice-poppler-0.73.patch
===================================================================
--- libreoffice-poppler-0.73.patch 2019-01-21 02:35:51 UTC (rev 344546)
+++ libreoffice-poppler-0.73.patch 2019-01-21 08:41:31 UTC (rev 344547)
@@ -1,7 +1,10 @@
-From 50d371ae08c66648d9f32f633b2245e1746e2bb6 Mon Sep 17 00:00:00 2001
+From b5698ac28a8a79105edf28ffc1db19bbcbecda3a Mon Sep 17 00:00:00 2001
From: Michael Stahl <Michael.Stahl at cib.de>
Date: Mon, 14 Jan 2019 15:08:42 +0100
-Subject: [PATCH] sdext: fix build with poppler 0.73
+Subject: sdext: fix build with poppler 0.73
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
... which has removed Guchar, Gushort, Guint, Gulong...
@@ -9,6 +12,10 @@
Reviewed-on: https://gerrit.libreoffice.org/66305
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
+(cherry picked from commit 50d371ae08c66648d9f32f633b2245e1746e2bb6)
+Reviewed-on: https://gerrit.libreoffice.org/66363
+Reviewed-by: Caolán McNamara <caolanm at redhat.com>
+Tested-by: Caolán McNamara <caolanm at redhat.com>
---
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++--
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 6 +++++-
@@ -16,10 +23,10 @@
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index dab405bc81a1..9842b9734e8d 100644
+index 9c65fc2..9432755 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -298,7 +298,7 @@ static void writePpm_( OutputBuffer& o_rOutputBuf,
+@@ -298,7 +298,7 @@ void writePpm_( OutputBuffer& o_rOutputBuf,
o_rOutputBuf.resize(header_size);
// initialize stream
@@ -28,7 +35,7 @@
GfxRGB rgb;
std::unique_ptr<ImageStream> imgStr(
new ImageStream(str,
-@@ -401,7 +401,7 @@ static void writeImage_( OutputBuffer& o_rOutputBuf,
+@@ -401,7 +401,7 @@ void writeImage_( OutputBuffer& o_rOutputBuf,
oneColor = { byteToCol( 0xff ), byteToCol( 0xff ), byteToCol( 0xff ) };
if( colorMap->getColorSpace()->getMode() == csIndexed || colorMap->getColorSpace()->getMode() == csDeviceGray )
{
@@ -38,10 +45,10 @@
nIndex = 1;
colorMap->getRGB( &nIndex, &oneColor );
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index 98d8ede6418f..cd091e5d270f 100644
+index 37a03bc..533eb93 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -278,9 +278,13 @@ extern FILE* g_binary_out;
+@@ -290,9 +290,13 @@ extern FILE* g_binary_out;
// note: if you ever change Output_t, please keep in mind that the current code
// relies on it being of 8 bit size
@@ -50,7 +57,7 @@
typedef std::vector< Output_t > OutputBuffer;
+#if !POPPLER_CHECK_VERSION(0, 73, 0)
-+static_assert(std::is_same_v<Guchar, unsigned char>, "unexpected typedef");
++static_assert(std::is_same<Guchar, unsigned char>::value, "unexpected typedef");
+#endif
+
#endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX
@@ -57,7 +64,7 @@
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
-index 4d9e3bb46b61..b5828561b7eb 100644
+index 44f30c0..66c1751 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
@@ -242,7 +242,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
@@ -68,7 +75,7 @@
+ unsigned char *p, *pm;
GfxRGB rgb;
GfxGray alpha;
- std::unique_ptr<ImageStream> imgStr(
+ ImageStream* imgStr =
@@ -328,7 +328,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image
@@ -76,7 +83,7 @@
- Guchar *p;
+ unsigned char *p;
GfxRGB rgb;
- std::unique_ptr<ImageStream> imgStr(
+ ImageStream* imgStr =
new ImageStream(str,
@@ -374,7 +374,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
{
@@ -87,3 +94,209 @@
imgStrMask->getPixel( &aPixel );
int nIndex = (y*height/maskHeight) * (width*4+1) + // mapped line
(x*width/maskWidth)*4 + 1 + 3 // mapped column
+--
+cgit v1.1
+
+From 033ff5b3eb90deaf6fd5eb8a74100233aa5fe772 Mon Sep 17 00:00:00 2001
+From: Michael Stahl <Michael.Stahl at cib.de>
+Date: Mon, 14 Jan 2019 15:12:24 +0100
+Subject: poppler: upgrade to release 0.73.0
+
+Change-Id: If20998f8565b5534a96b3f29ccec572273edca1d
+Reviewed-on: https://gerrit.libreoffice.org/66306
+Tested-by: Jenkins
+Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
+(cherry picked from commit 0609ea4fc27f34367716bf41c0cdaa7785aed9da)
+Reviewed-on: https://gerrit.libreoffice.org/66369
+Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
+---
+ download.lst | 4 +--
+ external/poppler/StaticLibrary_poppler.mk | 6 +----
+ external/poppler/UnpackedTarball_poppler.mk | 11 ++++++++
+ external/poppler/poppler-c++11.patch.1 | 31 ++++++++++++++++++++++
+ external/poppler/poppler-config.patch.1 | 12 ++++-----
+ .../pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 1 +
+ 6 files changed, 52 insertions(+), 13 deletions(-)
+ create mode 100644 external/poppler/poppler-c++11.patch.1
+
+diff --git a/download.lst b/download.lst
+index 636ae69..3b526c2 100644
+--- a/download.lst
++++ b/download.lst
+@@ -206,8 +206,8 @@ export PIXMAN_SHA256SUM := 21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3
+ export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
+ export LIBPNG_SHA256SUM := 2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6
+ export LIBPNG_TARBALL := libpng-1.6.34.tar.xz
+-export POPPLER_SHA256SUM := 2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7
+-export POPPLER_TARBALL := poppler-0.66.0.tar.xz
++export POPPLER_SHA256SUM := e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03
++export POPPLER_TARBALL := poppler-0.73.0.tar.xz
+ export POSTGRESQL_SHA256SUM := db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
+ export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
+ export PYTHON_SHA256SUM := 063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009
+diff --git a/external/poppler/StaticLibrary_poppler.mk b/external/poppler/StaticLibrary_poppler.mk
+index f145b7a..aa5ed69 100644
+--- a/external/poppler/StaticLibrary_poppler.mk
++++ b/external/poppler/StaticLibrary_poppler.mk
+@@ -53,11 +53,8 @@ $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,poppler,cc))
+
+ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\
+ UnpackedTarball/poppler/goo/gfile \
+- UnpackedTarball/poppler/goo/gmempp \
+- UnpackedTarball/poppler/goo/GooList \
+ UnpackedTarball/poppler/goo/GooTimer \
+ UnpackedTarball/poppler/goo/GooString \
+- UnpackedTarball/poppler/goo/gmem \
+ UnpackedTarball/poppler/goo/FixedPoint \
+ UnpackedTarball/poppler/goo/NetPBMWriter \
+ UnpackedTarball/poppler/goo/PNGWriter \
+@@ -80,6 +77,7 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\
+ UnpackedTarball/poppler/poppler/BuiltinFontTables \
+ UnpackedTarball/poppler/poppler/CachedFile \
+ UnpackedTarball/poppler/poppler/Catalog \
++ UnpackedTarball/poppler/poppler/CertificateInfo \
+ UnpackedTarball/poppler/poppler/CharCodeToUnicode \
+ UnpackedTarball/poppler/poppler/CMap \
+ UnpackedTarball/poppler/poppler/DateInfo \
+@@ -114,7 +112,6 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\
+ UnpackedTarball/poppler/poppler/PDFDoc \
+ UnpackedTarball/poppler/poppler/PDFDocEncoding \
+ UnpackedTarball/poppler/poppler/PDFDocFactory \
+- UnpackedTarball/poppler/poppler/PopplerCache \
+ UnpackedTarball/poppler/poppler/ProfileData \
+ UnpackedTarball/poppler/poppler/PreScanOutputDev \
+ UnpackedTarball/poppler/poppler/PSTokenizer \
+@@ -135,7 +132,6 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\
+ UnpackedTarball/poppler/poppler/StdinPDFDocBuilder \
+ UnpackedTarball/poppler/poppler/Sound \
+ UnpackedTarball/poppler/poppler/ViewerPreferences \
+- UnpackedTarball/poppler/poppler/XpdfPluginAPI \
+ UnpackedTarball/poppler/poppler/Movie \
+ UnpackedTarball/poppler/poppler/Rendition \
+ UnpackedTarball/poppler/poppler/DCTStream \
+diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk
+index 68fd06d..5b91e16 100644
+--- a/external/poppler/UnpackedTarball_poppler.mk
++++ b/external/poppler/UnpackedTarball_poppler.mk
+@@ -13,6 +13,17 @@ $(eval $(call gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler
+
+ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
+ external/poppler/poppler-config.patch.1 \
++ external/poppler/poppler-c++11.patch.1 \
+ ))
+
++# std::make_unique is only available in C++14
++# use "env -i" to avoid Cygwin "environment is too large for exec"
++# Mac OS X sed says "sed: RE error: illegal byte sequence"; Apple clang should
++# be happy with std::make_unique so just skip it
++ifneq ($(OS_FOR_BUILD),MACOSX)
++$(eval $(call gb_UnpackedTarball_set_post_action,poppler,\
++ env -i PATH="$(PATH)" $(FIND) . -name '*.cc' -exec sed -i -e 's/std::make_unique/o3tl::make_unique/' {} \\; \
++))
++endif
++
+ # vim: set noet sw=4 ts=4:
+diff --git a/external/poppler/poppler-c++11.patch.1 b/external/poppler/poppler-c++11.patch.1
+new file mode 100644
+index 0000000..5a4d1a2
+--- /dev/null
++++ b/external/poppler/poppler-c++11.patch.1
+@@ -0,0 +1,31 @@
++remove usage of newfangled C++ that baseline toolchains don't support
++
++--- poppler/goo/gfile.cc.orig 2019-01-16 11:02:21.112911552 +0100
+++++ poppler/goo/gfile.cc 2019-01-16 11:01:33.125975178 +0100
++@@ -67,7 +67,7 @@
++
++ #ifndef _WIN32
++
++-using namespace std::string_literals;
+++//using namespace std::string_literals;
++
++ namespace {
++
++@@ -366,7 +366,7 @@
++ }
++ #else
++ // First try to atomically open the file with CLOEXEC
++- const std::string modeStr = mode + "e"s;
+++ const std::string modeStr = mode + std::string("e");
++ FILE *file = fopen(path, modeStr.c_str());
++ if (file != nullptr)
++ return file;
++--- poppler/goo/gmem.h.orig 2019-01-16 11:25:28.161920038 +0100
+++++ poppler/goo/gmem.h 2019-01-16 11:25:53.756882295 +0100
++@@ -177,4 +177,6 @@
++ return std::strncpy(r, s, n);
++ }
++
+++#include <o3tl/make_unique.hxx>
+++
++ #endif // GMEM_H
+diff --git a/external/poppler/poppler-config.patch.1 b/external/poppler/poppler-config.patch.1
+index 5328e68..e312573 100644
+--- a/external/poppler/poppler-config.patch.1
++++ b/external/poppler/poppler-config.patch.1
+@@ -195,7 +195,7 @@ index 0fbd336a..451213f8 100644
+ +#define PACKAGE_NAME "poppler"
+ +
+ +/* Define to the full name and version of this package. */
+-+#define PACKAGE_STRING "poppler 0.66.0"
+++#define PACKAGE_STRING "poppler 0.73.0"
+ +
+ +/* Define to the one symbol short name of this package. */
+ +#define PACKAGE_TARNAME "poppler"
+@@ -204,7 +204,7 @@ index 0fbd336a..451213f8 100644
+ +#define PACKAGE_URL ""
+ +
+ +/* Define to the version of this package. */
+-+#define PACKAGE_VERSION "0.66.0"
+++#define PACKAGE_VERSION "0.73.0"
+ +
+ +/* Poppler data dir */
+ +#define POPPLER_DATADIR "/usr/local/share/poppler"
+@@ -228,7 +228,7 @@ index 0fbd336a..451213f8 100644
+ +/* #undef USE_FLOAT */
+ +
+ +/* Version number of package */
+-+#define VERSION "0.66.0"
+++#define VERSION "0.73.0"
+ +
+ +#if defined(__APPLE__)
+ +#elif defined (_WIN32)
+@@ -304,7 +304,7 @@ index 0fbd336a..451213f8 100644
+ +
+ +/* Defines the poppler version. */
+ +#ifndef POPPLER_VERSION
+-+#define POPPLER_VERSION "0.66.0"
+++#define POPPLER_VERSION "0.73.0"
+ +#endif
+ +
+ +/* Enable multithreading support. */
+@@ -466,9 +466,9 @@ index 0fbd336a..451213f8 100644
+ +
+ +#include "poppler-global.h"
+ +
+-+#define POPPLER_VERSION "0.66.0"
+++#define POPPLER_VERSION "0.73.0"
+ +#define POPPLER_VERSION_MAJOR 0
+-+#define POPPLER_VERSION_MINOR 66
+++#define POPPLER_VERSION_MINOR 73
+ +#define POPPLER_VERSION_MICRO 0
+ +
+ +namespace poppler
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index 533eb93..ced1a65 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -30,6 +30,7 @@
+ #elif defined _MSC_VER
+ #pragma warning(push)
+ #pragma warning(disable : 4100) // unreferenced formal parameter
++#pragma warning(disable : 4310) // cast truncates constant value
+ #endif
+
+ #include <GfxState.h>
+--
+cgit v1.1
+
Deleted: poppler-0.70.patch
===================================================================
--- poppler-0.70.patch 2019-01-21 02:35:51 UTC (rev 344546)
+++ poppler-0.70.patch 2019-01-21 08:41:31 UTC (rev 344547)
@@ -1,45 +0,0 @@
-From 557ee0a0f4e40b934c72515f41f3a605803ddb1d Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos at 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
-
More information about the arch-commits
mailing list