From 86e903cef551ea3cfc1b0cb20425d96dd787667e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 5 Oct 2022 23:52:26 +0200 Subject: [PATCH] libreoffice: upgrade 7.3.3.2 -> 7.4.1.2 & fix build with gpgme 1.18 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../libreoffice/libreoffice-native.bb | 4 +- ...nload-lib-unnecessary-for-native-bui.patch | 24 +++++---- .../libreoffice/libreoffice-version.inc | 6 +-- .../libreoffice/libreoffice.bb | 10 +--- ...ve-gendict-build-by-libreoffice-is-u.patch | 4 +- ..._get_target_for_build_native-and-use.patch | 20 ++++---- ...round-icu-missing-error-for-without-.patch | 12 ++--- ...-Make-configure-work-with-gpgme-1.18.patch | 50 +++++++++++++++++++ 8 files changed, 86 insertions(+), 44 deletions(-) create mode 100644 recipes-libreoffice/libreoffice/libreoffice/0012-Make-configure-work-with-gpgme-1.18.patch diff --git a/recipes-libreoffice/libreoffice/libreoffice-native.bb b/recipes-libreoffice/libreoffice/libreoffice-native.bb index ee4503c..998a2b9 100644 --- a/recipes-libreoffice/libreoffice/libreoffice-native.bb +++ b/recipes-libreoffice/libreoffice/libreoffice-native.bb @@ -56,7 +56,6 @@ EXTRA_OECONF += " \ --disable-coinmp \ --disable-opencl \ --disable-zxing \ - --disable-cmis \ " do_configure() { @@ -104,7 +103,7 @@ LOBUILDTOOLS = " \ saxparser \ svidl \ ulfex \ - unoidl-write \ + unoidl-check \ xrmex \ " @@ -113,6 +112,7 @@ do_install() { for name in ${LOBUILDTOOLS} ; do install "${B}/workdir/LinkTarget/Executable/$name" ${D}/${bindir} done + install "${B}/workdir/Headers/Executable/unoidl-write" ${D}/${bindir} # icu creates a gendict. To avoid conflicts rename in sysroot install "${B}/workdir/LinkTarget/Executable/gendict" ${D}/${bindir}/gendict_libre diff --git a/recipes-libreoffice/libreoffice/libreoffice-native/0005-Do-not-check-download-lib-unnecessary-for-native-bui.patch b/recipes-libreoffice/libreoffice/libreoffice-native/0005-Do-not-check-download-lib-unnecessary-for-native-bui.patch index 374da73..96dafb7 100644 --- a/recipes-libreoffice/libreoffice/libreoffice-native/0005-Do-not-check-download-lib-unnecessary-for-native-bui.patch +++ b/recipes-libreoffice/libreoffice/libreoffice-native/0005-Do-not-check-download-lib-unnecessary-for-native-bui.patch @@ -8,35 +8,39 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- - configure.ac | 52 ---------------------------------------------------- - 1 file changed, 52 deletions(-) + configure.ac | 56 ---------------------------------------------------- + 1 file changed, 56 deletions(-) diff --git a/configure.ac b/configure.ac -index d83c2db..4d780c9 100644 +index 8babc85..8b910ff 100644 --- a/configure.ac +++ b/configure.ac -@@ -9353,58 +9353,6 @@ else - fi - AC_SUBST([ENABLE_EOT]) +@@ -9564,62 +9564,6 @@ libo_CHECK_SYSTEM_MODULE([xmlsec], [XMLSEC], [xmlsec1-nss >= 1.2.28]) + + libo_CHECK_SYSTEM_MODULE([eot],[LIBEOT],[libeot >= 0.01],disabled) -dnl =================================================================== -dnl Check for DLP libs -dnl =================================================================== +-REVENGE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/librevenge/inc" -AS_IF([test "$COM" = "MSC"], - [librevenge_libdir="${WORKDIR}/LinkTarget/Library"], - [librevenge_libdir="${WORKDIR}/UnpackedTarball/librevenge/src/lib/.libs"] -) --libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 >= 0.0.1],["-I${WORKDIR}/UnpackedTarball/librevenge/inc"],["-L${librevenge_libdir} -lrevenge-0.0"]) +-REVENGE_LIBS_internal="-L${librevenge_libdir} -lrevenge-0.0" +-libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 >= 0.0.1]) - -libo_CHECK_SYSTEM_MODULE([libodfgen],[ODFGEN],[libodfgen-0.1]) - -libo_CHECK_SYSTEM_MODULE([libepubgen],[EPUBGEN],[libepubgen-0.1]) - +-WPD_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/libwpd/inc" -AS_IF([test "$COM" = "MSC"], - [libwpd_libdir="${WORKDIR}/LinkTarget/Library"], - [libwpd_libdir="${WORKDIR}/UnpackedTarball/libwpd/src/lib/.libs"] -) --libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${libwpd_libdir} -lwpd-0.10"]) +-WPD_LIBS_internal="-L${libwpd_libdir} -lwpd-0.10" +-libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10]) - -libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3]) - @@ -49,7 +53,7 @@ index d83c2db..4d780c9 100644 - -libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1]) - --libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1]) +-libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.21]) -libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.21]) - -libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1]) @@ -75,5 +79,5 @@ index d83c2db..4d780c9 100644 dnl Check for system lcms2 dnl =================================================================== -- -2.34.1 +2.35.3 diff --git a/recipes-libreoffice/libreoffice/libreoffice-version.inc b/recipes-libreoffice/libreoffice/libreoffice-version.inc index 2ecda2c..a193e98 100644 --- a/recipes-libreoffice/libreoffice/libreoffice-version.inc +++ b/recipes-libreoffice/libreoffice/libreoffice-version.inc @@ -1,5 +1,5 @@ -PV = "7.3.3.2" -DIRV = "7.3.3" +PV = "7.4.1.2" +DIRV = "7.4.1" SRC_URI += "http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz" -SRC_URI[sha256sum] = "ee12bdbe1621c20e2744bc5b6c5967810f25a5760b98ac5812d550ab00968685" +SRC_URI[sha256sum] = "92f78421bb3ffa6723f8e14c0dab5ee7bc68939fad8ff9f146ccecac02d2de84" diff --git a/recipes-libreoffice/libreoffice/libreoffice.bb b/recipes-libreoffice/libreoffice/libreoffice.bb index d42a367..c809cdd 100644 --- a/recipes-libreoffice/libreoffice/libreoffice.bb +++ b/recipes-libreoffice/libreoffice/libreoffice.bb @@ -17,9 +17,10 @@ SRC_URI += " \ file://0009-Use-wrappers-for-gobject-introspection.patch \ file://0010-Support-install-to-find-bash-completion.in.patch \ file://0011-Skip-isystem-check.patch \ + file://0012-Make-configure-work-with-gpgme-1.18.patch \ " -SRC_URI[translations.sha256sum] = "b91b0a482fa42d59e1605f39a3917166e7ff76bfa8e9b62d6eef0a9b04b3351c" +SRC_URI[translations.sha256sum] = "f77a382d562b6bcebaec69321de4b6ab6daec0240216d314d0c8c6fee4c32fae" DEPENDS += " \ ${BPN}-native \ @@ -33,8 +34,6 @@ DEPENDS += " \ zlib \ jpeg \ libpng \ - apr \ - serf \ libatomic-ops \ lcms \ harfbuzz \ @@ -89,9 +88,6 @@ export STAGING_INCDIR # 3. --enable-scripting-javascript / rhino meta-java # 4. Libreoffice Base embedded db / hsqldb meta-java -# Notes: -# * With 7.2.0.4 lo requires a tailored libcmis so we cannot use ours - EXTRA_OECONF += " \ --without-java \ --with-lang=ALL \ @@ -101,8 +97,6 @@ EXTRA_OECONF += " \ --without-galleries \ \ --with-system-openldap \ - --with-system-apr \ - --with-system-serf \ --with-system-libatomic_ops \ --with-system-icu \ --with-system-expat \ diff --git a/recipes-libreoffice/libreoffice/libreoffice/0004-ensure-that-native-gendict-build-by-libreoffice-is-u.patch b/recipes-libreoffice/libreoffice/libreoffice/0004-ensure-that-native-gendict-build-by-libreoffice-is-u.patch index ab48dd7..00441c5 100644 --- a/recipes-libreoffice/libreoffice/libreoffice/0004-ensure-that-native-gendict-build-by-libreoffice-is-u.patch +++ b/recipes-libreoffice/libreoffice/libreoffice/0004-ensure-that-native-gendict-build-by-libreoffice-is-u.patch @@ -24,9 +24,9 @@ index dee46a3..fab7ddf 100644 - $(call gb_Helper_execute,gendict) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@)) + $(call gb_Helper_execute,gendict_libre) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@)) $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),DIC) - else -@@ -37,7 +37,7 @@ $(i18npool_BIDIR)/dict_%.cxx : \ + else # !iOS ANDROID +@@ -38,7 +38,7 @@ $(i18npool_BIDIR)/dict_%.cxx : \ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1) $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),DIC) $(call gb_Helper_abbreviate_dirs,\ diff --git a/recipes-libreoffice/libreoffice/libreoffice/0005-add-a-new-gb_Rdb_get_target_for_build_native-and-use.patch b/recipes-libreoffice/libreoffice/libreoffice/0005-add-a-new-gb_Rdb_get_target_for_build_native-and-use.patch index bad7a22..8b14e4e 100644 --- a/recipes-libreoffice/libreoffice/libreoffice/0005-add-a-new-gb_Rdb_get_target_for_build_native-and-use.patch +++ b/recipes-libreoffice/libreoffice/libreoffice/0005-add-a-new-gb_Rdb_get_target_for_build_native-and-use.patch @@ -16,23 +16,23 @@ Signed-off-by: Andreas Müller 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk -index c03bbbc..40b5865 100644 +index 3ce723b..0c41954 100644 --- a/i18npool/CustomTarget_localedata.mk +++ b/i18npool/CustomTarget_localedata.mk -@@ -24,7 +24,7 @@ $(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_$(1).cxx : \ - $$(call gb_Helper_print_on_error, \ - $$(call gb_Helper_execute,saxparser) $(1) $$< $$@.tmp \ +@@ -24,7 +24,7 @@ $(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_%_new.cxx : \ + $(call gb_Helper_print_on_error, \ + $(call gb_Helper_execute,saxparser) $* $< $@.sax \ -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER)) \ - -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,saxparser))) && \ + -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build_native,saxparser))) && \ - sed 's/\(^.*get[^;]*$$$$\)/SAL_DLLPUBLIC_EXPORT \1/' $$@.tmp > $$@ && \ - rm $$@.tmp) - $$(call gb_Trace_EndRange,$$(subst $(WORKDIR)/,,$$@),SAX) + sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.sax > $@) + rm $@.sax + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SAX) diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk -index 2611d94..d6a1997 100644 +index e7ced59..5277a81 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk -@@ -155,6 +155,7 @@ gb_Pyuno_get_final_target = $(WORKDIR)/Pyuno/$(1).final +@@ -175,6 +175,7 @@ gb_Pyuno_get_final_target = $(WORKDIR)/Pyuno/$(1).final gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).done gb_Rdb_get_target = $(WORKDIR)/Rdb/$(1).rdb gb_Rdb_get_target_for_build = $(WORKDIR_FOR_BUILD)/Rdb/$(1).rdb @@ -41,5 +41,5 @@ index 2611d94..d6a1997 100644 gb_MoTarget_get_target = $(WORKDIR)/MoTarget/$(1).mo gb_ScpMergeTarget_get_target = $(WORKDIR)/ScpMergeTarget/$(1).ulf -- -2.21.0 +2.35.3 diff --git a/recipes-libreoffice/libreoffice/libreoffice/0006-Package.mk-workaround-icu-missing-error-for-without-.patch b/recipes-libreoffice/libreoffice/libreoffice/0006-Package.mk-workaround-icu-missing-error-for-without-.patch index 425b6dd..2eb63bd 100644 --- a/recipes-libreoffice/libreoffice/libreoffice/0006-Package.mk-workaround-icu-missing-error-for-without-.patch +++ b/recipes-libreoffice/libreoffice/libreoffice/0006-Package.mk-workaround-icu-missing-error-for-without-.patch @@ -9,29 +9,23 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [oe specific] -Sun, 2 Feb 2020: -Adjusted for 6.4.0.3 - -Sat, 3 Oct 2020 -Adjusted for 7.0.2.2 - Signed-off-by: Andreas Müller --- solenv/gbuild/Package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk -index 90e2280..0920cf2 100644 +index 9c90322..7406f46 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -80,7 +80,6 @@ $(call gb_Package_get_preparation_target,%) : $(call gb_Package_get_target,%) : $(call gb_Output_announce,$*,$(true),PKG,2) $(call gb_Trace_StartRange,$*,PKG) -- $(if $(PACKAGE_DEFINED),,$(call gb_Output_error,Something depends on package $* which does not exist.)) +- $(if $(PACKAGE_DEFINED),,$(call gb_Output_error,$(RDEPENDS) depend(s) on package $* which does not exist.)) rm -f $@ && \ mv $(call gb_var2file,$@.tmp,100,$(sort $(FILES))) $@ $(call gb_Trace_EndRange,$*,PKG) -- -2.26.2 +2.35.3 diff --git a/recipes-libreoffice/libreoffice/libreoffice/0012-Make-configure-work-with-gpgme-1.18.patch b/recipes-libreoffice/libreoffice/libreoffice/0012-Make-configure-work-with-gpgme-1.18.patch new file mode 100644 index 0000000..6fc7d0e --- /dev/null +++ b/recipes-libreoffice/libreoffice/libreoffice/0012-Make-configure-work-with-gpgme-1.18.patch @@ -0,0 +1,50 @@ +From f7e170eb084cd4e92818de966b287330184749a8 Mon Sep 17 00:00:00 2001 +From: Rene Engelhard +Date: Wed, 24 Aug 2022 09:55:33 +0200 +Subject: [PATCH] Make configure work with gpgme >= 1.18 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Sam James wrote: +> gpgme-1.18.0 dropped a bunch of internal symbols, +> including progress_callback (see e.g. callbacks.h +> which has a comment at the top saying it's internal). + +Plausibly the workaround to not link against older KDE-specific distro +packages is not needed anymore. + +Check for main as a workaround as we do for other C++ libraries, too. + +Change-Id: I57065a5b5b23b9eadb73b01e4f3a289552c3bde4 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138667 +Tested-by: Jenkins +Reviewed-by: Sam James +Reviewed-by: René Engelhard +--- + configure.ac | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 24cb01aa0db0..61806988b94b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12539,12 +12539,11 @@ elif test \( \( "$_os" = "Linux" -o "$_os" = "Darwin" \) -a "$ENABLE_NSS" = TRUE + # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way + AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ], + [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], []) +- # progress_callback is the only func with plain C linkage +- # checking for it also filters out older, KDE-dependent libgpgmepp versions +- AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ], +- [AC_MSG_ERROR(gpgmepp not found or not functional)], []) + AC_CHECK_HEADER(gpgme.h, [], + [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], []) ++ AC_CHECK_LIB(gpgmepp, main, [], ++ [AC_MSG_ERROR(gpgmepp not found or not functional)], []) ++ GPGMEPP_LIBS=-lgpgmepp + else + AC_MSG_RESULT([internal]) + BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP" +-- +2.35.3 +