libreoffice upgrade 6.3.4.2 -> 6.4.1.2
* gobject-introspection build had to be reworked * use system mdds * poppler patch can go * 0006-make-sure-that-gengal-uses-native-libraries.patch does not seem necessary any more * since this was more efford as usual do some additional cleanup Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
@@ -44,6 +44,7 @@ DEPENDS += " \
|
||||
libmspub-native \
|
||||
libmwaw-native \
|
||||
libodfgen-native \
|
||||
mdds-1.5-native \
|
||||
"
|
||||
|
||||
SRC_URI += " \
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
PV = "6.3.4.2"
|
||||
DIRV = "6.3.4"
|
||||
PV = "6.4.1.2"
|
||||
DIRV = "6.4.1"
|
||||
|
||||
SRC_URI += " \
|
||||
http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "813a4c02a899ad0b69b9c6b894e0ccf0"
|
||||
SRC_URI[sha256sum] = "cb72559aa9774f2c13e8fa78391d8f30f3c6f02e3fd83b2311bd643a5cdde49c"
|
||||
SRC_URI[md5sum] = "3057676fb7f5e0d8583a7c31752dc2b2"
|
||||
SRC_URI[sha256sum] = "0d64a09d3e20140def0ce09f6d8914b83dc17f6bfa8e7923ddf3f54b1d493f0a"
|
||||
|
||||
@@ -11,15 +11,15 @@ SRC_URI += " \
|
||||
file://0003-remove-paths-for-gb_Executable_get_command.patch \
|
||||
file://0004-ensure-that-native-gendict-build-by-libreoffice-is-u.patch \
|
||||
file://0005-add-a-new-gb_Rdb_get_target_for_build_native-and-use.patch \
|
||||
file://0007-Package.mk-workaround-icu-missing-error-for-without-.patch \
|
||||
file://0008-configure.ac-avoid-finding-calling-pg_config.patch \
|
||||
file://0009-avoid-downloading-by-git-submodules.patch \
|
||||
file://0010-Use-wrappers-for-gobject-introspection.patch \
|
||||
file://0011-Fix-build-with-poppler-0.83.patch \
|
||||
file://0006-Package.mk-workaround-icu-missing-error-for-without-.patch \
|
||||
file://0007-configure.ac-avoid-finding-calling-pg_config.patch \
|
||||
file://0008-avoid-downloading-by-git-submodules.patch \
|
||||
file://0009-Use-wrappers-for-gobject-introspection.patch \
|
||||
file://0010-Support-install-to-find-bash-completion.in.patch \
|
||||
"
|
||||
|
||||
SRC_URI[translations.md5sum] = "586c89a3b60bbc90b3a32f870a05cca6"
|
||||
SRC_URI[translations.sha256sum] = "74a11926ba96ad2fa373a3231ad2e283d95e2ba4a1458c4c625686569f6f5fe9"
|
||||
SRC_URI[translations.md5sum] = "a2233b0924a3034249f75179a147ef35"
|
||||
SRC_URI[translations.sha256sum] = "f60b2cacd10b30e141d8cafe405404d475ffc505e8ca0f9aa0a9af4e3a8e4309"
|
||||
|
||||
DEPENDS += " \
|
||||
${BPN}-native \
|
||||
@@ -74,6 +74,7 @@ DEPENDS += " \
|
||||
liblangtag \
|
||||
lpsolve \
|
||||
gpgme \
|
||||
mdds-1.5 \
|
||||
"
|
||||
|
||||
# necessary to let the call for python-config succeed
|
||||
@@ -85,18 +86,12 @@ export STAGING_INCDIR
|
||||
# Notes:
|
||||
#
|
||||
# 1. By default many many sources are downloaded from libreoffice mirrors.
|
||||
# This can be avoided by --with-system-.. To see what's still loaded check
|
||||
# log.do_compile.
|
||||
#
|
||||
# 2. problems during configure detected for (TBD?)
|
||||
# * boost: 'configure: error: Could not find a version of the library!'
|
||||
#
|
||||
# 3. in case of trouble in do_compile: configure with --enable-verbose might
|
||||
# help detecting culprit
|
||||
#
|
||||
# 5. --enable-scripting-javascript / rhino meta-java
|
||||
# 6. Libreoffice Base embedded db / hsqldb meta-java
|
||||
# 7. galleries fail to build / prebuild from external sources?
|
||||
# This can be avoided by --with-system-.. To see what's still loaded check
|
||||
# log.do_compile.
|
||||
# 2. in case of trouble in do_compile: configure with --enable-verbose might
|
||||
# help detecting culprit
|
||||
# 3. --enable-scripting-javascript / rhino meta-java
|
||||
# 4. Libreoffice Base embedded db / hsqldb meta-java
|
||||
|
||||
EXTRA_OECONF += " \
|
||||
--without-java \
|
||||
@@ -133,19 +128,15 @@ EXTRA_OECONF += " \
|
||||
--with-system-gpgmepp \
|
||||
"
|
||||
|
||||
CXXFLAGS += "-DGLM_ENABLE_EXPERIMENTAL=1"
|
||||
|
||||
PACKAGECONFIG ??= " \
|
||||
gtk3 \
|
||||
mariadb \
|
||||
postgresql \
|
||||
"
|
||||
|
||||
PACKAGECONFIG[gtk] = "--enable-gtk , --disable-gtk, gtk+ cairo"
|
||||
PACKAGECONFIG[gtk3] = "--enable-gtk3 , --disable-gtk3, gtk+3 cairo"
|
||||
PACKAGECONFIG[avahi] = "--enable-avahi, --disable-avahi, avahi"
|
||||
PACKAGECONFIG[odk] = "--enable-odk, --disable-odk"
|
||||
|
||||
PACKAGECONFIG[mariadb] = "--with-system-mariadb, --disable-ext-mariadb-connector, mariadb"
|
||||
PACKAGECONFIG[postgresql] = "--enable-postgresql-sdbc --with-system-postgresql, --disable-postgresql-sdbc, postgresql"
|
||||
|
||||
@@ -178,41 +169,54 @@ do_configure() {
|
||||
sed -i 's:-I${includedir}/gpgme++:-I${STAGING_INCDIR}/gpgme++:g' ${B}/config_host.mk
|
||||
}
|
||||
|
||||
do_install() {
|
||||
do_compile_prepend() {
|
||||
# INTROSPECTION_SCANNER is exprted but INTROSPECTION_COMPILER is not. This
|
||||
# caused silent 'Permission denied' errors. So give a little help:
|
||||
# caused 'Permission denied' errors. So give a little help:
|
||||
export INTROSPECTION_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper
|
||||
}
|
||||
|
||||
do_install() {
|
||||
make DESTDIR=${D} distro-pack-install
|
||||
|
||||
chown -R root:root ${D}${libdir}/girepository-1.0
|
||||
# install LibreOfficeKit (gobject-introspection) manually - became necessary since 6.4.x
|
||||
install -m 0755 -d ${D}${libdir}/girepository-1.0
|
||||
install -m 0644 ${B}/workdir/CustomTarget/sysui/share/libreoffice/LOKDocView-0.1.typelib ${D}${libdir}/girepository-1.0/
|
||||
install -m 0755 -d ${D}${libdir}/gir-1.0
|
||||
install -m 0644 ${B}/workdir/CustomTarget/sysui/share/libreoffice/LOKDocView-0.1.gir ${D}${libdir}/gir-1.0/
|
||||
install -m 0755 ${B}/instdir/program/liblibreofficekitgtk.so ${D}${libdir}/
|
||||
# install LibreOfficeKit headers
|
||||
install -m 0755 -d ${D}${includedir}/LibreOfficeKit
|
||||
install -m 0644 ${S}/include/LibreOfficeKit/* ${D}${includedir}/LibreOfficeKit/
|
||||
|
||||
# unoconv
|
||||
install -d ${D}${bindir}
|
||||
install -m 0755 ${WORKDIR}/git/unoconv/unoconv ${D}/${bindir}
|
||||
|
||||
# remove some unneeded files
|
||||
rm -rf ${D}${libdir}/libreoffice/readmes
|
||||
rm -rf ${D}${libdir}/libreoffice/share/theme_definitions/ios
|
||||
rmdir ${D}${libdir}/libreoffice/share/theme_definitions
|
||||
}
|
||||
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/mime \
|
||||
${datadir}/application-registry \
|
||||
${datadir}/mimelnk \
|
||||
${datadir}/icons \
|
||||
${datadir}/appdata \
|
||||
${datadir}/application-registry \
|
||||
${datadir}/icons \
|
||||
${datadir}/mime \
|
||||
${datadir}/mime-info \
|
||||
${datadir}/mime/packages \
|
||||
"
|
||||
|
||||
FILES_${PN}-dev += "\
|
||||
${datadir}/gir-1.0 \
|
||||
"
|
||||
PACKAGES =+ "${PN}-odk ${PN}-officekit"
|
||||
|
||||
PACKAGE_BEFORE_PN += "${PN}-odk"
|
||||
FILES_${PN}-odk = " \
|
||||
${libdir}/libreoffice/sdk \
|
||||
"
|
||||
FILES_${PN}-odk = "${libdir}/libreoffice/sdk"
|
||||
INSANE_SKIP_${PN}-odk += "dev-so staticdev"
|
||||
|
||||
FILES_${PN}-officekit = " \
|
||||
${libdir}/girepository-1.0 \
|
||||
${libdir}/liblibreofficekitgtk.so \
|
||||
"
|
||||
|
||||
# based http://pkgs.fedoraproject.org/cgit/rpms/libreoffice.git/tree/libreoffice.spec
|
||||
LO_LANGUAGE_FILES = " \
|
||||
${libdir}/libreoffice/share/autocorr/*%{1}.dat \
|
||||
|
||||
@@ -80,7 +80,5 @@ EXTRA_OECONF = " \
|
||||
--with-system-libcdr \
|
||||
--with-system-libmspub \
|
||||
--with-system-libmwaw \
|
||||
--with-system-mdds \
|
||||
"
|
||||
|
||||
# TODO mdds
|
||||
|
||||
|
||||
@@ -9,13 +9,16 @@ Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [oe specific]
|
||||
|
||||
Sun, 2 Feb 2020:
|
||||
Adjusted for 6.4.0.3
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
solenv/gbuild/Package.mk | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
|
||||
index 841e819..e5acd28 100644
|
||||
index 45a56ff..4fa26fe 100644
|
||||
--- a/solenv/gbuild/Package.mk
|
||||
+++ b/solenv/gbuild/Package.mk
|
||||
@@ -79,7 +79,6 @@ $(call gb_Package_get_preparation_target,%) :
|
||||
@@ -24,7 +27,7 @@ index 841e819..e5acd28 100644
|
||||
$(call gb_Output_announce,$*,$(true),PKG,2)
|
||||
- $(if $(PACKAGE_DEFINED),,$(call gb_Output_error,Something depends on package $* which does not exist.))
|
||||
rm -f $@ && \
|
||||
mv $(call var2file,$@.tmp,100,$(sort $(FILES))) $@
|
||||
mv $(call var2file,$@.tmp,100,$(sort $(call gb_Package_get_files,$*))) $@
|
||||
|
||||
--
|
||||
2.21.0
|
||||
@@ -1,33 +0,0 @@
|
||||
From 8f21c644930042bca1725b9547f4a4585fe79784 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Wed, 9 Dec 2015 23:20:14 +0100
|
||||
Subject: [PATCH] make sure that gengal uses native libraries
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [cross specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
solenv/gbuild/Gallery.mk | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
|
||||
index 2ce708d..44d1bf4 100644
|
||||
--- a/solenv/gbuild/Gallery.mk
|
||||
+++ b/solenv/gbuild/Gallery.mk
|
||||
@@ -23,8 +23,8 @@ define gb_Gallery__make_env_args
|
||||
$(call gb_Helper_make_url,$(call gb_ComponentTarget_get_target_for_build,$(item))))" \
|
||||
"-env:UNO_TYPES=$(foreach item,offapi udkapi,\
|
||||
$(call gb_Helper_make_url,$(call gb_UnoApi_get_target,$(item))))" \
|
||||
--env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD)) \
|
||||
--env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD))
|
||||
+-env:URE_INTERNAL_LIB_DIR=%STAGING_LIBDIR_NATIVE% \
|
||||
+-env:LO_LIB_DIR=%STAGING_LIBDIR_NATIVE%
|
||||
endef
|
||||
|
||||
define gb_Gallery__command
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
From ed13bcd91383a5edcf2010953cf3287b8b26de9a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Mon, 5 Aug 2019 21:37:07 +0200
|
||||
Subject: [PATCH] Use wrappers for gobject-introspection
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
With INTROSPECTION_COMPILER not set by configure it is:
|
||||
|
||||
Upstream-Status: Inappropriate [oe-specific]
|
||||
|
||||
Sun, 2 Feb 2020:
|
||||
Adjusted for 6.4.0.3
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
sysui/CustomTarget_share.mk | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
|
||||
index 8af5d66..33b5d06 100644
|
||||
--- a/sysui/CustomTarget_share.mk
|
||||
+++ b/sysui/CustomTarget_share.mk
|
||||
@@ -183,7 +183,7 @@ ifneq ($(INTROSPECTION_SCANNER),)
|
||||
$(share_WORKDIR)/%/LOKDocView-0.1.gir: \
|
||||
$(call gb_Library_get_target,libreofficekitgtk)
|
||||
mkdir -p $(dir $@)
|
||||
- g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" \
|
||||
+ ${INTROSPECTION_SCANNER} "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" \
|
||||
"${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \
|
||||
`${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` \
|
||||
-I"${SRCDIR}/include/" \
|
||||
@@ -194,7 +194,7 @@ $(share_WORKDIR)/%/LOKDocView-0.1.gir: \
|
||||
--output="$@" --warn-all --no-libtool
|
||||
|
||||
$(share_WORKDIR)/%/LOKDocView-0.1.typelib: $(share_WORKDIR)/%/LOKDocView-0.1.gir
|
||||
- g-ir-compiler "$<" --output="$@"
|
||||
+ ${INTROSPECTION_COMPILER} "$<" --output="$@"
|
||||
|
||||
endif
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
From 9869faf9f67c1bf53b47e20c89f186d7e222acc5 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 29 Feb 2020 19:05:07 +0100
|
||||
Subject: [PATCH] Support install to find bash-completion.in
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
| Error: can't open bin/bash-completion.in for reading: [Errno 2] No such file or directory: 'bin/bash-completion.in'
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
bin/distro-install-desktop-integration | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
|
||||
index 1da104e..42991f8 100755
|
||||
--- a/bin/distro-install-desktop-integration
|
||||
+++ b/bin/distro-install-desktop-integration
|
||||
@@ -176,10 +176,10 @@ test -f $DESTDIR/gid_Module_Root_Brand && echo "$BINDIR/soffice" >>$DESTDIR/gid_
|
||||
|
||||
# create bash completion
|
||||
mkdir -p $DESTDIR/usr/share/bash-completion/completions
|
||||
-"${SRCDIR?}"/bin/generate-bash-completion.py bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
|
||||
+"${SRCDIR?}"/bin/generate-bash-completion.py "${SRCDIR?}"/bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
|
||||
test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
|
||||
if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then
|
||||
- "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh
|
||||
+ "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers "${SRCDIR?}"/bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh
|
||||
test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
|
||||
fi
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
From ed13bcd91383a5edcf2010953cf3287b8b26de9a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Mon, 5 Aug 2019 21:37:07 +0200
|
||||
Subject: [PATCH] Use wrappers for gobject-introspection
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
With INTROSPECTION_COMPILER not set by configure it is:
|
||||
|
||||
Upstream-Status: Inappropriate [oe-specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
sysui/desktop/share/create_tree.sh | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
|
||||
index 9fc2b99..c49b0b6 100755
|
||||
--- a/sysui/desktop/share/create_tree.sh
|
||||
+++ b/sysui/desktop/share/create_tree.sh
|
||||
@@ -86,7 +86,7 @@ cp "${APPDATA_SOURCE_DIR}/org.libreoffice.kde.metainfo.xml" "${DESTDIR}/${PREFIX
|
||||
# Generate gobject-introspection files
|
||||
if [ -n "$INTROSPECTION_SCANNER" ]; then
|
||||
mkdir -p "${DESTDIR}/${PREFIXDIR}/share/gir-1.0"
|
||||
- g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" "${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \
|
||||
+ ${INTROSPECTION_SCANNER} "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" "${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \
|
||||
`${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` -I"${SRCDIR}/include/" \
|
||||
--include=GLib-2.0 --include=GObject-2.0 --include=Gio-2.0 \
|
||||
--library=libreofficekitgtk --library-path="${INSTDIR}/program" \
|
||||
@@ -95,6 +95,6 @@ if [ -n "$INTROSPECTION_SCANNER" ]; then
|
||||
--output="${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" --warn-all --no-libtool
|
||||
|
||||
mkdir -p "${DESTDIR}/${LIBDIR}/girepository-1.0"
|
||||
- g-ir-compiler "${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" \
|
||||
+ ${INTROSPECTION_COMPILER} "${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" \
|
||||
--output="${DESTDIR}/${LIBDIR}/girepository-1.0/LOKDocView-0.1.typelib"
|
||||
fi
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -1,73 +0,0 @@
|
||||
From 9065cd8d9a19864f6b618f2dc10daf577badd9ee Mon Sep 17 00:00:00 2001
|
||||
From: Martin Milata <martin@martinmilata.cz>
|
||||
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 <michael.stahl@cib.de>
|
||||
---
|
||||
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);
|
||||
--
|
||||
2.21.0
|
||||
|
||||
Reference in New Issue
Block a user