diff --git a/libreoffice-fresh/.SRCINFO b/libreoffice-fresh/.SRCINFO index 77bdefa429..a136fc55a2 100644 --- a/libreoffice-fresh/.SRCINFO +++ b/libreoffice-fresh/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = libreoffice-fresh - pkgver = 24.8.2 + pkgver = 24.8.3 pkgrel = 2 url = https://www.libreoffice.org/ arch = x86_64 @@ -62,7 +62,6 @@ pkgbase = libreoffice-fresh makedepends = kwindowsystem makedepends = ki18n makedepends = kcoreaddons - makedepends = junit makedepends = libmythes makedepends = libwpg makedepends = java-environment>=11 @@ -128,12 +127,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.8.2/libreoffice-24.8.2.1.tar.xz - source = https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-24.8.2.1.tar.xz.asc - source = https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-help-24.8.2.1.tar.xz - source = https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-help-24.8.2.1.tar.xz.asc - source = https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-translations-24.8.2.1.tar.xz - source = https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-translations-24.8.2.1.tar.xz.asc + source = https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-24.8.3.2.tar.xz + source = https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-24.8.3.2.tar.xz.asc + source = https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-help-24.8.3.2.tar.xz + source = https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-help-24.8.3.2.tar.xz.asc + source = https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-translations-24.8.3.2.tar.xz + source = https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-translations-24.8.3.2.tar.xz.asc source = https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip source = https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz source = https://dev-www.libreoffice.org/src/language-subtag-registry-2021-03-05.tar.bz2 @@ -156,13 +155,13 @@ pkgbase = libreoffice-fresh source = soffice-template.desktop.in source = libreoffice-fresh.sh source = libreoffice-fresh.csh - source = riscv64-support.patch + source = poppler-24.10.patch validpgpkeys = C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3 - sha256sums = ab301baeb64114a9a1bce5dcb914ee0bf3e2ac7b8d74d32f3233f5f312bcc4cf + sha256sums = 5d709bac629d550b3ff3b7866f7758820a0badbfba06b9cfb946ec037b5f47e9 sha256sums = SKIP - sha256sums = 4ff77d50dfa77c45dff7ca8c5033028ff24530b7e9ce333aee2a418046d08ef6 + sha256sums = 1e5dc8c6f9f9842d181770155bd5750366152ea0d091f2620ad90464bf3ce713 sha256sums = SKIP - sha256sums = 72382c0fb00d83511be9197bf1e4e0947899084a287a97960942e49624676efb + sha256sums = 0a9c916e7ef6cae8cf1693e87874468c387efc2adc15e5d3208fa028ec5c1c87 sha256sums = SKIP sha256sums = 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 sha256sums = 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 @@ -186,7 +185,7 @@ pkgbase = libreoffice-fresh sha256sums = d0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879 sha256sums = 9fb33dbc3ffeb6af2ea7341b58242142d4eca903584c21c5f4b44ff27fbf5b5f sha256sums = 512355b5ef646791089da8c2b35cf8b019673c0c8a58685962af3b5d9eb5d6bb - sha256sums = 3f05bb4d781d331c5cfa2600866be7e10c6b23406ce890c3db741a2db76e79e2 + sha256sums = 6dd6736c3089907050d3b346ae08570bd5901bd85d9a2111d7a97f63ea5e27ea makedepends_x86_64 = clang makedepends_riscv64 = clang @@ -281,7 +280,7 @@ pkgname = libreoffice-fresh depends = openjpeg2 depends = argon2 optdepends = java-runtime: adds java support - optdepends = java-environment>=11: required by extension-wiki-publisher and extension-nlpsolver + optdepends = java-environment>=17: required by extension-wiki-publisher and extension-nlpsolver optdepends = pstoedit: translates PostScript and PDF graphics into other vector formats optdepends = libmythes: for use in thesaurus optdepends = beanshell: interactive java -- good for prototyping/macros diff --git a/libreoffice-fresh/PKGBUILD b/libreoffice-fresh/PKGBUILD index 6932d2fe8b..b1d1136e39 100644 --- a/libreoffice-fresh/PKGBUILD +++ b/libreoffice-fresh/PKGBUILD @@ -4,8 +4,8 @@ pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') -_LOver=24.8.2.1 -pkgver=24.8.2 +_LOver=24.8.3.2 +pkgver=24.8.3 pkgrel=2 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) license=('MPL-2.0' 'LGPL-3.0-or-later') @@ -19,7 +19,7 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps' 'gperf' 'gtk3' 'gtk4' 'cppunit' 'beanshell' 'clucene' 'qt5-base' 'qt5-x11extras' 'qt6-base' 'qt6-multimedia' 'kio' 'kconfig' 'kcoreaddons' 'kwindowsystem' 'ki18n' 'kcoreaddons' - 'junit' 'libmythes' 'libwpg' 'java-environment>=11' 'java-environment<=17' 'postgresql-libs' 'mariadb-libs' 'libgl' + 'libmythes' 'libwpg' 'java-environment>=11' 'java-environment<=17' 'postgresql-libs' 'mariadb-libs' 'libgl' 'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker' 'glm' 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' @@ -58,7 +58,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url2}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf soffice-template.desktop.in libreoffice-fresh.sh libreoffice-fresh.csh - riscv64-support.patch) + poppler-24.10.patch) noextract=(a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz language-subtag-registry-2021-03-05.tar.bz2 @@ -80,11 +80,11 @@ noextract=(a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf ) validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) -sha256sums=('ab301baeb64114a9a1bce5dcb914ee0bf3e2ac7b8d74d32f3233f5f312bcc4cf' +sha256sums=('5d709bac629d550b3ff3b7866f7758820a0badbfba06b9cfb946ec037b5f47e9' 'SKIP' - '4ff77d50dfa77c45dff7ca8c5033028ff24530b7e9ce333aee2a418046d08ef6' + '1e5dc8c6f9f9842d181770155bd5750366152ea0d091f2620ad90464bf3ce713' 'SKIP' - '72382c0fb00d83511be9197bf1e4e0947899084a287a97960942e49624676efb' + '0a9c916e7ef6cae8cf1693e87874468c387efc2adc15e5d3208fa028ec5c1c87' 'SKIP' '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870' '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776' @@ -108,14 +108,12 @@ sha256sums=('ab301baeb64114a9a1bce5dcb914ee0bf3e2ac7b8d74d32f3233f5f312bcc4cf' 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' '9fb33dbc3ffeb6af2ea7341b58242142d4eca903584c21c5f4b44ff27fbf5b5f' '512355b5ef646791089da8c2b35cf8b019673c0c8a58685962af3b5d9eb5d6bb' - '3f05bb4d781d331c5cfa2600866be7e10c6b23406ce890c3db741a2db76e79e2') + '6dd6736c3089907050d3b346ae08570bd5901bd85d9a2111d7a97f63ea5e27ea') prepare() { cd libreoffice-$_LOver - #patch -Np1 -i ${srcdir}/riscv64-support.patch - # move external sources into place mkdir "${srcdir}"/ext_sources && pushd "${srcdir}"/ext_sources for source in "${noextract[@]}"; do @@ -133,6 +131,8 @@ prepare() { export ARCH_FLAGS export CFLAGS="$ARCH_FLAGS" export CXXFLAGS="$ARCH_FLAGS" + + patch -p1 -i ../poppler-24.10.patch # Fix build with Poppler 24.10 (KaoS patch) } build() { @@ -166,7 +166,7 @@ build() { sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk _configure_flags=(--enable-lto --disable-firebird-sdbc --without-system-firebird) ;; - powerpc|powerpc64) _configure_flags=(--disable-lto --disable-firebird-sdbc --without-system-firebird --disable-skia) ;; + powerpc|powerpc64) _configure_flags=(--disable-lto --disable-firebird-sdbc --without-system-firebird --disable-skia) ;; riscv64) _configure_flags=(--disable-lto --disable-firebird-sdbc --without-system-firebird) ;; *) _configure_flags=(--enable-lto --without-system-firebird) ;; esac @@ -248,6 +248,7 @@ build() { --with-system-mythes \ --with-system-headers \ --without-system-hsqldb \ + --without-junit \ --with-system-clucene \ --without-system-box2d \ --without-system-dragonbox \ @@ -310,7 +311,7 @@ package_libreoffice-fresh() { 'cairo' 'libx11' 'expat' 'glib2' 'boost-libs' 'libtiff' 'dbus' 'glibc' 'librevenge' 'libxext' 'openjpeg2' 'argon2') optdepends=('java-runtime: adds java support' - 'java-environment>=11: required by extension-wiki-publisher and extension-nlpsolver' + 'java-environment>=17: required by extension-wiki-publisher and extension-nlpsolver' 'pstoedit: translates PostScript and PDF graphics into other vector formats' 'libmythes: for use in thesaurus' 'beanshell: interactive java -- good for prototyping/macros' @@ -430,6 +431,6 @@ package_libreoffice-fresh() { 'sid','sk','sl','sq','sv','ta','tg','tr','ug','uk','vi','zh-CN','zh-TW'])" \ > "${pkgdir}"/usr/lib/libreoffice/help/languages.js - # ensure soffice is executable, somehow on powerpc it isn't installed correctly - chmod 0755 "${pkgdir}"/usr/lib/libreoffice/program/soffice + # ensure soffice is executable, somehow on powerpc it isn't installed correctly + chmod 0755 "${pkgdir}"/usr/lib/libreoffice/program/soffice } diff --git a/libreoffice-fresh/poppler-24.10.patch b/libreoffice-fresh/poppler-24.10.patch new file mode 100644 index 0000000000..1ef67a8999 --- /dev/null +++ b/libreoffice-fresh/poppler-24.10.patch @@ -0,0 +1,15 @@ +diff -up libreoffice-24.8.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.omv~ libreoffice-24.8.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +--- libreoffice-24.8.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.omv~ 2024-10-20 19:08:49.935352230 +0200 ++++ libreoffice-24.8.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2024-10-20 20:01:30.448965822 +0200 +@@ -1306,9 +1306,9 @@ poppler_bool PDFOutDev::tilingPatternFil + 0, nBitmapWidth * nBitmapHeight, Object(objNull))); + auto aDecode = Object(objNull); + std::unique_ptr pRgbIdentityColorMap(new GfxImageColorMap(8, &aDecode, +- new GfxDeviceRGBColorSpace())); ++ std::make_unique())); + std::unique_ptr pGrayIdentityColorMap(new GfxImageColorMap(8, &aDecode, +- new GfxDeviceGrayColorSpace())); ++ std::make_unique())); + + OutputBuffer aBuf; initBuf(aBuf); + writePng_(aBuf, pRgbStr.get(), nBitmapWidth, nBitmapHeight, pRgbIdentityColorMap.get(),