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

libreoffice: upgrade 7.4.1.2 -> 7.4.2.3 / use system libtiff to fix build

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2022-10-16 18:01:32 +02:00
parent fd4672e0d3
commit d28c251738
3 changed files with 6 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
PV = "7.4.1.2"
DIRV = "7.4.1"
PV = "7.4.2.3"
DIRV = "7.4.2"
SRC_URI += "http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz"
SRC_URI[sha256sum] = "92f78421bb3ffa6723f8e14c0dab5ee7bc68939fad8ff9f146ccecac02d2de84"
SRC_URI[sha256sum] = "82c1ffe02f2ed8ee1451a9f67c35335b27a638db591f9bc539eff86ab14dd95a"

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

@@ -17,10 +17,9 @@ 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] = "f77a382d562b6bcebaec69321de4b6ab6daec0240216d314d0c8c6fee4c32fae"
SRC_URI[translations.sha256sum] = "c8053f863c95c31a83a079bb2eefd9b666ffd59e40c4344098c04a924a54f6e1"
DEPENDS += " \
${BPN}-native \
@@ -42,6 +41,7 @@ DEPENDS += " \
openssl \
cups \
gstreamer1.0-plugins-base \
tiff \
\
glm \
redland \
@@ -125,6 +125,7 @@ EXTRA_OECONF += " \
--with-system-mythes \
--with-system-altlinuxhyph \
--with-system-gpgmepp \
--with-system-libtiff \
\
--with-external-dict-dir=${datadir}/hunspell \
--with-system-dicts \

50
recipes-libreoffice/libreoffice/libreoffice/0012-Make-configure-work-with-gpgme-1.18.patch
View File

@@ -1,50 +0,0 @@
From f7e170eb084cd4e92818de966b287330184749a8 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
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 <sam@gentoo.org>
Reviewed-by: René Engelhard <rene@debian.org>
---
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