zepto-forks/meta-office
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libreoffice: upgrade 7.2.4.1 -> 7.3.0.3

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2022-02-10 08:01:20 +01:00
parent c2ef244ed4
commit d1d1e3a626
12 changed files with 76 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-libreoffice/libreoffice/libreoffice-native.bb
View File

@@ -26,7 +26,7 @@ DEPENDS += " \
unzip-native \ unzip-native \
liblangtag-native \ liblangtag-native \
lpsolve-native \ lpsolve-native \
mdds-1.5-native \ mdds-2.0-native \
" "
SRC_URI += " \ SRC_URI += " \

17
recipes-libreoffice/libreoffice/libreoffice-native/0005-Do-not-check-download-lib-unnecessary-for-native-bui.patch
View File

@@ -8,14 +8,14 @@ Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
--- ---
configure.ac | 50 -------------------------------------------------- configure.ac | 52 ----------------------------------------------------
1 file changed, 50 deletions(-) 1 file changed, 52 deletions(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index b629d5a..58aa736 100644 index d83c2db..4d780c9 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -9237,57 +9237,7 @@ else @@ -9353,58 +9353,6 @@ else
fi fi
AC_SUBST([ENABLE_EOT]) 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([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.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_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
-libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10]) -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([libqxp],[QXP],[libqxp-0.0])
- -
-libo_CHECK_SYSTEM_MODULE([libzmf],[ZMF],[libzmf-0.0]) -libo_CHECK_SYSTEM_MODULE([libzmf],[ZMF],[libzmf-0.0])
-
-libo_CHECK_SYSTEM_MODULE([libstaroffice],[STAROFFICE],[libstaroffice-0.0]) -libo_CHECK_SYSTEM_MODULE([libstaroffice],[STAROFFICE],[libstaroffice-0.0])
-libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.7]) -libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.7])
-
dnl =================================================================== dnl ===================================================================
dnl Check for system lcms2 dnl Check for system lcms2
dnl ===================================================================
-- --
2.31.1 2.34.1

6
recipes-libreoffice/libreoffice/libreoffice-version.inc
View File

@@ -1,5 +1,5 @@
PV = "7.2.4.1" PV = "7.3.0.3"
DIRV = "7.2.4" DIRV = "7.3.0"
SRC_URI += "http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz" SRC_URI += "http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz"
SRC_URI[sha256sum] = "6268b9066a60586cf0a5f5ed9960cdf86a5ff586fe6699bf4d296d580de08f21" SRC_URI[sha256sum] = "98d369c9541f0c3286345b93f448f2ceb2e344865ee01bdd58f3bb27f08f3f25"

5
recipes-libreoffice/libreoffice/libreoffice.bb
View File

@@ -16,9 +16,10 @@ SRC_URI += " \
file://0008-avoid-downloading-by-git-submodules.patch \ file://0008-avoid-downloading-by-git-submodules.patch \
file://0009-Use-wrappers-for-gobject-introspection.patch \ file://0009-Use-wrappers-for-gobject-introspection.patch \
file://0010-Support-install-to-find-bash-completion.in.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 += " \ DEPENDS += " \
${BPN}-native \ ${BPN}-native \
@@ -70,7 +71,7 @@ DEPENDS += " \
liblangtag \ liblangtag \
lpsolve \ lpsolve \
gpgme \ gpgme \
mdds-1.5 \ mdds-2.0 \
" "
# necessary to let the call for python-config succeed # necessary to let the call for python-config succeed

2
recipes-libreoffice/libreoffice/libreoffice/0001-configure.ac-skip-some-cross-compile-sections-they-d.patch
View File

@@ -27,7 +27,7 @@ index 955aea1..f310c00 100644
AC_MSG_CHECKING([for BUILD platform configuration]) AC_MSG_CHECKING([for BUILD platform configuration])
echo echo
rm -rf CONF-FOR-BUILD config_build.mk 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 # Fallback: Accept these in the environment, or as set above
# for MacOSX. # for MacOSX.
: :

