From d5df421e8c7505cbf6e6acc53ee0ff4d4195c26e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 11 Feb 2021 18:03:09 +0100 Subject: [PATCH] libreoffice: upgrade 7.0.4.2 -> 7.1.0.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit neon on all branches of meta-o turned too old -> us neon shipped by libreoffice Signed-off-by: Andreas Müller --- .../libreoffice/libreoffice-native.bb | 1 - ...faultbootstrap-output-debug-information.patch | 2 +- .../libreoffice/libreoffice-version.inc | 6 +++--- recipes-libreoffice/libreoffice/libreoffice.bb | 7 ++----- recipes-libreoffice/libreoffice/libreoffice.inc | 1 - ...-Use-wrappers-for-gobject-introspection.patch | 16 ++++++++++------ 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/recipes-libreoffice/libreoffice/libreoffice-native.bb b/recipes-libreoffice/libreoffice/libreoffice-native.bb index c2468c8..8a10761 100644 --- a/recipes-libreoffice/libreoffice/libreoffice-native.bb +++ b/recipes-libreoffice/libreoffice/libreoffice-native.bb @@ -34,7 +34,6 @@ DEPENDS += " \ libexttextcat-native \ hyphen-native \ unzip-native \ - neon-native \ liblangtag-native \ lpsolve-native \ libwpd-native \ diff --git a/recipes-libreoffice/libreoffice/libreoffice-native/0002-cppuhelper-defaultbootstrap-output-debug-information.patch b/recipes-libreoffice/libreoffice/libreoffice-native/0002-cppuhelper-defaultbootstrap-output-debug-information.patch index 0c947da..fac9679 100644 --- a/recipes-libreoffice/libreoffice/libreoffice-native/0002-cppuhelper-defaultbootstrap-output-debug-information.patch +++ b/recipes-libreoffice/libreoffice/libreoffice-native/0002-cppuhelper-defaultbootstrap-output-debug-information.patch @@ -19,8 +19,8 @@ index 945268b..3259d43 100644 --- a/cppuhelper/source/defaultbootstrap.cxx +++ b/cppuhelper/source/defaultbootstrap.cxx @@ -11,6 +11,7 @@ + #include - #include #include +#include diff --git a/recipes-libreoffice/libreoffice/libreoffice-version.inc b/recipes-libreoffice/libreoffice/libreoffice-version.inc index 0c29854..a0c2f9c 100644 --- a/recipes-libreoffice/libreoffice/libreoffice-version.inc +++ b/recipes-libreoffice/libreoffice/libreoffice-version.inc @@ -1,5 +1,5 @@ -PV = "7.0.4.2" -DIRV = "7.0.4" +PV = "7.1.0.3" +DIRV = "7.1.0" SRC_URI += "http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz" -SRC_URI[sha256sum] = "9fa9d2cc8d02f12b1f302b93056d5c0ff986090a6f309bafa506ba53779f2abd" +SRC_URI[sha256sum] = "9ed0833f349da3f7b27f54fa24da388dc6a84079935322b305a7a2171e48f3e6" diff --git a/recipes-libreoffice/libreoffice/libreoffice.bb b/recipes-libreoffice/libreoffice/libreoffice.bb index aa74f99..906854f 100644 --- a/recipes-libreoffice/libreoffice/libreoffice.bb +++ b/recipes-libreoffice/libreoffice/libreoffice.bb @@ -18,7 +18,7 @@ SRC_URI += " \ file://0010-Support-install-to-find-bash-completion.in.patch \ " -SRC_URI[translations.sha256sum] = "544b1a1b4ca795842fb0e4e5eee68f94dd16b10ca4c3c84b1be85467cabc73ec" +SRC_URI[translations.sha256sum] = "b17e0d7c61de80526d22c11c63596c4d56aaa2b1ad0f14d29e0abdd8b3efcc54" DEPENDS += " \ ${BPN}-native \ @@ -32,7 +32,6 @@ DEPENDS += " \ nss \ zlib \ jpeg \ - neon \ libpng \ apr \ serf \ @@ -199,11 +198,9 @@ do_install() { FILES_${PN} += " \ - ${datadir}/appdata \ - ${datadir}/application-registry \ ${datadir}/icons \ + ${datadir}/metainfo \ ${datadir}/mime \ - ${datadir}/mime-info \ " PACKAGES =+ "${PN}-odk ${PN}-officekit" diff --git a/recipes-libreoffice/libreoffice/libreoffice.inc b/recipes-libreoffice/libreoffice/libreoffice.inc index 827a239..12a3388 100644 --- a/recipes-libreoffice/libreoffice/libreoffice.inc +++ b/recipes-libreoffice/libreoffice/libreoffice.inc @@ -67,7 +67,6 @@ EXTRA_OECONF = " \ --with-system-libvisio \ --with-system-libexttextcat \ --with-system-altlinuxhyph \ - --with-system-neon \ --with-system-librevenge \ --with-system-libabw \ --with-system-libcdr \ diff --git a/recipes-libreoffice/libreoffice/libreoffice/0009-Use-wrappers-for-gobject-introspection.patch b/recipes-libreoffice/libreoffice/libreoffice/0009-Use-wrappers-for-gobject-introspection.patch index 5aa9fc1..9ee7545 100644 --- a/recipes-libreoffice/libreoffice/libreoffice/0009-Use-wrappers-for-gobject-introspection.patch +++ b/recipes-libreoffice/libreoffice/libreoffice/0009-Use-wrappers-for-gobject-introspection.patch @@ -13,25 +13,29 @@ Upstream-Status: Inappropriate [oe-specific] Sun, 2 Feb 2020: Adjusted for 6.4.0.3 +Mon, 8 Feb 2021 +Adjusted for 7.1.0.3 + + Signed-off-by: Andreas Müller --- 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 +index 1f578f5..2a3aac5 100644 --- a/sysui/CustomTarget_share.mk +++ b/sysui/CustomTarget_share.mk -@@ -183,7 +183,7 @@ ifneq ($(INTROSPECTION_SCANNER),) +@@ -167,7 +167,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" \ +- PYTHONWARNINGS=default g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" \ ++ PYTHONWARNINGS=default ${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: \ +@@ -179,7 +179,7 @@ $(share_WORKDIR)/%/LOKDocView-0.1.gir: \ --output="$@" --warn-all --no-libtool $(share_WORKDIR)/%/LOKDocView-0.1.typelib: $(share_WORKDIR)/%/LOKDocView-0.1.gir @@ -41,5 +45,5 @@ index 8af5d66..33b5d06 100644 endif -- -2.21.0 +2.26.2