extra/libreoffice-fresh to 24.2.1-1

This commit is contained in:
David Beauchamp 2024-03-06 13:52:48 -05:00
parent 6e040f788e
commit 3c7090276e
5 changed files with 94 additions and 29 deletions

View file

@ -1,6 +1,6 @@
pkgbase = libreoffice-fresh
pkgver = 24.2.0
pkgrel = 2
pkgver = 24.2.1
pkgrel = 1
url = https://www.libreoffice.org/
arch = x86_64
license = MPL-2.0
@ -45,12 +45,20 @@ pkgbase = libreoffice-fresh
makedepends = gperf
makedepends = gtk3
makedepends = gtk4
makedepends = qt5-base
makedepends = plasma-framework5
makedepends = qt6-base
makedepends = cppunit
makedepends = beanshell
makedepends = clucene
makedepends = qt5-base
makedepends = plasma-framework5
makedepends = frameworkintegration5
makedepends = kconfig5
makedepends = qt6-base
makedepends = kio
makedepends = kconfig
makedepends = kcoreaddons
makedepends = kwindowsystem
makedepends = ki18n
makedepends = kcoreaddons
makedepends = junit
makedepends = libmythes
makedepends = libwpg
@ -117,12 +125,12 @@ pkgbase = libreoffice-fresh
noextract = odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
noextract = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
options = !lto
source = https://download.documentfoundation.org/libreoffice/src/24.2.0/libreoffice-24.2.0.3.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/24.2.0/libreoffice-24.2.0.3.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/24.2.0/libreoffice-help-24.2.0.3.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/24.2.0/libreoffice-help-24.2.0.3.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/24.2.0/libreoffice-translations-24.2.0.3.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/24.2.0/libreoffice-translations-24.2.0.3.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/24.2.1/libreoffice-24.2.1.2.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/24.2.1/libreoffice-24.2.1.2.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/24.2.1/libreoffice-help-24.2.1.2.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/24.2.1/libreoffice-help-24.2.1.2.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/24.2.1/libreoffice-translations-24.2.1.2.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/24.2.1/libreoffice-translations-24.2.1.2.tar.xz.asc
source = https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
source = https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
source = https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@ -146,15 +154,16 @@ pkgbase = libreoffice-fresh
source = make-pyuno-work-with-system-wide-module-install.diff
source = 623ea5c.diff
source = libreoffice-7.5.8.2-icu-74-compatibility.patch
source = kf6_buildfix.diff
source = soffice-template.desktop.in
source = libreoffice-fresh.sh
source = libreoffice-fresh.csh
validpgpkeys = C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3
sha256sums = 18f456917aa207f3bf4f4c013c392261a7d374075fb2fe246a2cfe58b3483568
sha256sums = 3ccf577e8f665059ed5a06577b3b37278080be9f29cc4ad3352857a8f2549fa8
sha256sums = SKIP
sha256sums = 5c3542d8fa67eabebee758b608742838ced3182cf1851cfa4d636add8a8e428e
sha256sums = 6f8b03b1af94e72c8301164fbcb84c0af57ba6416be8ff02f7b7dd06ff4c2f74
sha256sums = SKIP
sha256sums = 7c69fcb6e6ea0878a016bb0e6061caa2ff40825bd14b054ffebe7c6a4390d264
sha256sums = bf5b164b5e8ac9f796dbc2cf1e9d30e345341d367f634852c47e4572a94f58e9
sha256sums = SKIP
sha256sums = 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
sha256sums = 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
@ -179,9 +188,10 @@ pkgbase = libreoffice-fresh
sha256sums = c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563
sha256sums = 440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5
sha256sums = d7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599
sha256sums = f7905962a634ab4ab5c5e591c1816e6baf3f66db91adfeee25c631b6939110ef
sha256sums = d0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879
sha256sums = b43ed267643fc5ced803dca010427b12b1f10db485173ccb19efb3395e60c82e
sha256sums = 66f2cb5d2ff9909ee9633aea73d5306fc8c4ff358fa526f45d9994210d3e23ff
sha256sums = 5e1dc35b9851cf2ef93a2fae151cf90258c81f3ab56f86e3e9ea6c56be4eed19
sha256sums = 57c92c48e0d82a073a0095bfe44fb541c68bead6205436a5432879185f420768
pkgname = libreoffice-fresh-sdk
pkgdesc = Software Development Kit for LibreOffice Fresh
@ -289,6 +299,7 @@ pkgname = libreoffice-fresh
optdepends = gtk3: for GTK3 integration
optdepends = gtk4: for GTK4 integration (experimental)
optdepends = kio5: for KF5 KDE desktop integration
optdepends = kio: for KF6 KDE desktop integration
optdepends = qt6-base: for Qt6 desktop integration
provides = libreoffice
provides = libreoffice-en-US

