Date: Wednesday, April 25, 2018 @ 04:11:08 Author: foutrelis Revision: 322964
archrelease: copy trunk to staging-x86_64 Added: libreoffice-fresh/repos/staging-x86_64/ libreoffice-fresh/repos/staging-x86_64/PKGBUILD (from rev 322963, libreoffice-fresh/trunk/PKGBUILD) libreoffice-fresh/repos/staging-x86_64/libreoffice-fresh.csh (from rev 322963, libreoffice-fresh/trunk/libreoffice-fresh.csh) libreoffice-fresh/repos/staging-x86_64/libreoffice-fresh.sh (from rev 322963, libreoffice-fresh/trunk/libreoffice-fresh.sh) libreoffice-fresh/repos/staging-x86_64/make-pyuno-work-with-system-wide-module-install.diff (from rev 322963, libreoffice-fresh/trunk/make-pyuno-work-with-system-wide-module-install.diff) libreoffice-fresh/repos/staging-x86_64/poppler-0.64.patch (from rev 322963, libreoffice-fresh/trunk/poppler-0.64.patch) ------------------------------------------------------+ PKGBUILD | 340 +++++++++++++++++ libreoffice-fresh.csh | 6 libreoffice-fresh.sh | 6 make-pyuno-work-with-system-wide-module-install.diff | 18 poppler-0.64.patch | 65 +++ 5 files changed, 435 insertions(+) Copied: libreoffice-fresh/repos/staging-x86_64/PKGBUILD (from rev 322963, libreoffice-fresh/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2018-04-25 04:11:08 UTC (rev 322964) @@ -0,0 +1,340 @@ +# $Id$ +# Maintainer: AndyRTR <andy...@archlinux.org> +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> + +# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) +# Note: These are for Arch Linux use ONLY. For your own distribution, please +# get your own set of keys. Feel free to contact foutre...@archlinux.org for +# more information. +_google_default_client_id=413772536636.apps.googleusercontent.com +_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 + +pkgbase=libreoffice-fresh +pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') +_LOver=6.0.3.2 +pkgver=6.0.3 +pkgrel=2 +arch=('x86_64') +license=('LGPL3') +url="http://www.libreoffice.org/" +makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'libwps' + 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' + 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' + 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' + 'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'hicolor-icon-theme' + 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'gst-plugins-base-libs' + 'glu' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant' + 'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell' 'clucene' + 'junit' 'libmythes' 'libwpg' 'java-environment' 'postgresql-libs' 'libgl' + 'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew' + 'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'libxinerama' 'libpagemaker' 'glm' + 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' + 'libexttextcat' 'libcmis' 'gobject-introspection' #'libfbclient' + 'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode' + 'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice' +) +sha256sums=('12b8a2f57d797ad51b7661e2302babfe73c0d23b52ddac9f4c7eb1b82472859b' + 'SKIP' + '06999eac776c4fcf7339732bf988d2b85b7193283d4be622f848706e278e4701' + 'SKIP' + '8aa651266b701b17e78aaca77db394bec3da07faf62546496484c63dd519a5b3' + 'SKIP' + '9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81' + '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1' + '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753' + '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870' + '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776' + 'd6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab' + 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370' + '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133' + '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd' + '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860' + '7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f' + 'd0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a' + 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' + 'aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf' + 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' + 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' + '944064e8f8fa18beeb348468348d910d365d8a3e36ddb76076a368bd9bd6f894' + '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4' + 'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283') + +_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}" +#_mirror="https://dev-builds.libreoffice.org/pre-releases/src" +_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_65_1.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 + ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + ${_additional_source_url}/language-subtag-registry-2017-08-15.tar.bz2 + ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + ${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2 + ${_additional_source_url}/pdfium-3235.tar.bz2 + ${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip + ${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite + ${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar # for test suite + ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + make-pyuno-work-with-system-wide-module-install.diff + poppler-0.64.patch + libreoffice-fresh.sh libreoffice-fresh.csh) +noextract=(boost_1_65_1.tar.bz2 + 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + language-subtag-registry-2017-08-15.tar.bz2 + 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + Firebird-3.0.0.32483-0.tar.bz2 + pdfium-3235.tar.bz2 + bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip + 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite + odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar # for test suite + 185d60944ea767075d27247c3162b3bc-unowinreg.dll +) +validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <bu...@documentfoundation.org> + +prepare() { + + cd libreoffice-$_LOver + + # move external sources into place + mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources + for source in "${noextract[@]}"; do + ln -s ${srcdir}/$source . + done + popd + + # don't run broken tests + sed -i "/CppunitTest_sw_ooxmlexport9/d" sw/Module_sw.mk + sed -i "/CppunitTest_sw_uiwriter/d" sw/Module_sw.mk + sed -i "/CppunitTest_xmlsecurity_signing/d" xmlsecurity/Module_xmlsecurity.mk + sed -i "/CppunitTest_sc_subsequent_filters_test/d" sc/Module_sc.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 + cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources + + # 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.64 + patch -Np1 -i ${srcdir}/poppler-0.64.patch + + #use the CFLAGS but remove the LibO overridden ones + for i in $CFLAGS; do + case "$i" in + -O?|-pipe|-Wall|-g|-fexceptions) continue;; + esac + ARCH_FLAGS="$ARCH_FLAGS $i" + done +} + +build() { + cd libreoffice-$_LOver + + # strip -s from Makeflags in case you use it to shorten build logs + _MAKEFLAGS=${MAKEFLAGS/-s/} + + # http://site.icu-project.org/download/61#TOC-Migration-Issues + CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1' + + ./autogen.sh --with-build-version="${pkgver}-${pkgrel}" \ + --with-vendor="Arch Linux" \ + --enable-split-app-modules \ + --with-parallelism=${_MAKEFLAGS/-j/} \ + --with-external-tar="${srcdir}/ext_sources" \ + --disable-fetch-external \ + --enable-release-build \ + --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ + --libdir=/usr/lib --mandir=/usr/share/man \ + --with-lang="" \ + --with-help \ + --disable-avahi \ + --enable-dbus \ + --enable-evolution2\ + --enable-gio\ + --enable-kde4\ + --enable-gtk3 \ + --enable-introspection \ + --disable-gstreamer-0-10 \ + --enable-openssl \ + --enable-odk\ + --enable-python=system \ + --enable-scripting-beanshell \ + --enable-scripting-javascript \ + --disable-dconf \ + --disable-report-builder \ + --enable-ext-wiki-publisher \ + --enable-ext-nlpsolver \ + --without-fonts\ + --with-system-apr \ + --with-system-libcdr \ + --with-system-mdds\ + --without-myspell-dicts \ + --with-system-libvisio \ + --with-system-libcmis \ + --with-system-libmspub \ + --with-system-libexttextcat \ + --with-system-orcus \ + --with-system-liblangtag \ + --with-system-libodfgen \ + --with-system-libmwaw \ + --with-system-libetonyek \ + --with-system-libfreehand \ + --without-system-firebird \ + --with-system-libtommath \ + --with-system-libatomic-ops \ + --with-system-libebook \ + --with-system-libabw \ + --with-system-coinmp \ + --with-system-dicts \ + --with-external-dict-dir=/usr/share/hunspell \ + --with-external-hyph-dir=/usr/share/hyphen \ + --with-external-thes-dir=/usr/share/mythes \ + --with-system-beanshell \ + --with-system-cppunit\ + --with-system-graphite\ + --with-system-glm \ + --with-system-libwpg \ + --with-system-libwps \ + --with-system-redland\ + --with-system-libzmf \ + --with-system-gpgmepp \ + --with-system-libstaroffice \ + --with-system-serf \ + --with-jdk-home="/usr/lib/jvm/default" \ + --with-ant-home="/usr/share/apache-ant"\ + --without-system-boost\ + --with-system-icu \ + --with-system-cairo \ + --with-system-libs \ + --with-system-mythes \ + --with-system-headers \ + --without-system-hsqldb \ + --with-alloc=system \ + --with-system-clucene \ + --with-gdrive-client-id=${_google_default_client_id} \ + --with-gdrive-client-secret=${_google_default_client_secret} \ + --disable-dependency-tracking + + touch src.downloaded + make build + + mkdir ${srcdir}/fakeinstall + make DESTDIR=${srcdir}/fakeinstall distro-pack-install +} + +#check() { +# cd ${srcdir}/build +# make check +#} + +package_libreoffice-fresh-sdk() { + pkgdesc="Software Development Kit for LibreOffice Fresh" + depends=('libreoffice-fresh' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') + provides=('libreoffice-sdk') + conflicts=('libreoffice-still-sdk') + + for dir in $(grep -h ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do + install -dm755 ${pkgdir}/${dir/\%dir/} + done + + for file in $(grep -h -v ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do + dirname=$(dirname $file) + [[ -d ${pkgdir}/$dirname ]] || install -dm755 ${pkgdir}/$dirname + mv ${srcdir}/fakeinstall/${file} ${pkgdir}/$file + done + + # fix environment path to keep compatibility with other java-environments + sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" \ + ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh + + # fix permissions + find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} + + + # add LibreOfficeKit headers; FS#48066 + install -dm755 ${pkgdir}/usr/include/LibreOfficeKit + install -v -m644 ${srcdir}/libreoffice-$_LOver/include/LibreOfficeKit/* ${pkgdir}/usr/include/LibreOfficeKit +} + +package_libreoffice-fresh() { + pkgdesc="LibreOffice branch which contains new features and program enhancements" + depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'libwps' + 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' + 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' + 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' + 'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme' + 'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker' + 'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' + 'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient' + 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' + 'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp') + optdepends=('java-runtime: adds java support' + 'java-environment: required by extension-wiki-publisher and extension-nlpsolver' + 'pstoedit: translates PostScript and PDF graphics into other vector formats' + 'libmythes: for use in thesaurus' + 'beanshell: interactive java -- good for prototyping/macros' + 'libwpg: library for importing and converting WordPerfect Graphics format' + 'sane: for scanner access' + 'unixodbc: adds ODBC database support' + 'gst-plugins-base-libs: for multimedia content, e.g. in Impress' + 'libpaper: takes care of papersize' + 'postgresql-libs: for postgresql-connector' + 'coin-or-mp: required by the Calc solver' + 'gtk2: for GTK2 integration' + 'gtk3: for GTK3 integration' + 'kdelibs: for KDE desktop integration') + backup=(etc/libreoffice/sofficerc + etc/libreoffice/bootstraprc + etc/libreoffice/psprint.conf + etc/profile.d/libreoffice-fresh.sh + etc/profile.d/libreoffice-fresh.csh) + provides=('libreoffice' 'libreoffice-en-US') + conflicts=('libreoffice-still') + + mv fakeinstall/* ${pkgdir}/ + + # put configuration files into place + install -dm755 ${pkgdir}/etc/libreoffice + install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} \ + ${pkgdir}/etc/libreoffice/ + install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf \ + ${pkgdir}/etc/libreoffice/ + + # install dummy links to make them found by LibO + cd ${pkgdir}/usr/lib/libreoffice/program/ + ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . + cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ + ln -vsf /etc/libreoffice/psprint.conf . + + # allow to preset desired VLC + install -dm755 ${pkgdir}/etc/profile.d + install -m755 ${srcdir}/libreoffice-fresh.{sh,csh} ${pkgdir}/etc/profile.d/ + + # make pyuno find its modules + install -dm755 ${pkgdir}/usr/lib/python3.6/site-packages + ln -svf /usr/lib/libreoffice/program/uno.py \ + ${pkgdir}/usr/lib/python3.6/site-packages/uno.py + ln -svf /usr/lib/libreoffice/program/unohelper.py \ + ${pkgdir}/usr/lib/python3.6/site-packages/unohelper.py + + # add a symlink required for gnome-documents; FS#51887 + # https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html + ln -svf /usr/lib/libreoffice/program/liblibreofficekitgtk.so \ + ${pkgdir}/usr/lib/liblibreofficekitgtk.so + + # cleanup + rm -rf ${pkgdir}/usr/share/libreoffice/sdk + + # add application descriptions + install -v -m644 ${srcdir}/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \ + ${pkgdir}/usr/share/appdata +} Copied: libreoffice-fresh/repos/staging-x86_64/libreoffice-fresh.csh (from rev 322963, libreoffice-fresh/trunk/libreoffice-fresh.csh) =================================================================== --- staging-x86_64/libreoffice-fresh.csh (rev 0) +++ staging-x86_64/libreoffice-fresh.csh 2018-04-25 04:11:08 UTC (rev 322964) @@ -0,0 +1,6 @@ +# to force a certain look'n feel + +#setenv SAL_USE_VCLPLUGIN gen +#setenv SAL_USE_VCLPLUGIN kde4 +#setenv SAL_USE_VCLPLUGIN gtk +#setenv SAL_USE_VCLPLUGIN gtk3 Copied: libreoffice-fresh/repos/staging-x86_64/libreoffice-fresh.sh (from rev 322963, libreoffice-fresh/trunk/libreoffice-fresh.sh) =================================================================== --- staging-x86_64/libreoffice-fresh.sh (rev 0) +++ staging-x86_64/libreoffice-fresh.sh 2018-04-25 04:11:08 UTC (rev 322964) @@ -0,0 +1,6 @@ +# to force a certain look'n feel + +#export SAL_USE_VCLPLUGIN=gen +#export SAL_USE_VCLPLUGIN=kde4 +#export SAL_USE_VCLPLUGIN=gtk +#export SAL_USE_VCLPLUGIN=gtk3 Copied: libreoffice-fresh/repos/staging-x86_64/make-pyuno-work-with-system-wide-module-install.diff (from rev 322963, libreoffice-fresh/trunk/make-pyuno-work-with-system-wide-module-install.diff) =================================================================== --- staging-x86_64/make-pyuno-work-with-system-wide-module-install.diff (rev 0) +++ staging-x86_64/make-pyuno-work-with-system-wide-module-install.diff 2018-04-25 04:11:08 UTC (rev 322964) @@ -0,0 +1,18 @@ +--- a/pyuno/source/module/uno.py 2017-05-03 18:46:29.000000000 +0200 ++++ b/pyuno/source/module/uno.py.new 2017-06-06 17:11:27.585959637 +0200 +@@ -16,8 +16,14 @@ + # except in compliance with the License. You may obtain a copy of + # the License at http://www.apache.org/licenses/LICENSE-2.0 . + # +-import pyuno ++ ++# Special modification to make uno load on Arch ++import os + import sys ++sys.path.append("/usr/lib/libreoffice/program/") ++os.putenv("URE_BOOTSTRAP", "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc") ++ ++import pyuno + import traceback + import warnings + Copied: libreoffice-fresh/repos/staging-x86_64/poppler-0.64.patch (from rev 322963, libreoffice-fresh/trunk/poppler-0.64.patch) =================================================================== --- staging-x86_64/poppler-0.64.patch (rev 0) +++ staging-x86_64/poppler-0.64.patch 2018-04-25 04:11:08 UTC (rev 322964) @@ -0,0 +1,65 @@ +From 42cebff14f7d486c20f04863681cc5ef4602f4eb Mon Sep 17 00:00:00 2001 +From: Rene Engelhard <r...@debian.org> +Date: Tue, 24 Apr 2018 15:56:23 +0200 +Subject: [PATCH] fix build with poppler 0.64 + +GooString became const... + +Change-Id: Icc95be2e8603a4e22c6a9ac2008986bacd0bfba5 +--- + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 10 ++++++++++ + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++ + 2 files changed, 14 insertions(+) + +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index 48a735ba54a5..06e4faead383 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -432,6 +432,9 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state ) + FontAttributes aNewFont; + int nSize = 0; + ++#if POPPLER_CHECK_VERSION(0, 64, 0) ++ const ++#endif + GooString* pFamily = gfxFont->getName(); + if( pFamily ) + { +@@ -728,6 +731,9 @@ void PDFOutDev::updateFont(GfxState *state) + FontAttributes aFont; + int nEmbedSize=0; + ++#if POPPLER_CHECK_VERSION(0, 64, 0) ++ const ++#endif + Ref* pID = gfxFont->getID(); + // TODO(Q3): Portability problem + long long fontID = static_cast<long long>(pID->gen) << 32 | static_cast<long long>(pID->num); +@@ -918,7 +924,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y, + printf( "\n" ); + } + ++#if POPPLER_CHECK_VERSION(0, 64, 0) ++void PDFOutDev::drawString(GfxState*, const GooString* /*s*/) ++#else + void PDFOutDev::drawString(GfxState*, GooString* /*s*/) ++#endif + { + // TODO(F3): NYI + } +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +index c3367aa6ddf2..7e65f085d288 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +@@ -224,7 +224,11 @@ namespace pdfi + double dx, double dy, + double originX, double originY, + CharCode code, int nBytes, Unicode *u, int uLen) override; ++#if POPPLER_CHECK_VERSION(0, 64, 0) ++ virtual void drawString(GfxState *state, const GooString *s) override; ++#else + virtual void drawString(GfxState *state, GooString *s) override; ++#endif + virtual void endTextObject(GfxState *state) override; + + //----- image drawing