From d1d1e3a62633f37c0bba57cd9247b8b3eacbaa69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 10 Feb 2022 08:01:20 +0100 Subject: [PATCH] libreoffice: upgrade 7.2.4.1 -> 7.3.0.3 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 | 2 +- ...nload-lib-unnecessary-for-native-bui.patch | 17 +++--- .../libreoffice/libreoffice-version.inc | 6 +-- .../libreoffice/libreoffice.bb | 5 +- ...p-some-cross-compile-sections-they-d.patch | 2 +- ...-avoid-building-target-cross-toolset.patch | 2 +- ...-paths-for-gb_Executable_get_command.patch | 2 +- ...round-icu-missing-error-for-without-.patch | 2 +- ...e.ac-avoid-finding-calling-pg_config.patch | 2 +- ...-avoid-downloading-by-git-submodules.patch | 2 +- ...t-install-to-find-bash-completion.in.patch | 2 +- .../libreoffice/0011-Skip-isystem-check.patch | 53 +++++++++++++++++++ 12 files changed, 76 insertions(+), 21 deletions(-) create mode 100644 recipes-libreoffice/libreoffice/libreoffice/0011-Skip-isystem-check.patch diff --git a/recipes-libreoffice/libreoffice/libreoffice-native.bb b/recipes-libreoffice/libreoffice/libreoffice-native.bb index 2e322c5..ee4503c 100644 --- a/recipes-libreoffice/libreoffice/libreoffice-native.bb +++ b/recipes-libreoffice/libreoffice/libreoffice-native.bb @@ -26,7 +26,7 @@ DEPENDS += " \ unzip-native \ liblangtag-native \ lpsolve-native \ - mdds-1.5-native \ + mdds-2.0-native \ " SRC_URI += " \ 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 2b63be0..374da73 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,14 +8,14 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- - configure.ac | 50 -------------------------------------------------- - 1 file changed, 50 deletions(-) + configure.ac | 52 ---------------------------------------------------- + 1 file changed, 52 deletions(-) diff --git a/configure.ac b/configure.ac -index b629d5a..58aa736 100644 +index d83c2db..4d780c9 100644 --- a/configure.ac +++ b/configure.ac -@@ -9237,57 +9237,7 @@ else +@@ -9353,58 +9353,6 @@ else fi AC_SUBST([ENABLE_EOT]) @@ -50,7 +50,7 @@ index b629d5a..58aa736 100644 -libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1]) - -libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1]) --libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.19]) +-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.21]) - -libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1]) -libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10]) @@ -67,12 +67,13 @@ index b629d5a..58aa736 100644 -libo_CHECK_SYSTEM_MODULE([libqxp],[QXP],[libqxp-0.0]) - -libo_CHECK_SYSTEM_MODULE([libzmf],[ZMF],[libzmf-0.0]) - +- -libo_CHECK_SYSTEM_MODULE([libstaroffice],[STAROFFICE],[libstaroffice-0.0]) -libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.7]) - +- dnl =================================================================== dnl Check for system lcms2 + dnl =================================================================== -- -2.31.1 +2.34.1 diff --git a/recipes-libreoffice/libreoffice/libreoffice-version.inc b/recipes-libreoffice/libreoffice/libreoffice-version.inc index 6d3fbc3..82a60b7 100644 --- a/recipes-libreoffice/libreoffice/libreoffice-version.inc +++ b/recipes-libreoffice/libreoffice/libreoffice-version.inc @@ -1,5 +1,5 @@ -PV = "7.2.4.1" -DIRV = "7.2.4" +PV = "7.3.0.3" +DIRV = "7.3.0" SRC_URI += "http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz" -SRC_URI[sha256sum] = "6268b9066a60586cf0a5f5ed9960cdf86a5ff586fe6699bf4d296d580de08f21" +SRC_URI[sha256sum] = "98d369c9541f0c3286345b93f448f2ceb2e344865ee01bdd58f3bb27f08f3f25" diff --git a/recipes-libreoffice/libreoffice/libreoffice.bb b/recipes-libreoffice/libreoffice/libreoffice.bb index 59880b1..8bb88d0 100644 --- a/recipes-libreoffice/libreoffice/libreoffice.bb +++ b/recipes-libreoffice/libreoffice/libreoffice.bb @@ -16,9 +16,10 @@ SRC_URI += " \ 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 \ + file://0011-Skip-isystem-check.patch \ " -SRC_URI[translations.sha256sum] = "f27cc2b7bfc9ee0a893ed1cead5bbb513a27270d69c6ee1f9cb589c963941daf" +SRC_URI[translations.sha256sum] = "43e9d768af1a74242455741670a70bd9f3a1e01ec4599caddb16e0825614e7fe" DEPENDS += " \ ${BPN}-native \ @@ -70,7 +71,7 @@ DEPENDS += " \ liblangtag \ lpsolve \ gpgme \ - mdds-1.5 \ + mdds-2.0 \ " # necessary to let the call for python-config succeed diff --git a/recipes-libreoffice/libreoffice/libreoffice/0001-configure.ac-skip-some-cross-compile-sections-they-d.patch b/recipes-libreoffice/libreoffice/libreoffice/0001-configure.ac-skip-some-cross-compile-sections-they-d.patch index 0c1d9a1..d5b2c9f 100644 --- a/recipes-libreoffice/libreoffice/libreoffice/0001-configure.ac-skip-some-cross-compile-sections-they-d.patch +++ b/recipes-libreoffice/libreoffice/libreoffice/0001-configure.ac-skip-some-cross-compile-sections-they-d.patch @@ -27,7 +27,7 @@ index 955aea1..f310c00 100644 AC_MSG_CHECKING([for BUILD platform configuration]) echo rm -rf CONF-FOR-BUILD config_build.mk -@@ -8334,7 +8334,7 @@ if test $enable_python = system; then +@@ -9684,7 +9684,7 @@ if test $enable_python = system; then # Fallback: Accept these in the environment, or as set above # for MacOSX. : diff --git a/recipes-libreoffice/libreoffice/libreoffice/0002-Makefile.in-avoid-building-target-cross-toolset.patch b/recipes-libreoffice/libreoffice/libreoffice/0002-Makefile.in-avoid-building-target-cross-toolset.patch index 5eb683d..8752c3f 100644 --- a/recipes-libreoffice/libreoffice/libreoffice/0002-Makefile.in-avoid-building-target-cross-toolset.patch +++ b/recipes-libreoffice/libreoffice/libreoffice/0002-Makefile.in-avoid-building-target-cross-toolset.patch @@ -17,7 +17,7 @@ diff --git a/Makefile.in b/Makefile.in index f9a2644..c1a8f53 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -282,7 +282,7 @@ bootstrap: check-if-root compilerplugins +@@ -283,7 +283,7 @@ bootstrap: check-if-root compilerplugins # Note: this will pipe through all gbuild targets to ... gbuild # with some translations like "check"->"unitcheck subsequentcheck uicheck" for historic reasons # diff --git a/recipes-libreoffice/libreoffice/libreoffice/0003-remove-paths-for-gb_Executable_get_command.patch b/recipes-libreoffice/libreoffice/libreoffice/0003-remove-paths-for-gb_Executable_get_command.patch index 6a2b580..fd1642f 100644 --- a/recipes-libreoffice/libreoffice/libreoffice/0003-remove-paths-for-gb_Executable_get_command.patch +++ b/recipes-libreoffice/libreoffice/libreoffice/0003-remove-paths-for-gb_Executable_get_command.patch @@ -19,7 +19,7 @@ diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 82857a9..0aa2cbd 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk -@@ -355,7 +355,7 @@ endef +@@ -381,7 +381,7 @@ endef # # gb_Executable_get_command executable define gb_Executable_get_command 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 014934c..425b6dd 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 @@ -30,7 +30,7 @@ index 90e2280..0920cf2 100644 $(call gb_Trace_StartRange,$*,PKG) - $(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 gb_var2file,$@.tmp,100,$(sort $(FILES))) $@ $(call gb_Trace_EndRange,$*,PKG) -- 2.26.2 diff --git a/recipes-libreoffice/libreoffice/libreoffice/0007-configure.ac-avoid-finding-calling-pg_config.patch b/recipes-libreoffice/libreoffice/libreoffice/0007-configure.ac-avoid-finding-calling-pg_config.patch index efb1f3c..6233165 100644 --- a/recipes-libreoffice/libreoffice/libreoffice/0007-configure.ac-avoid-finding-calling-pg_config.patch +++ b/recipes-libreoffice/libreoffice/libreoffice/0007-configure.ac-avoid-finding-calling-pg_config.patch @@ -17,7 +17,7 @@ diff --git a/configure.ac b/configure.ac index f310c00..2573cc1 100644 --- a/configure.ac +++ b/configure.ac -@@ -8668,18 +8668,12 @@ if test "x$enable_postgresql_sdbc" != "xno"; then +@@ -10048,18 +10048,12 @@ if test "x$enable_postgresql_sdbc" != "xno"; then pg_supp_path="$P_SEP$d$pg_supp_path" done fi diff --git a/recipes-libreoffice/libreoffice/libreoffice/0008-avoid-downloading-by-git-submodules.patch b/recipes-libreoffice/libreoffice/libreoffice/0008-avoid-downloading-by-git-submodules.patch index 43585c9..8769e79 100644 --- a/recipes-libreoffice/libreoffice/libreoffice/0008-avoid-downloading-by-git-submodules.patch +++ b/recipes-libreoffice/libreoffice/libreoffice/0008-avoid-downloading-by-git-submodules.patch @@ -17,7 +17,7 @@ diff --git a/configure.ac b/configure.ac index 9df3182..ccae843 100644 --- a/configure.ac +++ b/configure.ac -@@ -12312,6 +12312,9 @@ if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then +@@ -13860,6 +13860,9 @@ if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then test "$WITH_LANG_LIST" = "en-US" || WITH_LANG_LIST=`echo $WITH_LANG_LIST qtz` ALL_LANGS=`echo $ALL_LANGS qtz` fi diff --git a/recipes-libreoffice/libreoffice/libreoffice/0010-Support-install-to-find-bash-completion.in.patch b/recipes-libreoffice/libreoffice/libreoffice/0010-Support-install-to-find-bash-completion.in.patch index ce78d24..4e52ec1 100644 --- a/recipes-libreoffice/libreoffice/libreoffice/0010-Support-install-to-find-bash-completion.in.patch +++ b/recipes-libreoffice/libreoffice/libreoffice/0010-Support-install-to-find-bash-completion.in.patch @@ -19,7 +19,7 @@ diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop 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_ +@@ -172,10 +172,10 @@ test -f $DESTDIR/gid_Module_Root_Brand && echo "$BINDIR/soffice" >>$DESTDIR/gid_ # create bash completion mkdir -p $DESTDIR/usr/share/bash-completion/completions diff --git a/recipes-libreoffice/libreoffice/libreoffice/0011-Skip-isystem-check.patch b/recipes-libreoffice/libreoffice/libreoffice/0011-Skip-isystem-check.patch new file mode 100644 index 0000000..fefe5b6 --- /dev/null +++ b/recipes-libreoffice/libreoffice/libreoffice/0011-Skip-isystem-check.patch @@ -0,0 +1,53 @@ +From ec1594b3a9f1959adab19a8f7d5f189510dd4a4f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 9 Feb 2022 23:55:25 +0100 +Subject: [PATCH] Skip -isystem check +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It injects host path: +| ERROR: libreoffice-7.3.0.3-r0 do_configure: QA Issue: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. +| Rerun configure task after fixing this. [configure-unsafe] + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + configure.ac | 20 +------------------- + 1 file changed, 1 insertion(+), 19 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6ca795d..f1159a8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3837,25 +3837,7 @@ fi + AC_SUBST(CROSS_COMPILING) + AC_SUBST(ENABLE_WASM_STRIP) + +-# Use -isystem (gcc) if possible, to avoid warnings in 3rd party headers. +-# NOTE: must _not_ be used for bundled external libraries! +-ISYSTEM= +-if test "$GCC" = "yes"; then +- AC_MSG_CHECKING( for -isystem ) +- save_CFLAGS=$CFLAGS +- CFLAGS="$CFLAGS -isystem /usr/include -Werror" +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ ISYSTEM="-isystem " ],[]) +- CFLAGS=$save_CFLAGS +- if test -n "$ISYSTEM"; then +- AC_MSG_RESULT(yes) +- else +- AC_MSG_RESULT(no) +- fi +-fi +-if test -z "$ISYSTEM"; then +- # fall back to using -I +- ISYSTEM=-I +-fi ++ISYSTEM=-isystem + AC_SUBST(ISYSTEM) + + dnl =================================================================== +-- +2.34.1 +