From f76bf08e7559b9e7e0360164af7fba2adcee91b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 6 Mar 2024 12:00:41 +0700 Subject: [PATCH] libreoffice: update to 24.2.1.2. --- common/shlibs | 1 + srcpkgs/libreoffice/template | 43 ++++++++++++++++++++---------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/common/shlibs b/common/shlibs index 9bcf0c5756b..b8a530a4fe2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2587,6 +2587,7 @@ liborcus-0.18.so.0 liborcus-0.18.1_1 liborcus-spreadsheet-model-0.18.so.0 liborcus-0.18.1_1 libnumbertext-1.0.so.0 libnumbertext-1.0.4_1 libzmf-0.0.so.0 libzmf-0.0.2_1 +libzxcvbn.so.0 zxcvbn-c-2.5_1 libGeneratedSaxParser.so opencollada-0.0.20160223_1 libMathMLSolver.so opencollada-0.0.20160223_1 libOpenCOLLADABaseUtils.so opencollada-0.0.20160223_1 diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index bebee1af160..e242c335eef 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,6 +1,6 @@ # Template file for 'libreoffice' pkgname=libreoffice -version=7.6.5.2 +version=24.2.1.2 revision=1 build_style=meta make_build_target="build" @@ -14,7 +14,8 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel libepubgen-devel libetonyek-devel libexttextcat-devel libfbclient3-devel libfreehand-devel boost-devel zlib-devel bzip2-devel libxslt-devel frozen libgcrypt-devel libgltf-devel libldap-devel libmariadbclient-devel libmspub-devel - libmwaw-devel libnumbertext-devel libodfgen-devel libopenjpeg2-devel liborcus-devel + libmwaw-devel libnumbertext-devel libodfgen-devel libopenjpeg2-devel + liborcus-devel libargon2-devel zxcvbn-c-devel libzmf-devel libpagemaker-devel libqxp-devel librsvg-devel libvisio-devel libwpg-devel libwps-devel lpsolve-devel mdds mythes-devel neon-devel nss-devel nspr-devel postgresql-libs-devel python3-devel qt5-devel redland-devel sane-devel @@ -75,8 +76,7 @@ distfiles=" ${_addurl}/box2d-2.4.1.tar.gz ${_addurl}/libcmis-0.6.1.tar.xz ${_addurl}/libstaroffice-0.0.7.tar.xz - ${_addurl}/libzmf-0.0.2.tar.xz - ${_addurl}/pdfium-5778.tar.bz2 + ${_addurl}/pdfium-6179.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 @@ -91,14 +91,16 @@ distfiles=" ${_addurl}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip ${_addurl}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip ${_addurl}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - ${_addurl}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz + ${_addurl}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz ${_addurl}/frozen-1.1.1.tar.gz ${_addurl}/dragonbox-1.1.3.tar.gz + ${_addurl}/Java-WebSocket-1.5.4.tar.gz + ${_addurl}/zxcvbn-c-2.5.tar.gz " -checksum="90e6b92f1b8d27bd998a03751c32b2add0afc19954da96ee3c0f4f8b6f5ccbcf - 4dd79dffad786b5ea2d04ea176ae9187e07de70273fd301cc16ff53ed78fa32c - 1e4ca22647522952693375e319ebf390b493e1e590cad2d7695e74307153571a - 074f01bf7f2adadffd37351f6fd26f9f2709d47d03036094c1efc6a969ee8767 +checksum="3ccf577e8f665059ed5a06577b3b37278080be9f29cc4ad3352857a8f2549fa8 + db010c781e85b401e87aa2030902565d5dfceb2c5ff4483c7172484d0f645eab + 6f8b03b1af94e72c8301164fbcb84c0af57ba6416be8ff02f7b7dd06ff4c2f74 + bf5b164b5e8ac9f796dbc2cf1e9d30e345341d367f634852c47e4572a94f58e9 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66 @@ -109,8 +111,7 @@ checksum="90e6b92f1b8d27bd998a03751c32b2add0afc19954da96ee3c0f4f8b6f5ccbcf d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2 d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074 f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db - 27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22 - b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06 + 4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770 d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 @@ -125,9 +126,11 @@ checksum="90e6b92f1b8d27bd998a03751c32b2add0afc19954da96ee3c0f4f8b6f5ccbcf abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045 - 0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9 + 2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01 f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45 - 09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384" + 09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384 + a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720 + 77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd" skip_extraction=" 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip @@ -139,8 +142,7 @@ skip_extraction=" box2d-2.4.1.tar.gz libcmis-0.6.1.tar.xz libstaroffice-0.0.7.tar.xz - libzmf-0.0.2.tar.xz - pdfium-5778.tar.bz2 + pdfium-6179.tar.bz2 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar dtoa-20180411.tgz @@ -155,9 +157,11 @@ skip_extraction=" 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz + skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz frozen-1.1.1.tar.gz dragonbox-1.1.3.tar.gz + Java-WebSocket-1.5.4.tar.gz + zxcvbn-c-2.5.tar.gz " replaces="libreoffice-firebird<6.2.4.2_1" @@ -171,7 +175,7 @@ case "$XBPS_TARGET_MACHINE" in CXXFLAGS+=" -DDISABLE_CVE_TESTS=1" ;; x86_64*|ppc64*) build_options_default="java" - makedepends+=" openjdk11 apache-ant" + makedepends+=" openjdk17 apache-ant" ;; esac @@ -430,6 +434,8 @@ do_configure() { ;; esac opts+=" --without-fonts" + opts+=" --enable-build-opensymbol" + # opts+=" --disable-fetch-external" # skia sucks if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then @@ -438,7 +444,7 @@ do_configure() { if [ "$build_option_java" ]; then opts+=" --with-java" - opts+=" --with-jdk-home=/usr/lib/jvm/openjdk11" + opts+=" --with-jdk-home=/usr/lib/jvm/openjdk17" # also disables hamcrest opts+=" --without-junit" else @@ -449,7 +455,6 @@ do_configure() { opts+=" --without-system-box2d" # https://github.com/tdf/libcmis/pull/43 changes ABI opts+=" --without-system-libcmis" - opts+=" --without-system-libzmf" opts+=" --without-system-libstaroffice" opts+=" --without-system-libtommath" opts+=" --without-system-jfreereport"