2
recipes-libreoffice/libreoffice/libreoffice/0002-Makefile.in-avoid-building-target-cross-toolset.patch
View File

@@ -17,7 +17,7 @@ diff --git a/Makefile.in b/Makefile.in
index f9a2644..c1a8f53 100644 index f9a2644..c1a8f53 100644
--- a/Makefile.in --- a/Makefile.in
+++ b/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 # Note: this will pipe through all gbuild targets to ... gbuild
# with some translations like "check"->"unitcheck subsequentcheck uicheck" for historic reasons # with some translations like "check"->"unitcheck subsequentcheck uicheck" for historic reasons
# #

2
recipes-libreoffice/libreoffice/libreoffice/0003-remove-paths-for-gb_Executable_get_command.patch
View File

@@ -19,7 +19,7 @@ diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 82857a9..0aa2cbd 100644 index 82857a9..0aa2cbd 100644
--- a/solenv/gbuild/TargetLocations.mk --- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk
@@ -355,7 +355,7 @@ endef @@ -381,7 +381,7 @@ endef
# #
# gb_Executable_get_command executable # gb_Executable_get_command executable
define gb_Executable_get_command define gb_Executable_get_command

2
recipes-libreoffice/libreoffice/libreoffice/0006-Package.mk-workaround-icu-missing-error-for-without-.patch
View File

@@ -30,7 +30,7 @@ index 90e2280..0920cf2 100644
$(call gb_Trace_StartRange,$*,PKG) $(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,Something depends on package $* which does not exist.))
rm -f $@ && \ rm -f $@ && \
mv $(call var2file,$@.tmp,100,$(sort $(FILES))) $@ mv $(call gb_var2file,$@.tmp,100,$(sort $(FILES))) $@
$(call gb_Trace_EndRange,$*,PKG) $(call gb_Trace_EndRange,$*,PKG)
-- --
2.26.2 2.26.2

2
recipes-libreoffice/libreoffice/libreoffice/0007-configure.ac-avoid-finding-calling-pg_config.patch
View File

@@ -17,7 +17,7 @@ diff --git a/configure.ac b/configure.ac
index f310c00..2573cc1 100644 index f310c00..2573cc1 100644
--- a/configure.ac --- a/configure.ac
+++ b/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" pg_supp_path="$P_SEP$d$pg_supp_path"
done done
fi fi

2
recipes-libreoffice/libreoffice/libreoffice/0008-avoid-downloading-by-git-submodules.patch
View File

@@ -17,7 +17,7 @@ diff --git a/configure.ac b/configure.ac
index 9df3182..ccae843 100644 index 9df3182..ccae843 100644
--- a/configure.ac --- a/configure.ac
+++ b/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` test "$WITH_LANG_LIST" = "en-US" || WITH_LANG_LIST=`echo $WITH_LANG_LIST qtz`
ALL_LANGS=`echo $ALL_LANGS qtz` ALL_LANGS=`echo $ALL_LANGS qtz`
fi fi

2
recipes-libreoffice/libreoffice/libreoffice/0010-Support-install-to-find-bash-completion.in.patch
View File

@@ -19,7 +19,7 @@ diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop
index 1da104e..42991f8 100755 index 1da104e..42991f8 100755
--- a/bin/distro-install-desktop-integration --- a/bin/distro-install-desktop-integration
+++ b/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 # create bash completion
mkdir -p $DESTDIR/usr/share/bash-completion/completions mkdir -p $DESTDIR/usr/share/bash-completion/completions

53
recipes-libreoffice/libreoffice/libreoffice/0011-Skip-isystem-check.patch Normal file
View File

@@ -0,0 +1,53 @@
From ec1594b3a9f1959adab19a8f7d5f189510dd4a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
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 <schnitzeltony@gmail.com>
---
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