diff --git a/srcpkgs/libreoffice/patches/009-kde.patch b/srcpkgs/libreoffice/patches/009-kde.patch deleted file mode 100644 index ff29937b050..00000000000 --- a/srcpkgs/libreoffice/patches/009-kde.patch +++ /dev/null @@ -1,40 +0,0 @@ -Upstream: https://gerrit.libreoffice.org/c/core/+/174512/ -diff --git a/configure.ac b/configure.ac -index 459ce88b930e..0b84d85c47f8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13834,12 +13834,12 @@ then - save_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $KF5_CFLAGS" - AC_MSG_CHECKING([whether KDE is >= 5.0]) -- AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include - - int main(int argc, char **argv) { -- if (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 0) return 0; -- else return 1; -+ static_assert(KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 0); -+ return 0; - } - ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old])],[]) - CXXFLAGS=$save_CXXFLAGS -@@ -13910,12 +13910,12 @@ then - CXXFLAGS="$CXXFLAGS $KF6_CFLAGS" - dnl KF6 development version as of 2023-06 uses version number 5.240 - AC_MSG_CHECKING([whether KDE is >= 5.240]) -- AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include - - int main(int argc, char **argv) { -- if (KCOREADDONS_VERSION_MAJOR == 6 || (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 240)) return 0; -- else return 1; -+ static_assert(KCOREADDONS_VERSION_MAJOR == 6 || (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 240)); -+ return 0; - } - ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old])],[]) - CXXFLAGS=$save_CXXFLAGS --- -2.47.0.rc0 - diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 650b0caa31d..82c0e7561c2 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice' pkgname=libreoffice -version=24.8.3.2 -revision=2 +version=25.2.0.3 +revision=1 build_style=meta build_helper="gir" make_build_target="build" @@ -76,7 +76,7 @@ distfiles=" ${_addurl}/language-subtag-registry-2022-08-08.tar.bz2 ${_addurl}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip ${_addurl}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ${_addurl}/pdfium-6425.tar.bz2 + ${_addurl}/pdfium-6764.tar.bz2 ${_exturl}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar ${_exturl}/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar ${_addurl}/dtoa-20180411.tgz @@ -90,21 +90,21 @@ distfiles=" ${_addurl}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip ${_addurl}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip ${_addurl}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - ${_addurl}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz - ${_addurl}/frozen-1.1.1.tar.gz + ${_addurl}/skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz + ${_addurl}/frozen-1.2.0.tar.gz ${_addurl}/dragonbox-1.1.3.tar.gz - ${_addurl}/Java-WebSocket-1.5.6.tar.gz + ${_addurl}/Java-WebSocket-1.6.0.tar.gz ${_addurl}/zxcvbn-c-2.5.tar.gz " -checksum="5d709bac629d550b3ff3b7866f7758820a0badbfba06b9cfb946ec037b5f47e9 - 1e5dc8c6f9f9842d181770155bd5750366152ea0d091f2620ad90464bf3ce713 - 0a9c916e7ef6cae8cf1693e87874468c387efc2adc15e5d3208fa028ec5c1c87 +checksum="982448d736f8bb858b40d1fcb82b9915bdb88e7c98a5cabb741810fc93d525b4 + 5f7f02a8ef5728454fc699eaa9e436fb689c3a9e8302163de0c4a6a6d2aed3dd + 2ef584b5859cab6abbf3f753fb36711d498c8a94937759c9c0eb2f4ed9acaceb 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66 e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00 1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd - fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c + 59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49 f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770 d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 @@ -118,10 +118,10 @@ checksum="5d709bac629d550b3ff3b7866f7758820a0badbfba06b9cfb946ec037b5f47e9 abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045 - 2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01 - f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45 + 53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d + ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823 09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384 - 167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f + f3ce29efde338707241d47ab4784b19a1e3658bfa0564b5bc5f80c27e5118728 77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd" skip_extraction=" a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip @@ -129,7 +129,7 @@ skip_extraction=" language-subtag-registry-2022-08-08.tar.bz2 d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - pdfium-6425.tar.bz2 + pdfium-6764.tar.bz2 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar dtoa-20180411.tgz @@ -143,10 +143,10 @@ skip_extraction=" 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz - frozen-1.1.1.tar.gz + skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz + frozen-1.2.0.tar.gz dragonbox-1.1.3.tar.gz - Java-WebSocket-1.5.6.tar.gz + Java-WebSocket-1.6.0.tar.gz zxcvbn-c-2.5.tar.gz " replaces="libreoffice-firebird<6.2.4.2_1" @@ -484,6 +484,7 @@ do_configure() { opts+=" --without-system-libfixmath" bopts+=" --without-system-libfixmath" opts+=" --without-myspell-dicts" + opts+=" --without-system-java-websocket" # finish configuring build opts+=" --with-external-dict-dir=/usr/share/hunspell" opts+=" --with-external-hyph-dir=/usr/share/hyphen" diff --git a/srcpkgs/libreoffice/update b/srcpkgs/libreoffice/update index 40269b427e7..4956b7f4540 100644 --- a/srcpkgs/libreoffice/update +++ b/srcpkgs/libreoffice/update @@ -1 +1,2 @@ -site=https://www.libreoffice.org/download/download-libreoffice/ +site=https://download.documentfoundation.org/libreoffice/stable/ +pattern='(?![<]a href=")[0-9.]+(?=/"[>])'