diff --git a/extra/libreoffice-still/.SRCINFO b/extra/libreoffice-still/.SRCINFO index ac645fd0a..8b134251b 100644 --- a/extra/libreoffice-still/.SRCINFO +++ b/extra/libreoffice-still/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = libreoffice-still - pkgver = 7.6.7 + pkgver = 24.2.5 pkgrel = 1 url = https://www.libreoffice.org/ arch = x86_64 @@ -26,6 +26,7 @@ pkgbase = libreoffice-still makedepends = icu makedepends = libxslt makedepends = lcms2 + makedepends = poppler makedepends = libvisio makedepends = libetonyek makedepends = libodfgen @@ -44,16 +45,22 @@ pkgbase = libreoffice-still makedepends = gperf makedepends = gtk3 makedepends = gtk4 - makedepends = qt5-base - makedepends = qt5-x11extras - makedepends = qt6-base makedepends = cppunit makedepends = beanshell makedepends = clucene + makedepends = qt5-base + makedepends = qt5-x11extras + makedepends = qt6-base + makedepends = kio + makedepends = kconfig + makedepends = kcoreaddons + makedepends = kwindowsystem + makedepends = ki18n + makedepends = kcoreaddons makedepends = junit makedepends = libmythes makedepends = libwpg - makedepends = java-environment=11 + makedepends = java-environment=17 makedepends = postgresql-libs makedepends = mariadb-libs makedepends = libgl @@ -79,6 +86,7 @@ pkgbase = libreoffice-still makedepends = libcmis makedepends = libtommath makedepends = libzmf + makedepends = xmlsec makedepends = rxvt-unicode makedepends = gpgme makedepends = libwebp @@ -103,26 +111,25 @@ pkgbase = libreoffice-still noextract = 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip noextract = d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip noextract = ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - noextract = pdfium-5778.tar.bz2 + noextract = pdfium-6179.tar.bz2 noextract = dtoa-20180411.tgz noextract = lxml-4.1.1.tgz noextract = Firebird-3.0.7.33374-0.tar.bz2 - noextract = skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz + noextract = skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz noextract = dragonbox-1.1.3.tar.gz noextract = frozen-1.1.1.tar.gz - noextract = xmlsec1-1.2.37.tar.gz - noextract = poppler-23.09.0.tar.xz - noextract = poppler-data-0.4.12.tar.gz + noextract = zxcvbn-c-2.5.tar.gz + noextract = Java-WebSocket-1.5.4.tar.gz noextract = 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar 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/7.6.7/libreoffice-7.6.7.2.tar.xz - source = https://download.documentfoundation.org/libreoffice/src/7.6.7/libreoffice-7.6.7.2.tar.xz.asc - source = https://download.documentfoundation.org/libreoffice/src/7.6.7/libreoffice-help-7.6.7.2.tar.xz - source = https://download.documentfoundation.org/libreoffice/src/7.6.7/libreoffice-help-7.6.7.2.tar.xz.asc - source = https://download.documentfoundation.org/libreoffice/src/7.6.7/libreoffice-translations-7.6.7.2.tar.xz - source = https://download.documentfoundation.org/libreoffice/src/7.6.7/libreoffice-translations-7.6.7.2.tar.xz.asc + source = https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-24.2.5.2.tar.xz + source = https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-24.2.5.2.tar.xz.asc + source = https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-help-24.2.5.2.tar.xz + source = https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-help-24.2.5.2.tar.xz.asc + source = https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-translations-24.2.5.2.tar.xz + source = https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-translations-24.2.5.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 @@ -131,32 +138,30 @@ pkgbase = libreoffice-still source = https://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip source = https://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip source = https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - source = https://dev-www.libreoffice.org/src/pdfium-5778.tar.bz2 + source = https://dev-www.libreoffice.org/src/pdfium-6179.tar.bz2 source = https://dev-www.libreoffice.org/src/dtoa-20180411.tgz source = https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz source = https://dev-www.libreoffice.org/src/Firebird-3.0.7.33374-0.tar.bz2 - source = https://dev-www.libreoffice.org/src/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz + source = https://dev-www.libreoffice.org/src/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz source = https://dev-www.libreoffice.org/src/dragonbox-1.1.3.tar.gz source = https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz - source = https://dev-www.libreoffice.org/src/xmlsec1-1.2.37.tar.gz - source = https://dev-www.libreoffice.org/src/poppler-23.09.0.tar.xz - source = https://dev-www.libreoffice.org/src/poppler-data-0.4.12.tar.gz + source = https://dev-www.libreoffice.org/src/zxcvbn-c-2.5.tar.gz + source = https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.4.tar.gz source = https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar source = https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar source = https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf source = make-pyuno-work-with-system-wide-module-install.diff source = 623ea5c.diff source = libreoffice-7.5.8.2-icu-74-compatibility.patch - source = gcc14-buildfix.patch source = soffice-template.desktop.in source = libreoffice-still.sh source = libreoffice-still.csh validpgpkeys = C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3 - sha256sums = 75d052ee101aca0d75cd5cb2998e2f705c0089c6acaa263b696e45f8c95e3b95 + sha256sums = 9c16e4f7415521e42dda48d76a614e18e78fc5e5fae689b4bbe8139ed8a70a0e sha256sums = SKIP - sha256sums = 3a87314a58a8f6c1cf263c119fe49bbbd2554591695bca6d1e79d501cc1ca4d0 + sha256sums = 545fdbcbb00ddff1acda18d33cfceec792d0a2ac0f92f4ecbe3f16691b8a1724 sha256sums = SKIP - sha256sums = 8a9888a0e8553a71f658f8b55527f31fc0aa58a40d993b28740aed4580baf5af + sha256sums = 3cb01f83a3a605082b2054874741c74db69b8bdbd0c009304515fe547c20313b sha256sums = SKIP sha256sums = 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 sha256sums = 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 @@ -166,26 +171,24 @@ pkgbase = libreoffice-still sha256sums = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 sha256sums = 1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133 sha256sums = 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd - sha256sums = b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06 + sha256sums = 4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c sha256sums = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 sha256sums = 940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e sha256sums = acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76 - sha256sums = 0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9 + sha256sums = 2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01 sha256sums = 09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384 sha256sums = f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45 - sha256sums = 5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c - sha256sums = 80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55 - sha256sums = c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74 + sha256sums = 77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd + sha256sums = a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720 sha256sums = f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770 sha256sums = 984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504 sha256sums = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140 sha256sums = c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563 sha256sums = 440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5 sha256sums = d7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599 - sha256sums = ddc7aaed0b755c4f2a89ddc2ff68a7d9bc1b7b3458177f1de34085cd3163a1f7 sha256sums = d0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879 - sha256sums = 364af7c45bc4e41f9ebaa36944daefb9bf3aca823b7e0059307ef0cbb41bbf4c - sha256sums = 060390bec7882072099c54508993fcfa7e3dd34d6e4b44996bd197d5e99cf0f6 + sha256sums = 9fb33dbc3ffeb6af2ea7341b58242142d4eca903584c21c5f4b44ff27fbf5b5f + sha256sums = 512355b5ef646791089da8c2b35cf8b019673c0c8a58685962af3b5d9eb5d6bb pkgname = libreoffice-still-sdk pkgdesc = Software Development Kit for LibreOffice maintenance branch @@ -221,6 +224,7 @@ pkgname = libreoffice-still depends = icu depends = libxslt depends = lcms2 + depends = poppler depends = libvisio depends = libetonyek depends = libodfgen @@ -246,6 +250,7 @@ pkgname = libreoffice-still depends = libtommath depends = libzmf depends = libatomic_ops + depends = xmlsec depends = libnumbertext depends = gpgme depends = libfreehand @@ -275,7 +280,7 @@ pkgname = libreoffice-still depends = libxext depends = openjpeg2 optdepends = java-runtime: adds java support - optdepends = java-environment: 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/extra/libreoffice-still/PKGBUILD b/extra/libreoffice-still/PKGBUILD index 534ddf064..8175387d8 100644 --- a/extra/libreoffice-still/PKGBUILD +++ b/extra/libreoffice-still/PKGBUILD @@ -18,8 +18,8 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 pkgbase=libreoffice-still pkgname=('libreoffice-still-sdk' 'libreoffice-still') -_LOver=7.6.7.2 -pkgver=7.6.7 +_LOver=24.2.5.2 +pkgver=24.2.5 pkgrel=1 arch=('x86_64') license=('MPL-2.0' 'LGPL-3.0-or-later') @@ -27,16 +27,18 @@ url="https://www.libreoffice.org/" makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps' 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 'libxslt' - 'lcms2' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' + 'lcms2' 'poppler' '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' 'qt5-x11extras' 'qt6-base' 'cppunit' 'beanshell' 'clucene' - 'junit' 'libmythes' 'libwpg' 'java-environment=11' 'postgresql-libs' 'mariadb-libs' 'libgl' + 'gperf' 'gtk3' 'gtk4' 'cppunit' 'beanshell' 'clucene' + 'qt5-base' 'qt5-x11extras' + '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' 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' 'libexttextcat' 'gobject-introspection' 'libcmis' # 'libfbclient' - 'libtommath' 'libzmf' 'rxvt-unicode' 'gpgme' 'libwebp' # 'xmlsec' + 'libtommath' 'libzmf' 'xmlsec' 'rxvt-unicode' 'gpgme' 'libwebp' 'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice' 'boost' 'libnumbertext' 'abseil-cpp' 'clang' 'zxing-cpp' 'libffi' 'box2d' 'git' 'python-setuptools' @@ -56,23 +58,21 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ${_additional_source_url}/pdfium-5778.tar.bz2 + ${_additional_source_url}/pdfium-6179.tar.bz2 ${_additional_source_url}/dtoa-20180411.tgz ${_additional_source_url}/lxml-4.1.1.tgz ${_additional_source_url}/Firebird-3.0.7.33374-0.tar.bz2 - ${_additional_source_url}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz + ${_additional_source_url}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz ${_additional_source_url}/dragonbox-1.1.3.tar.gz ${_additional_source_url}/frozen-1.1.1.tar.gz - ${_additional_source_url}/xmlsec1-1.2.37.tar.gz - ${_additional_source_url}/poppler-23.09.0.tar.xz - ${_additional_source_url}/poppler-data-0.4.12.tar.gz + ${_additional_source_url}/zxcvbn-c-2.5.tar.gz + ${_additional_source_url}/Java-WebSocket-1.5.4.tar.gz ${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite ${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite ${_additional_source_url2}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf make-pyuno-work-with-system-wide-module-install.diff 623ea5c.diff libreoffice-7.5.8.2-icu-74-compatibility.patch - gcc14-buildfix.patch soffice-template.desktop.in libreoffice-still.sh libreoffice-still.csh) noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip @@ -83,26 +83,25 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - pdfium-5778.tar.bz2 + pdfium-6179.tar.bz2 dtoa-20180411.tgz lxml-4.1.1.tgz Firebird-3.0.7.33374-0.tar.bz2 - skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz + skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz dragonbox-1.1.3.tar.gz frozen-1.1.1.tar.gz - xmlsec1-1.2.37.tar.gz - poppler-23.09.0.tar.xz - poppler-data-0.4.12.tar.gz + zxcvbn-c-2.5.tar.gz + Java-WebSocket-1.5.4.tar.gz 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf ) validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) -sha256sums=('75d052ee101aca0d75cd5cb2998e2f705c0089c6acaa263b696e45f8c95e3b95' +sha256sums=('9c16e4f7415521e42dda48d76a614e18e78fc5e5fae689b4bbe8139ed8a70a0e' 'SKIP' - '3a87314a58a8f6c1cf263c119fe49bbbd2554591695bca6d1e79d501cc1ca4d0' + '545fdbcbb00ddff1acda18d33cfceec792d0a2ac0f92f4ecbe3f16691b8a1724' 'SKIP' - '8a9888a0e8553a71f658f8b55527f31fc0aa58a40d993b28740aed4580baf5af' + '3cb01f83a3a605082b2054874741c74db69b8bdbd0c009304515fe547c20313b' 'SKIP' '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1' '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753' @@ -112,26 +111,24 @@ sha256sums=('75d052ee101aca0d75cd5cb2998e2f705c0089c6acaa263b696e45f8c95e3b95' 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370' '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133' '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd' - 'b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06' + '4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c' '0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4' '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e' 'acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76' - '0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9' + '2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01' '09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384' 'f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45' - '5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c' - '80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55' - 'c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74' + '77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd' + 'a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720' 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504' 'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' '440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5' 'd7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599' - 'ddc7aaed0b755c4f2a89ddc2ff68a7d9bc1b7b3458177f1de34085cd3163a1f7' 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' - '364af7c45bc4e41f9ebaa36944daefb9bf3aca823b7e0059307ef0cbb41bbf4c' - '060390bec7882072099c54508993fcfa7e3dd34d6e4b44996bd197d5e99cf0f6') + '9fb33dbc3ffeb6af2ea7341b58242142d4eca903584c21c5f4b44ff27fbf5b5f' + '512355b5ef646791089da8c2b35cf8b019673c0c8a58685962af3b5d9eb5d6bb') prepare() { @@ -157,9 +154,6 @@ prepare() { # remove breaking test breaking rule sed -i "109d" i18npool/source/breakiterator/data/sent.txt - # fix build with gcc14 - patch -Np1 -i "${srcdir}"/gcc14-buildfix.patch - #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do case "$i" in @@ -207,6 +201,7 @@ build() { --enable-gio\ --disable-gtk3-kde5 \ --disable-kf5 \ + --enable-kf6 \ --enable-qt5 \ --enable-qt6 \ --enable-gtk3 \ @@ -258,7 +253,6 @@ build() { --with-system-libzmf \ --with-system-gpgmepp \ --with-system-libstaroffice \ - --without-system-xmlsec \ --with-jdk-home="/usr/lib/jvm/default" \ --with-ant-home="/usr/share/ant"\ --with-system-boost\ @@ -272,7 +266,7 @@ build() { --without-system-dragonbox \ --without-system-libfixmath \ --without-system-frozen \ - --without-system-poppler \ + --without-system-zxcvbn \ --with-gdrive-client-id=${_google_default_client_id} \ --with-gdrive-client-secret=${_google_default_client_secret} \ --disable-dependency-tracking @@ -305,10 +299,6 @@ package_libreoffice-still-sdk() { mv "${srcdir}"/fakeinstall/${file} "${pkgdir}"/$file done - # fix environment path to keep compatibility with other java-environments - sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" \ - "${pkgdir}"/usr/lib/libreoffice/sdk/setsdkenv_unix.sh - # fix permissions find "${pkgdir}"/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} + @@ -322,19 +312,19 @@ package_libreoffice-still() { depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps' 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 'libxslt' - 'lcms2' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' + 'lcms2' 'poppler' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' 'libmspub' 'harfbuzz-icu' 'nss' 'clucene' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'libpagemaker' 'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' 'liblangtag' 'libexttextcat' 'liborcus' 'libwebp' 'libcmis' # 'libfbclient' - 'libtommath' 'libzmf' 'libatomic_ops' 'libnumbertext' 'gpgme' # 'xmlsec' + '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: 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' diff --git a/extra/libreoffice-still/libreoffice-still.csh b/extra/libreoffice-still/libreoffice-still.csh index e9c679c10..4f73ccc81 100644 --- a/extra/libreoffice-still/libreoffice-still.csh +++ b/extra/libreoffice-still/libreoffice-still.csh @@ -1,6 +1,11 @@ +# +# https://wiki.documentfoundation.org/Development/Environment_variables +# + # to force a certain look'n feel #setenv SAL_USE_VCLPLUGIN gen +#setenv SAL_USE_VCLPLUGIN kf6 #setenv SAL_USE_VCLPLUGIN qt5 #setenv SAL_USE_VCLPLUGIN qt6 #setenv SAL_USE_VCLPLUGIN gtk3 diff --git a/extra/libreoffice-still/libreoffice-still.sh b/extra/libreoffice-still/libreoffice-still.sh index 332ab6df0..b70f669ea 100644 --- a/extra/libreoffice-still/libreoffice-still.sh +++ b/extra/libreoffice-still/libreoffice-still.sh @@ -1,6 +1,11 @@ +# +# https://wiki.documentfoundation.org/Development/Environment_variables +# + # to force a certain look'n feel #export SAL_USE_VCLPLUGIN=gen +#export SAL_USE_VCLPLUGIN=kf6 #export SAL_USE_VCLPLUGIN=qt5 #export SAL_USE_VCLPLUGIN=qt6 #export SAL_USE_VCLPLUGIN=gtk3