View file

@ -18,9 +18,9 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
pkgbase=libreoffice-fresh
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
_LOver=24.2.0.3
pkgver=24.2.0
pkgrel=2
_LOver=24.2.1.2
pkgver=24.2.1
pkgrel=1
arch=('x86_64')
license=('MPL-2.0' 'LGPL-3.0-or-later')
url="https://www.libreoffice.org/"
@ -30,7 +30,9 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps'
'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
'libmspub' 'harfbuzz-icu' 'nss' 'hicolor-icon-theme'
'gst-plugins-base-libs' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant'
'gperf' 'gtk3' 'gtk4' 'qt5-base' 'plasma-framework5' 'qt6-base' 'cppunit' 'beanshell' 'clucene'
'gperf' 'gtk3' 'gtk4' 'cppunit' 'beanshell' 'clucene'
'qt5-base' 'plasma-framework5' 'frameworkintegration5' 'kconfig5'
'qt6-base' 'kio' 'kconfig' 'kcoreaddons' 'kwindowsystem' 'ki18n' 'kcoreaddons'
'junit' 'libmythes' 'libwpg' 'java-environment=17' 'postgresql-libs' 'mariadb-libs' 'libgl'
'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds'
'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker' 'glm'
@ -71,6 +73,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
make-pyuno-work-with-system-wide-module-install.diff
623ea5c.diff
libreoffice-7.5.8.2-icu-74-compatibility.patch
kf6_buildfix.diff
soffice-template.desktop.in
libreoffice-fresh.sh libreoffice-fresh.csh)
noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@ -95,11 +98,11 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
)
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
sha256sums=('18f456917aa207f3bf4f4c013c392261a7d374075fb2fe246a2cfe58b3483568'
sha256sums=('3ccf577e8f665059ed5a06577b3b37278080be9f29cc4ad3352857a8f2549fa8'
'SKIP'
'5c3542d8fa67eabebee758b608742838ced3182cf1851cfa4d636add8a8e428e'
'6f8b03b1af94e72c8301164fbcb84c0af57ba6416be8ff02f7b7dd06ff4c2f74'
'SKIP'
'7c69fcb6e6ea0878a016bb0e6061caa2ff40825bd14b054ffebe7c6a4390d264'
'bf5b164b5e8ac9f796dbc2cf1e9d30e345341d367f634852c47e4572a94f58e9'
'SKIP'
'64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
'1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
@ -124,10 +127,10 @@ sha256sums=('18f456917aa207f3bf4f4c013c392261a7d374075fb2fe246a2cfe58b3483568'
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
'440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5'
'd7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599'
'f7905962a634ab4ab5c5e591c1816e6baf3f66db91adfeee25c631b6939110ef'
'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
'b43ed267643fc5ced803dca010427b12b1f10db485173ccb19efb3395e60c82e'
'66f2cb5d2ff9909ee9633aea73d5306fc8c4ff358fa526f45d9994210d3e23ff')
'5e1dc35b9851cf2ef93a2fae151cf90258c81f3ab56f86e3e9ea6c56be4eed19'
'57c92c48e0d82a073a0095bfe44fb541c68bead6205436a5432879185f420768')
prepare() {
cd libreoffice-$_LOver
@ -149,6 +152,9 @@ prepare() {
# fix build with icu 74
patch -Np1 -i "${srcdir}"/libreoffice-7.5.8.2-icu-74-compatibility.patch
# fix KF& build - https://gerrit.libreoffice.org/c/core/+/163237
patch -Np1 -i "${srcdir}"/kf6_buildfix.diff
#use the CFLAGS but remove the LibO overridden ones
for i in $CFLAGS; do
case "$i" in
@ -196,6 +202,7 @@ build() {
--enable-gio\
--enable-gtk3-kde5 \
--enable-kf5 \
--enable-kf6 \
--enable-qt5 \
--enable-qt6 \
--enable-gtk3 \
@ -314,9 +321,9 @@ package_libreoffice-fresh() {
'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'libnumbertext' 'gpgme'
'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy' 'box2d'
'zxing-cpp' 'xdg-utils'
'libldap' 'fontconfig' 'zlib' 'libpng' 'freetype2' 'raptor' 'libxml2'
'cairo' 'libx11' 'expat' 'glib2' 'boost-libs' 'libtiff' 'dbus' 'glibc'
'librevenge' 'libxext' 'openjpeg2' )
'libldap' 'fontconfig' 'zlib' 'libpng' 'freetype2' 'raptor' 'libxml2'
'cairo' 'libx11' 'expat' 'glib2' 'boost-libs' 'libtiff' 'dbus' 'glibc'
'librevenge' 'libxext' 'openjpeg2')
optdepends=('java-runtime: adds java support'
'java-environment>=17: required by extension-wiki-publisher and extension-nlpsolver'
'pstoedit: translates PostScript and PDF graphics into other vector formats'
@ -333,6 +340,7 @@ package_libreoffice-fresh() {
'gtk3: for GTK3 integration'
'gtk4: for GTK4 integration (experimental)'
'kio5: for KF5 KDE desktop integration'
'kio: for KF6 KDE desktop integration'
'qt6-base: for Qt6 desktop integration')
backup=(etc/libreoffice/sofficerc
etc/libreoffice/bootstraprc

View file

@ -0,0 +1,36 @@
From e42b2827b5d392479791632877fc00b6add0307d Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.weghorn@posteo.de>
Date: Mon, 12 Feb 2024 10:38:03 +0100
Subject: kf6: Add missing include path to fix build
Many thanks to Andreas Sturmlechner for pointing
this out on #libreoffice-dev on 2024-02-12:
> [10:27] <asturm> michaelweghorn: I also had to apply a trivial
> openmandriva patch to get it to build in the first place,
> https://github.com/gentoo/gentoo/blob/master/app-office/libreoffice/files/libreoffice-24.2-kf6-buildfix.patch
Change-Id: If86220e258336d84ffc30fd5da0f5d99dda59aff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163237
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index e6c35380e91d..6440f1f734dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13499,7 +13499,7 @@ then
AC_MSG_ERROR([KF6 libraries not found. Please specify the root of your KF6 installation by exporting KF6DIR before running "configure".])
fi
- KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n -I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem -I$kf6_incdir/KIO -I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets -I$kf6_incdir/KIOFileWidgets -I$qt6_incdir -I$qt6_incdir/QtCore -I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets -I$qt6_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING"
+ KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n -I$kf6_incdir/KConfig -I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem -I$kf6_incdir/KIO -I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets -I$kf6_incdir/KIOFileWidgets -I$qt6_incdir -I$qt6_incdir/QtCore -I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets -I$qt6_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING"
KF6_LIBS="-L$kf6_libdir -lKF6CoreAddons -lKF6I18n -lKF6ConfigCore -lKF6WindowSystem -lKF6KIOCore -lKF6KIOWidgets -lKF6KIOFileWidgets -L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets -lQt6Network"
KF6_CFLAGS=$(printf '%s' "$KF6_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
--
cgit v1.2.3

View file

@ -1,8 +1,13 @@
#
# https://wiki.documentfoundation.org/Development/Environment_variables
#
# to force a certain look'n feel
#setenv SAL_USE_VCLPLUGIN gen
#setenv SAL_USE_VCLPLUGIN gtk3_kde5
#setenv SAL_USE_VCLPLUGIN kf5
#setenv SAL_USE_VCLPLUGIN kf6
#setenv SAL_USE_VCLPLUGIN qt5
#setenv SAL_USE_VCLPLUGIN qt6
#setenv SAL_USE_VCLPLUGIN gtk3

View file

@ -1,8 +1,13 @@
#
# https://wiki.documentfoundation.org/Development/Environment_variables
#
# to force a certain look'n feel
#export SAL_USE_VCLPLUGIN=gen
#export SAL_USE_VCLPLUGIN=gtk3_kde5
#export SAL_USE_VCLPLUGIN=kf5
#export SAL_USE_VCLPLUGIN=kf6
#export SAL_USE_VCLPLUGIN=qt5
#export SAL_USE_VCLPLUGIN=qt6
#export SAL_USE_VCLPLUGIN=gtk3