From 6e8190c8e5194fa77430f76a64c0b469e7102015 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Thu, 2 Jul 2020 21:19:44 +0200 Subject: [PATCH] up to 6.4.5.2 - gtk2 widget library dropped - added TODO for qrcodegen --- libreoffice.spec | 103 +++------ mdds-1.5-orcus-0.15.patch | 450 -------------------------------------- poppler-0.82.patch | 121 ---------- poppler-0.83.patch | 79 ------- poppler-0.86.patch | 14 -- 5 files changed, 29 insertions(+), 738 deletions(-) delete mode 100644 mdds-1.5-orcus-0.15.patch delete mode 100644 poppler-0.82.patch delete mode 100644 poppler-0.83.patch delete mode 100644 poppler-0.86.patch diff --git a/libreoffice.spec b/libreoffice.spec index 1dd073f..d6320fc 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,7 +1,8 @@ # TODO: # - fix configure arguments (+ compare with FC) # - create CoinMP library package for PLD (https://projects.coin-or.org/CoinMP) -# - new language packs: ca@valencia, kmr@latin, sr@latin +# - new language packs: ca@valencia, kmr@latin, sr@latin, szl +# - create qrcodegen library package for PLD # # NOTE - FIXME FOR 3.4.3 !!!: # - normal build (i686) requires about 27 GB of disk space: @@ -13,7 +14,6 @@ # Conditional build: %bcond_without java # without Java support (disables help support) %bcond_without kde5 # KDE5 L&F packages -%bcond_without gtk # GTK2 L&F %bcond_without gtk3 # GTK3 L&F %bcond_without qt5 # QT5 L&F %bcond_with mono # enable compilation of mono bindings @@ -36,6 +36,7 @@ %bcond_with system_hsqldb %bcond_with system_agg # with system agg %bcond_without system_hunspell +%bcond_with system_qrcodegen # use system qrcodegen library (not in PLD yet) # this list is same as icedtea6 %ifnarch i486 i586 i686 pentium3 pentium4 athlon %{x8664} aarch64 @@ -52,30 +53,30 @@ %define with_qt5 1 %endif -%define major_ver 6.3.0 +%define major_ver 6.4.5 %define qt5_ver 5.6 Summary: LibreOffice - powerful office suite Summary(pl.UTF-8): LibreOffice - potężny pakiet biurowy Name: libreoffice -Version: %{major_ver}.4 -Release: 4 +Version: %{major_ver}.2 +Release: 1 License: GPL/LGPL Group: X11/Applications Source0: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-%{version}.tar.xz -# Source0-md5: d24bd7e5116743196c67e7df4b18458f +# Source0-md5: 7305ed1b5774483ca9ca0d6906d8049a Source1: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz -# Source1-md5: 81df66dd522a2c56a4f11b24247fb114 +# Source1-md5: f4a3d9dcca02542ec149057d869c8c64 Source2: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz -# Source2-md5: 483f654eaa94f17c462494029d42334a +# Source2-md5: 19da65b2748531e85740163fc9695f00 Source3: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz -# Source3-md5: 21459291d488ecd7e4e8fb0fdcc55aca +# Source3-md5: 58771e45d87413f96a33e35d821a8122 # make (download|fetch) DO_FETCH_TARBALLS=1 WGET=wget # but not sure if all are needed? -Source20: http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2 -# Source20-md5: 4c11c2a0c6a6469ba5c097c755e06fed +Source20: http://dev-www.libreoffice.org/src/pdfium-3963.tar.bz2 +# Source20-md5: 7688ac08e1292cf7e0d027f506f45c49 Source21: http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip # Source21-md5: 17410483b5b5f267aa18b7e00b65e6e0 Source22: http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz @@ -92,12 +93,12 @@ Source27: http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xs # Source27-md5: a7983f859eafb2677d7ff386a023bc40 Source28: https://dev-www.libreoffice.org/extern/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf # Source28-md5: 866ba2ca4188f1610b121dfd514a17e8 +Source29: https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz +# Source29-md5: 0e81d36829be287ff27ae802e0587463 +Source30: https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar +# Source30-md5: 8249374c274932a21846fa7629c2aa9b Patch0: disable-failing-test.patch -Patch1: mdds-1.5-orcus-0.15.patch -Patch2: poppler-0.82.patch -Patch3: poppler-0.83.patch -Patch4: poppler-0.86.patch URL: http://www.documentfoundation.org/ BuildRequires: /usr/bin/getopt @@ -135,7 +136,6 @@ BuildRequires: gpgme-c++-devel BuildRequires: graphite2-devel >= 0.9.3 BuildRequires: gstreamer-devel >= 1.0 BuildRequires: gstreamer-plugins-base-devel >= 1.0 -%{?with_gtk:BuildRequires: gtk+2-devel >= 2:2.10} %{?with_gtk3:BuildRequires: gtk+3-devel} BuildRequires: harfbuzz-icu-devel >= 0.9.42 %{?with_system_hunspell:BuildRequires: hunspell-devel >=1.2.2} @@ -227,7 +227,7 @@ BuildRequires: sed >= 4.0 BuildRequires: startup-notification-devel >= 0.5 BuildRequires: unixODBC-devel >= 2.2.12-2 BuildRequires: unzip -BuildRequires: xmlsec1-nss-devel >= 1.2.24 +BuildRequires: xmlsec1-nss-devel >= 1.2.28 BuildRequires: xorg-font-font-adobe-utopia-type1 BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libXaw-devel @@ -334,45 +334,13 @@ LibreOffice productivity suite - KDE 5 Interface. %description libs-kde5 -l pl.UTF-8 Pakiet biurowy LibreOffice - Interfejs KDE 5. -%package libs-gtk-common -Summary: Common files for LibreOffice GTK+ Interface -Summary(pl.UTF-8): Pakiet wspólny dla interfejsów GTK+ dla LibreOffice -Group: X11/Libraries -Requires: %{name}-core = %{version}-%{release} -%if "%{_rpmversion}" >= "5" -BuildArch: noarch -%endif - -%description libs-gtk-common -Common files for LibreOffice GTK+ Interface. - -%description libs-gtk-common -l pl.UTF-8 -Pakiet wspólny dla interfejsów GTK+ dla LibreOffice. - -%package libs-gtk2 -Summary: LibreOffice GTK+ 2 Interface -Summary(pl.UTF-8): Interfejs GTK+ 2 dla LibreOffice -Group: X11/Libraries -Requires: %{name}-core = %{version}-%{release} -Requires: %{name}-libs-gtk-common = %{version}-%{release} -Obsoletes: libreoffice-libs-gtk < 6.2.3.1-2 -Obsoletes: openoffice-i18n-en -Obsoletes: openoffice-i18n-en-gtk -Obsoletes: openoffice-libs-gtk -Obsoletes: openoffice.org-libs-gtk - -%description libs-gtk2 -LibreOffice productivity suite - GTK+ 2 Interface. - -%description libs-gtk2 -l pl.UTF-8 -Pakiet biurowy LibreOffice - Interfejs GTK+ 2. - %package libs-gtk3 Summary: LibreOffice GTK+ 3 Interface Summary(pl.UTF-8): Interfejs GTK+ 3 dla LibreOffice Group: X11/Libraries Requires: %{name}-core = %{version}-%{release} -Requires: %{name}-libs-gtk-common = %{version}-%{release} +Obsoletes: libreoffice-libs-gtk-common < 6.4.5.2-1 +Obsoletes: libreoffice-libs-gtk2 < 6.4.5.2-1 %description libs-gtk3 LibreOffice productivity suite - GTK+ 3 Interface. @@ -3023,10 +2991,6 @@ dialogs. %prep %setup -q -a1 -a2 -a3 %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 for dir in *-%{version}; do [ -f $dir/ChangeLog ] && mv $dir/ChangeLog ChangeLog-$dir @@ -3044,6 +3008,8 @@ ln %{SOURCE25} ext_sources ln %{SOURCE26} ext_sources ln %{SOURCE27} ext_sources ln %{SOURCE28} ext_sources +ln %{SOURCE29} ext_sources +ln %{SOURCE30} ext_sources :> src.downloaded %build @@ -3115,6 +3081,7 @@ export PATH=$PATH:%{_libdir}/interbase/bin %{?with_system_beanshell:--with-system-beanshell} \ --with%{!?with_system_hsqldb:out}-system-hsqldb \ %{?with_system_hunspell:--with-system-hunspell --without-myspell-dicts} \ + %{?with_system_qrcodegen:--with%{!?with_system_qrcodegen:out}-system-qrcodegen}} \ %{?with_system_libhnj:--with-system-altlinuxhyphen} \ %{?with_msaccess:--with%{!?with_system_mdbtools:out}-system-mdbtools}} \ --enable-python=system \ @@ -3141,7 +3108,6 @@ export PATH=$PATH:%{_libdir}/interbase/bin --with-x \ --without-fonts \ --disable-epm \ - --%{?with_gtk:en}%{!?with_gtk:dis}able-gtk \ --%{?with_gtk3:en}%{!?with_gtk3:dis}able-gtk3 \ --enable-dbus \ --with-system-openldap \ @@ -3160,7 +3126,6 @@ export PATH=$PATH:%{_libdir}/interbase/bin %{__enable_disable firebird firebird-sdbc} \ %{__enable_disable pgsql postgresql-sdbc} \ --enable-gstreamer-1-0 \ - --disable-gstreamer-0-10 \ --disable-fetch-external # this limits processing some files but doesn't limit parallel build @@ -3521,7 +3486,6 @@ fi %attr(755,root,root) %{_libdir}/%{name}/program/libdbalo.so %attr(755,root,root) %{_libdir}/%{name}/program/libdbaselo.so %attr(755,root,root) %{_libdir}/%{name}/program/libdbaxmllo.so -%attr(755,root,root) %{_libdir}/%{name}/program/libdbmmlo.so %attr(755,root,root) %{_libdir}/%{name}/program/libdbpool2.so %attr(755,root,root) %{_libdir}/%{name}/program/libdbtoolslo.so %attr(755,root,root) %{_libdir}/%{name}/program/libdbulo.so @@ -3671,7 +3635,6 @@ fi %attr(755,root,root) %{_libdir}/%{name}/program/pagein* %attr(755,root,root) %{_libdir}/%{name}/program/senddoc %attr(755,root,root) %{_libdir}/%{name}/program/uri-encode -%{?with_gtk:%attr(755,root,root) %{_libdir}/%{name}/program/xid-fullscreen-on-all-monitors} %if %{with java} %attr(755,root,root) %{_libdir}/%{name}/program/libhsqldb.so @@ -3805,14 +3768,17 @@ fi %dir %{_datadir}/%{name}/share/config %{_datadir}/%{name}/share/config/images_breeze.zip %{_datadir}/%{name}/share/config/images_breeze_dark.zip +%{_datadir}/%{name}/share/config/images_breeze_dark_svg.zip %{_datadir}/%{name}/share/config/images_breeze_svg.zip %{_datadir}/%{name}/share/config/images_colibre.zip %{_datadir}/%{name}/share/config/images_colibre_svg.zip %{_datadir}/%{name}/share/config/images_elementary.zip %{_datadir}/%{name}/share/config/images_elementary_svg.zip %{_datadir}/%{name}/share/config/images_karasa_jaga.zip +%{_datadir}/%{name}/share/config/images_karasa_jaga_svg.zip %{_datadir}/%{name}/share/config/images_sifr.zip %{_datadir}/%{name}/share/config/images_sifr_dark.zip +%{_datadir}/%{name}/share/config/images_sifr_dark_svg.zip %{_datadir}/%{name}/share/config/images_sifr_svg.zip %{_datadir}/%{name}/share/config/images_tango.zip %dir %{_datadir}/%{name}/share/config/soffice.cfg @@ -3997,20 +3963,8 @@ fi %if %{with kde5} %files libs-kde5 %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_kde5*.so -%attr(755,root,root) %{_libdir}/%{name}/program/libkde5be1lo.so -%endif - -%if %{with gtk} || %{with gtk3} -%files libs-gtk-common -%defattr(644,root,root,755) -%{_datadir}/%{name}/share/registry/gnome.xcd -%endif - -%if %{with gtk} -%files libs-gtk2 -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_gtklo.so +%attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_kf5*.so +%attr(755,root,root) %{_libdir}/%{name}/program/libkf5be1lo.so %endif %if %{with gtk3} @@ -4018,7 +3972,7 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/%{name}/program/liblibreofficekitgtk.so %attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_gtk3lo.so -%{_libdir}/girepository-1.0/LOKDocView-0.1.typelib +%{_datadir}/%{name}/share/registry/gnome.xcd # devel stuff? #%{_datadir}/gir-1.0/LOKDocView-0.1.gir %endif @@ -4045,6 +3999,7 @@ fi %attr(755,root,root) %{_libdir}/%{name}/program/librptlo.so %attr(755,root,root) %{_libdir}/%{name}/program/librptuilo.so %attr(755,root,root) %{_libdir}/%{name}/program/librptxmllo.so +%{_libdir}/%{name}/program/access2base.py %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbapp/menubar %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbapp/popupmenu %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbapp/statusbar diff --git a/mdds-1.5-orcus-0.15.patch b/mdds-1.5-orcus-0.15.patch deleted file mode 100644 index 838cffe..0000000 --- a/mdds-1.5-orcus-0.15.patch +++ /dev/null @@ -1,450 +0,0 @@ -From 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4 Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida -Date: Mon, 12 Aug 2019 13:57:34 -0400 -Subject: [PATCH] Switch mdds to 1.5.0 and liborcus to 0.15.0. - -Change-Id: Ibff9a5e0f0771e4cf12b4dc3985661a01195e265 -Reviewed-on: https://gerrit.libreoffice.org/77482 -Tested-by: Jenkins -Reviewed-by: Kohei Yoshida ---- - RepositoryExternal.mk | 4 +-- - configure.ac | 4 +-- - download.lst | 8 +++--- - ...1-Prevent-unsigned-integer-underflow.patch | 27 ------------------- - external/liborcus/ExternalPackage_liborcus.mk | 8 +++--- - external/liborcus/ExternalProject_liborcus.mk | 4 +-- - external/liborcus/Library_orcus-parser.mk | 2 ++ - external/liborcus/Library_orcus.mk | 7 +++++ - external/liborcus/UnpackedTarball_liborcus.mk | 3 --- - external/liborcus/version.patch.0 | 11 -------- - sc/inc/mtvelements.hxx | 8 +++--- - sc/inc/orcusxml.hxx | 1 + - sc/qa/unit/dataproviders_test.cxx | 1 + - sc/source/core/tool/scmatrix.cxx | 8 +++--- - sc/source/filter/inc/orcusinterface.hxx | 2 ++ - sc/source/filter/orcus/interface.cxx | 8 ++++-- - sc/source/filter/orcus/orcusfiltersimpl.cxx | 4 +-- - sc/source/filter/orcus/xmlcontext.cxx | 9 ++++++- - sc/source/ui/xmlsource/xmlsourcedlg.cxx | 6 +++++ - svl/source/misc/gridprinter.cxx | 2 +- - 20 files changed, 58 insertions(+), 69 deletions(-) - delete mode 100644 external/liborcus/0001-Prevent-unsigned-integer-underflow.patch - delete mode 100644 external/liborcus/version.patch.0 - -diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk -index 54ab1dbfdcc3..57f66b8f344a 100644 ---- a/RepositoryExternal.mk -+++ b/RepositoryExternal.mk -@@ -3262,7 +3262,7 @@ $(call gb_LinkTarget_set_include,$(1),\ - ) - - $(call gb_LinkTarget_add_libs,$(1),\ -- -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.14 \ -+ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.15 \ - ) - - $(if $(SYSTEM_BOOST), \ -@@ -3281,7 +3281,7 @@ $(call gb_LinkTarget_set_include,$(1),\ - ) - - $(call gb_LinkTarget_add_libs,$(1),\ -- -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.14 \ -+ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.15 \ - ) - - endef -diff --git a/configure.ac b/configure.ac -index 1510daf22454..d0e6759b1f52 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9291,7 +9291,7 @@ AC_SUBST(SYSTEM_BOOST) - dnl =================================================================== - dnl Check for system mdds - dnl =================================================================== --libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.4 >= 1.4.1], ["-I${WORKDIR}/UnpackedTarball/mdds/include"]) -+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.5 >= 1.5.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"]) - - dnl =================================================================== - dnl Check for system glm -@@ -9597,7 +9597,7 @@ AC_SUBST(ENABLE_FUZZERS) - dnl =================================================================== - dnl Orcus - dnl =================================================================== --libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.14 >= 0.14.0]) -+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.15 >= 0.15.0]) - if test "$with_system_orcus" != "yes"; then - if test "$SYSTEM_BOOST" = "TRUE"; then - # =========================================================== -diff --git a/download.lst b/download.lst -index b57ed794d2a6..59b58f96347c 100644 ---- a/download.lst -+++ b/download.lst -@@ -168,8 +168,8 @@ export LXML_SHA256SUM := 940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a - export LXML_TARBALL := lxml-4.1.1.tgz - export MARIADB_CONNECTOR_C_SHA256SUM := fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60 - export MARIADB_CONNECTOR_C_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz --export MDDS_SHA256SUM := 25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81 --export MDDS_TARBALL := mdds-1.4.3.tar.bz2 -+export MDDS_SHA256SUM := 74cda018d5aa39a2f91652608efb066fd225f3597ce54733e6ab1e99e52606f7 -+export MDDS_TARBALL := mdds-1.5.0.tar.bz2 - export MDNSRESPONDER_SHA256SUM := e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0 - export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz - export MSPUB_SHA256SUM := ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba -@@ -194,8 +194,8 @@ export OPENLDAP_SHA256SUM := cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89 - export OPENLDAP_TARBALL := openldap-2.4.45.tgz - export OPENSSL_SHA256SUM := ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6 - export OPENSSL_TARBALL := openssl-1.0.2r.tar.gz --export ORCUS_SHA256SUM := 3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f --export ORCUS_TARBALL := liborcus-0.14.1.tar.gz -+export ORCUS_SHA256SUM := 06ec7567896d76ca579efada794cc281a5d6b427195def01cbcfd79795e8a944 -+export ORCUS_TARBALL := liborcus-0.15.0.tar.gz - export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb - export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz - export PAGEMAKER_SHA256SUM := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d -diff --git a/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch b/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch -deleted file mode 100644 -index 3353857a2d10..000000000000 ---- a/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch -+++ /dev/null -@@ -1,27 +0,0 @@ --From 1967be013804f4f578b53659d7ef459b4c35de9f Mon Sep 17 00:00:00 2001 --From: Kohei Yoshida --Date: Wed, 7 Nov 2018 21:08:40 -0500 --Subject: [PATCH] Prevent unsigned integer underflow. -- --(cherry picked from commit 40bbce85048b77c545103af124f3d9831dd4a458) ----- -- src/parser/parser_base.cpp | 3 ++- -- 1 file changed, 2 insertions(+), 1 deletion(-) -- --diff --git a/src/parser/parser_base.cpp b/src/parser/parser_base.cpp --index 586d495f..9d426efb 100644 ----- a/src/parser/parser_base.cpp --+++ b/src/parser/parser_base.cpp --@@ -120,7 +120,8 @@ double parser_base::parse_double() -- -- size_t parser_base::remaining_size() const -- { --- return std::distance(mp_char, mp_end) - 1; --+ size_t n = std::distance(mp_char, mp_end); --+ return n ? (n - 1) : 0; -- } -- -- std::ptrdiff_t parser_base::offset() const ---- --2.17.1 -- -diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk -index ffa0b38bea19..21dd1bfb1ce5 100644 ---- a/external/liborcus/ExternalPackage_liborcus.mk -+++ b/external/liborcus/ExternalPackage_liborcus.mk -@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus)) - $(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus)) - - ifeq ($(OS),MACOSX) --$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.14.0.dylib,src/liborcus/.libs/liborcus-0.14.0.dylib)) --$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.14.0.dylib,src/parser/.libs/liborcus-parser-0.14.0.dylib)) -+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.15.0.dylib,src/liborcus/.libs/liborcus-0.15.0.dylib)) -+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.15.0.dylib,src/parser/.libs/liborcus-parser-0.15.0.dylib)) - else ifeq ($(DISABLE_DYNLOADING),) --$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.14.so.0,src/liborcus/.libs/liborcus-0.14.so.0.0.0)) --$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.14.so.0,src/parser/.libs/liborcus-parser-0.14.so.0.0.0)) -+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.15.so.0,src/liborcus/.libs/liborcus-0.15.so.0.0.0)) -+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.15.so.0,src/parser/.libs/liborcus-parser-0.15.so.0.0.0)) - endif - - # vim: set noet sw=4 ts=4: -diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk -index 8cc1c030fa98..0bd36c379d9b 100644 ---- a/external/liborcus/ExternalProject_liborcus.mk -+++ b/external/liborcus/ExternalProject_liborcus.mk -@@ -122,8 +122,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : - $(MAKE) \ - $(if $(filter MACOSX,$(OS)),\ - && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ -- $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.14.0.dylib \ -- $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.14.0.dylib \ -+ $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.15.0.dylib \ -+ $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.15.0.dylib \ - ) \ - ) - -diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk -index 32367b843f68..d25d82163d9a 100644 ---- a/external/liborcus/Library_orcus-parser.mk -+++ b/external/liborcus/Library_orcus-parser.mk -@@ -13,6 +13,7 @@ $(eval $(call gb_Library_use_unpacked,orcus-parser,liborcus)) - - $(eval $(call gb_Library_use_externals,orcus-parser,\ - boost_headers \ -+ boost_filesystem \ - boost_system \ - mdds_headers \ - zlib \ -@@ -22,6 +23,7 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus-parser)) - - $(eval $(call gb_Library_set_include,orcus-parser,\ - -I$(call gb_UnpackedTarball_get_dir,liborcus)/include \ -+ -I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \ - $$(INCLUDE) \ - )) - -diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk -index 2b20cdf84ea4..3793805c3c00 100644 ---- a/external/liborcus/Library_orcus.mk -+++ b/external/liborcus/Library_orcus.mk -@@ -24,6 +24,7 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus)) - - $(eval $(call gb_Library_set_include,orcus,\ - -I$(call gb_UnpackedTarball_get_dir,liborcus)/include \ -+ -I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \ - $$(INCLUDE) \ - )) - -@@ -68,6 +69,9 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\ - UnpackedTarball/liborcus/src/liborcus/info \ - UnpackedTarball/liborcus/src/liborcus/interface \ - UnpackedTarball/liborcus/src/liborcus/json_document_tree \ -+ UnpackedTarball/liborcus/src/liborcus/json_map_tree \ -+ UnpackedTarball/liborcus/src/liborcus/json_structure_mapper \ -+ UnpackedTarball/liborcus/src/liborcus/json_structure_tree \ - UnpackedTarball/liborcus/src/liborcus/json_util \ - UnpackedTarball/liborcus/src/liborcus/measurement \ - UnpackedTarball/liborcus/src/liborcus/odf_helper \ -@@ -92,12 +96,15 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\ - UnpackedTarball/liborcus/src/liborcus/orcus_gnumeric \ - UnpackedTarball/liborcus/src/liborcus/orcus_import_ods \ - UnpackedTarball/liborcus/src/liborcus/orcus_import_xlsx \ -+ UnpackedTarball/liborcus/src/liborcus/orcus_json \ - UnpackedTarball/liborcus/src/liborcus/orcus_ods \ - UnpackedTarball/liborcus/src/liborcus/orcus_xls_xml \ - UnpackedTarball/liborcus/src/liborcus/orcus_xlsx \ - UnpackedTarball/liborcus/src/liborcus/orcus_xml \ -+ UnpackedTarball/liborcus/src/liborcus/orcus_xml_map_def \ - UnpackedTarball/liborcus/src/liborcus/session_context \ - UnpackedTarball/liborcus/src/liborcus/spreadsheet_iface_util \ -+ UnpackedTarball/liborcus/src/liborcus/spreadsheet_impl_types \ - UnpackedTarball/liborcus/src/liborcus/spreadsheet_interface \ - UnpackedTarball/liborcus/src/liborcus/spreadsheet_types \ - UnpackedTarball/liborcus/src/liborcus/string_helper \ -diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk -index e1d810a49dc2..74fbbb2e9e33 100644 ---- a/external/liborcus/UnpackedTarball_liborcus.mk -+++ b/external/liborcus/UnpackedTarball_liborcus.mk -@@ -19,12 +19,9 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus)) - # "Remove unused - # VERSION file": - $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ -- external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \ - external/liborcus/rpath.patch.0 \ - external/liborcus/gcc9.patch.0 \ -- external/liborcus/version.patch.0 \ - external/liborcus/libtool.patch.0 \ -- external/liborcus/0001-Prevent-unsigned-integer-underflow.patch \ - )) - - ifeq ($(OS),WNT) -diff --git a/external/liborcus/version.patch.0 b/external/liborcus/version.patch.0 -deleted file mode 100644 -index 2c0b5ae4ca07..000000000000 ---- a/external/liborcus/version.patch.0 -+++ /dev/null -@@ -1,11 +0,0 @@ ----- configure --+++ configure --@@ -21055,7 +21055,7 @@ -- -- fi -- ---ac_config_files="$ac_config_files Makefile liborcus-$ORCUS_API_VERSION.pc:liborcus.pc.in liborcus-spreadsheet-model-$ORCUS_API_VERSION.pc:liborcus-spreadsheet-model.pc.in VERSION include/Makefile include/orcus/Makefile include/orcus/detail/Makefile include/orcus/mso/Makefile include/orcus/spreadsheet/Makefile src/Makefile src/liborcus/Makefile src/liborcus/constants.inl src/mso/Makefile src/parser/Makefile src/python/Makefile src/spreadsheet/Makefile parser_handlers/Makefile benchmark/Makefile doc_example/Makefile" --+ac_config_files="$ac_config_files Makefile liborcus-$ORCUS_API_VERSION.pc:liborcus.pc.in liborcus-spreadsheet-model-$ORCUS_API_VERSION.pc:liborcus-spreadsheet-model.pc.in include/Makefile include/orcus/Makefile include/orcus/detail/Makefile include/orcus/mso/Makefile include/orcus/spreadsheet/Makefile src/Makefile src/liborcus/Makefile src/liborcus/constants.inl src/mso/Makefile src/parser/Makefile src/python/Makefile src/spreadsheet/Makefile parser_handlers/Makefile benchmark/Makefile doc_example/Makefile" -- -- cat >confcache <<\_ACEOF -- # This file is a shell script that caches the results of configure -diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx -index 407f0392c4cd..382fb4d2b688 100644 ---- a/sc/inc/mtvelements.hxx -+++ b/sc/inc/mtvelements.hxx -@@ -52,9 +52,9 @@ const mdds::mtv::element_t element_type_formula = mdds::mtv::element_type_user_s - const mdds::mtv::element_t element_type_cellnote = mdds::mtv::element_type_user_start + 5; - - /// Mapped standard element types (for convenience). --const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_numeric; -+const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_double; - const mdds::mtv::element_t element_type_empty = mdds::mtv::element_type_empty; --const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_ushort; -+const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_uint16; - - /// Custom element blocks. - -@@ -66,8 +66,8 @@ typedef mdds::mtv::noncopyable_managed_element_block formula_block; - - /// Mapped standard element blocks (for convenience). --typedef mdds::mtv::numeric_element_block numeric_block; --typedef mdds::mtv::ushort_element_block uint16_block; -+typedef mdds::mtv::double_element_block numeric_block; -+typedef mdds::mtv::uint16_element_block uint16_block; - - /// This needs to be in the same namespace as CellTextAttr. - MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(CellTextAttr, element_type_celltextattr, CellTextAttr(), celltextattr_block) -diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx -index ced991e51ded..5db292c29d54 100644 ---- a/sc/inc/orcusxml.hxx -+++ b/sc/inc/orcusxml.hxx -@@ -69,6 +69,7 @@ struct ScOrcusImportXMLParam - { - ScAddress maPos; - std::vector maFieldPaths; -+ std::vector maRowGroups; - }; - - typedef std::vector CellLinksType; -diff --git a/sc/qa/unit/dataproviders_test.cxx b/sc/qa/unit/dataproviders_test.cxx -index 1e9cf97e8dc3..a9b6b1142c7f 100644 ---- a/sc/qa/unit/dataproviders_test.cxx -+++ b/sc/qa/unit/dataproviders_test.cxx -@@ -156,6 +156,7 @@ void ScDataProvidersTest::testXMLImport() - aRangeLink.maPos = ScAddress(0,0,0); - aRangeLink.maFieldPaths.push_back("/bookstore/book/title"); - aRangeLink.maFieldPaths.push_back("/bookstore/book/author"); -+ aRangeLink.maRowGroups.push_back("/bookstore/book"); - aParam.maRangeLinks.push_back(aRangeLink); - - createFileURL("test1.", "xml", aFileURL); -diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx -index 04660abe195c..2c03fe0a074e 100644 ---- a/sc/source/core/tool/scmatrix.cxx -+++ b/sc/source/core/tool/scmatrix.cxx -@@ -1935,8 +1935,8 @@ class ToDoubleArray - { - case mdds::mtm::element_numeric: - { -- numeric_element_block::const_iterator it = numeric_element_block::begin(*node.data); -- numeric_element_block::const_iterator itEnd = numeric_element_block::end(*node.data); -+ double_element_block::const_iterator it = double_element_block::begin(*node.data); -+ double_element_block::const_iterator itEnd = double_element_block::end(*node.data); - for (; it != itEnd; ++it, ++miPos) - *miPos = *it; - } -@@ -2012,8 +2012,8 @@ class MergeDoubleArrayFunc - { - case mdds::mtm::element_numeric: - { -- numeric_element_block::const_iterator it = numeric_element_block::begin(*node.data); -- numeric_element_block::const_iterator itEnd = numeric_element_block::end(*node.data); -+ double_element_block::const_iterator it = double_element_block::begin(*node.data); -+ double_element_block::const_iterator itEnd = double_element_block::end(*node.data); - for (; it != itEnd; ++it, ++miPos) - { - if (GetDoubleErrorValue(*miPos) == FormulaError::ElementNaN) -diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx -index 9d090b744619..7c7c4f20bb3c 100644 ---- a/sc/source/filter/inc/orcusinterface.hxx -+++ b/sc/source/filter/inc/orcusinterface.hxx -@@ -332,6 +332,8 @@ public: - - virtual orcus::spreadsheet::range_size_t get_sheet_size() const override; - -+ virtual void fill_down_cells(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::row_t range_size) override; -+ - SCTAB getIndex() const { return mnTab; } - - const sc::SharedFormulaGroups& getSharedFormulaGroups() const; -diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx -index 833fb278e397..23f17a1dc854 100644 ---- a/sc/source/filter/orcus/interface.cxx -+++ b/sc/source/filter/orcus/interface.cxx -@@ -61,8 +61,7 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t - case orcus::spreadsheet::formula_grammar_t::ods: - eGrammar = formula::FormulaGrammar::GRAM_ODFF; - break; -- case orcus::spreadsheet::formula_grammar_t::xlsx_2007: -- case orcus::spreadsheet::formula_grammar_t::xlsx_2010: -+ case orcus::spreadsheet::formula_grammar_t::xlsx: - eGrammar = formula::FormulaGrammar::GRAM_OOXML; - break; - case orcus::spreadsheet::formula_grammar_t::gnumeric: -@@ -1188,6 +1187,11 @@ orcus::spreadsheet::range_size_t ScOrcusSheet::get_sheet_size() const - return ret; - } - -+void ScOrcusSheet::fill_down_cells(os::row_t /*row*/, os::col_t /*col*/, os::row_t /*range_size*/) -+{ -+ // TODO : implement this. -+} -+ - const sc::SharedFormulaGroups& ScOrcusSheet::getSharedFormulaGroups() const - { - return maFormulaGroups; -diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx -index cdfb70d71c1b..8e9b0b1a5f04 100644 ---- a/sc/source/filter/orcus/orcusfiltersimpl.cxx -+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx -@@ -139,10 +139,10 @@ bool ScOrcusFiltersImpl::importODS_Styles(ScDocument& rDoc, OUString& aPath) con - - try - { -- std::string content = orcus::load_file_content(path); -+ orcus::file_content content(path); - ScOrcusFactory aFactory(rDoc); - ScOrcusStyles aStyles(aFactory); -- orcus::import_ods::read_styles(content.c_str(), content.size(), &aStyles); -+ orcus::import_ods::read_styles(content.data(), content.size(), &aStyles); - } - catch (const std::exception& e) - { -diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx -index 2548f5b19d9f..71c44bc35823 100644 ---- a/sc/source/filter/orcus/xmlcontext.cxx -+++ b/sc/source/filter/orcus/xmlcontext.cxx -@@ -269,10 +269,17 @@ void ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam) - - std::for_each(rLink.maFieldPaths.begin(), rLink.maFieldPaths.end(), InsertFieldPath(filter)); - -+ std::for_each(rLink.maRowGroups.begin(), rLink.maRowGroups.end(), -+ [&filter] (const OString& rRowGroup) -+ { -+ filter.set_range_row_group(rRowGroup.getStr()); -+ } -+ ); -+ - filter.commit_range(); - } - -- std::string content = orcus::load_file_content(path); -+ orcus::file_content content(path); - filter.read_stream(content.data(), content.size()); - - aFactory.finalize(); -diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx -index 95e80068f48d..26b0cbcf4f1a 100644 ---- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx -+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx -@@ -533,6 +533,12 @@ void ScXMLSourceDlg::OkPressed() - // Go through all its child elements. - getFieldLinks(aRangeLink, aParam.maNamespaces, *mxLbTree, *rEntry); - -+ // Add the anchor node as a grouping node, which will be used as a -+ // row position increment point. -+ OUString aThisEntry = getXPath(*mxLbTree, *rEntry, aParam.maNamespaces); -+ aRangeLink.maRowGroups.push_back( -+ OUStringToOString(aThisEntry, RTL_TEXTENCODING_UTF8)); -+ - aParam.maRangeLinks.push_back(aRangeLink); - } - } -diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx -index e129457a8215..4f013d4b6b8c 100644 ---- a/svl/source/misc/gridprinter.cxx -+++ b/svl/source/misc/gridprinter.cxx -@@ -29,7 +29,7 @@ typedef mdds::mtv::default_element_block string_b - struct matrix_trait - { - typedef string_block string_element_block; -- typedef mdds::mtv::ushort_element_block integer_element_block; -+ typedef mdds::mtv::uint16_element_block integer_element_block; - - typedef mdds::mtv::custom_block_func1 element_block_func; - }; diff --git a/poppler-0.82.patch b/poppler-0.82.patch deleted file mode 100644 index f1861a7..0000000 --- a/poppler-0.82.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 2eadd46ab81058087af95bdfc1fea28fcdb65998 Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen -Date: Sat, 26 Oct 2019 14:11:35 +0200 -Subject: [PATCH] Fix build with poppler-0.82 - -Change-Id: I3b6b3faea7986f3e5a6ae4790580d03bc9c955fc -Reviewed-on: https://gerrit.libreoffice.org/81545 -Tested-by: Jenkins -Reviewed-by: Michael Stahl ---- - .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 25 +++++++++++++++++++ - .../pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 16 +++++++++++- - 2 files changed, 40 insertions(+), 1 deletion(-) - -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index ce32a4139c45..3ae3bdc503e0 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -863,11 +863,20 @@ void PDFOutDev::eoClip(GfxState *state) - local offset of character (zero for horizontal writing mode). not - taken into account for output pos updates. Used for vertical writing. - */ -+ -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+void PDFOutDev::drawChar(GfxState *state, double x, double y, -+ double dx, double dy, -+ double originX, double originY, -+ CharCode, int /*nBytes*/, const Unicode *u, int uLen) -+{ -+#else - void PDFOutDev::drawChar(GfxState *state, double x, double y, - double dx, double dy, - double originX, double originY, - CharCode, int /*nBytes*/, Unicode *u, int uLen) - { -+#endif - assert(state); - - if( u == nullptr ) -@@ -979,11 +988,19 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, - writeBinaryBuffer(aBuf); - } - -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, -+ int width, int height, GfxImageColorMap* colorMap, -+ poppler_bool /*interpolate*/, -+ const int* maskColors, poppler_bool /*inlineImg*/ ) -+{ -+#else - void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, - int width, int height, GfxImageColorMap* colorMap, - poppler_bool /*interpolate*/, - int* maskColors, poppler_bool /*inlineImg*/ ) - { -+#endif - if (m_bSkipImages) - return; - OutputBuffer aBuf; initBuf(aBuf); -@@ -1004,12 +1021,20 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, - { - GfxRGB aMinRGB; - colorMap->getColorSpace()->getRGB( -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+ reinterpret_cast(maskColors), -+#else - reinterpret_cast(maskColors), -+#endif - &aMinRGB ); - - GfxRGB aMaxRGB; - colorMap->getColorSpace()->getRGB( -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+ reinterpret_cast(maskColors)+gfxColorMaxComps, -+#else - reinterpret_cast(maskColors)+gfxColorMaxComps, -+#endif - &aMaxRGB ); - - aMaskBuf.push_back( colToByte(aMinRGB.r) ); -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index 1a0c3f0caad1..02f6b59f6f15 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -232,10 +232,17 @@ namespace pdfi - virtual void eoClip(GfxState *state) override; - - //----- text drawing -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+ virtual void drawChar(GfxState *state, double x, double y, -+ double dx, double dy, -+ double originX, double originY, -+ CharCode code, int nBytes, const Unicode *u, int uLen) override; -+#else - virtual void drawChar(GfxState *state, double x, double y, - double dx, double dy, - double originX, double originY, - CharCode code, int nBytes, Unicode *u, int uLen) override; -+#endif - #if POPPLER_CHECK_VERSION(0, 64, 0) - virtual void drawString(GfxState *state, const GooString *s) override; - #else -@@ -248,10 +255,17 @@ namespace pdfi - int width, int height, poppler_bool invert, - poppler_bool interpolate, - poppler_bool inlineImg) override; -+#if POPPLER_CHECK_VERSION(0, 82, 0) - virtual void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, - poppler_bool interpolate, -- int* maskColors, poppler_bool inlineImg) override; -+ const int* maskColors, poppler_bool inlineImg) override; -+#else -+ virtual void drawImage(GfxState *state, Object *ref, Stream *str, -+ int width, int height, GfxImageColorMap *colorMap, -+ poppler_bool interpolate, -+ int* maskColors, poppler_bool inlineImg) override; -+#endif - virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, diff --git a/poppler-0.83.patch b/poppler-0.83.patch deleted file mode 100644 index e448cd8..0000000 --- a/poppler-0.83.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 035830400393e075fca364a444e04c40516730b2 Mon Sep 17 00:00:00 2001 -From: Martin Milata -Date: Wed, 4 Dec 2019 02:37:40 +0100 -Subject: [PATCH] Fix build with poppler-0.83 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9 -Reviewed-on: https://gerrit.libreoffice.org/84384 -Tested-by: Jenkins -Reviewed-by: Michael Stahl -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86905 -Reviewed-by: Tomáš Chvátal -Tested-by: Tomáš Chvátal ---- - 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; igetSubpath( 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(); -+#else - globalParams = new GlobalParams(); -+#endif - globalParams->setErrQuiet(true); - #if defined(_MSC_VER) - globalParams->setupBaseFonts(nullptr); --- -2.24.1 - diff --git a/poppler-0.86.patch b/poppler-0.86.patch deleted file mode 100644 index 76b8356..0000000 --- a/poppler-0.86.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- libreoffice-6.3.0.4/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx~ 2020-03-23 11:28:30.000000000 +0100 -+++ libreoffice-6.3.0.4/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2020-03-23 11:31:46.670106683 +0100 -@@ -564,7 +564,11 @@ - return; - - #if POPPLER_CHECK_VERSION(0, 72, 0) -+#if POPPLER_CHECK_VERSION(0, 86, 0) -+ const char* pURI = static_cast(pAction)->getURI().c_str(); -+#else - const char* pURI = static_cast(pAction)->getURI()->c_str(); -+#endif - #else - const char* pURI = static_cast(pAction)->getURI()->getCString(); - #endif -- 2.44.0