diff options
Diffstat (limited to 'editors/libreoffice')
| -rw-r--r-- | editors/libreoffice/Makefile | 27 | ||||
| -rw-r--r-- | editors/libreoffice/Makefile.common | 4 | ||||
| -rw-r--r-- | editors/libreoffice/distinfo | 18 | ||||
| -rw-r--r-- | editors/libreoffice/files/patch-configure | 108 | ||||
| -rw-r--r-- | editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk | 15 | ||||
| -rw-r--r-- | editors/libreoffice/files/powerpc64le-skia.patch.0 | 21 |
6 files changed, 133 insertions, 60 deletions
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index d68fe3abaca4..be0223cedf92 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -21,14 +21,14 @@ BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ dmake:devel/dmake \ gperf>=3.1:devel/gperf \ ${LOCALBASE}/include/libcuckoo/cuckoohash_map.hh:devel/libcuckoo \ - mdds>=2.1:devel/mdds \ + mdds>=${MDDS_VERSION}:devel/mdds \ gpatch:devel/patch \ ${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \ vigra-config:graphics/vigra \ ${LOCALBASE}/include/glm/glm.hpp:math/glm \ bash:shells/bash \ gsed:textproc/gsed \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \ coreutils>=8.23:sysutils/coreutils \ flex>=0.26:textproc/flex LIB_DEPENDS= libapr-1.so:devel/apr1 \ @@ -37,7 +37,7 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \ libicutu.so:devel/icu \ liblangtag.so:devel/liblangtag \ libltdl.so:devel/libltdl \ - liborcus-0.18.so:devel/liborcus \ + liborcus-0.20.so:devel/liborcus \ libplds4.so:devel/nspr \ libcurl.so:ftp/curl \ libgraphite2.so:graphics/graphite2 \ @@ -110,7 +110,7 @@ DISTFILES+= f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-ope DISTFILES+= dtoa-20180411.tgz:src DISTFILES+= dragonbox-1.1.3.tar.gz:src DISTFILES+= frozen-1.2.0.tar.gz:src -DISTFILES+= skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz:src +DISTFILES+= skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz:src DISTFILES+= zxcvbn-c-2.5.tar.gz:src NOT_FOR_ARCHS= armv6 armv7 @@ -133,6 +133,7 @@ USE_GL= gl glew glu USE_GNOME= cairo glib20 libxml2 libxslt USE_PERL5= build USE_XORG= ice sm x11 xaw xcb xext xinerama xrandr xrender +USE_LOCALE?= en_US.UTF-8 USES+= elfctl ELF_FEATURES= +wxneeded:instdir/program/soffice.bin @@ -141,11 +142,11 @@ OPTIONS_DEFINE= COINMP CUPS DOCS GNOME GTK3 GTK4 JAVA LTO MMEDIA PDFIUM PGSQL MA OPTIONS_RADIO= QT KDE OPTIONS_RADIO_QT= QT5 QT6 OPTIONS_RADIO_KDE= KF5 KF6 -OPTIONS_DEFAULT= CUPS DOCS JAVA MMEDIA PDFIUM QT5 +OPTIONS_DEFAULT= CUPS DOCS GTK3 JAVA MMEDIA PDFIUM QT6 #OPTIONS_EXCLUDE= GTK4 COINMP_DESC= Enable CoinMP (deprecated) math solver -GTK4_DESC= GTK+ 4 GUI toolkit support (experimental, broken) +GTK4_DESC= GTK+ 4 GUI toolkit support (experimental) JAVA_DESC= Add Java support (XML filters, macros, DB connections) KF5_DESC= KF5/Qt5 GUI toolkit support (implies QT5) KF6_DESC= KF6/Qt6 GUI toolkit support (implies QT6) @@ -155,8 +156,8 @@ PGSQL_DESC= Build with PostgreSQL-SDBC driver MARIADB_DESC= Build with MariaDB/MySQL-SDBC driver QT_DESC= Select Qt GUI engine version KDE_DESC= Select KDE GUI engine version -QT5_DESC= Qt5 GUI toolkit support (default visual style) -QT6_DESC= Qt6 GUI toolkit support (experimental visual style) +QT5_DESC= Qt5 GUI toolkit support +QT6_DESC= Qt6 GUI toolkit support (default visual style) SDK_DESC= Build with SDK TEST_DESC= Run all regression tests WEBDAV_DESC= Enable WebDAV protocol @@ -228,7 +229,7 @@ JAVA_DISTFILES= 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \ bsh-2.1.1-src.zip:src \ rhino-1.7.15.zip:src JAVA_USES= java -JAVA_VARS= JAVA_VERSION=17+ +JAVA_VARS= JAVA_VERSION=17+ NO_SHLIB_REQUIRES_GLOB=libjawt.so KF5_CONFIGURE_ENABLE= kf5 KF5_USE= kde=config,coreaddons,i18n,kio,windowsystem @@ -250,7 +251,7 @@ MMEDIA_USES= gstreamer MMEDIA_CONFIGURE_ENABLE= gstreamer-1-0 PDFIUM_CONFIGURE_ENABLE= pdfium -PDFIUM_DISTFILES= pdfium-6764.tar.bz2:src +PDFIUM_DISTFILES= pdfium-7012.tar.bz2:src PDFIUM_LIB_DEPENDS= libabsl_strings.so:devel/abseil \ libopenjp2.so:graphics/openjpeg @@ -360,6 +361,7 @@ BINARY_ALIAS= sed=gsed PIE_UNSAFE= yes #MAKE_JOBS_UNSAFE= yes +MDDS_VERSION= 3.1 .include <bsd.port.options.mk> @@ -397,10 +399,13 @@ CXXFLAGS_WARN= -Wshadow -Woverloaded-virtual LDFLAGS+= -Wl,--undefined-version post-patch: + ${REINPLACE_CMD} \ + -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + -e 's|mdds-3.0|mdds-${MDDS_VERSION}|g' \ + ${WRKSRC}/configure .if ${COMPILER_FEATURES:Mlibstdc++} ${REINPLACE_CMD} -e 's/gb_CC/gb_CXX/' ${WRKSRC}/solenv/gbuild/platform/unxgcc.mk .endif - ${CP} ${FILESDIR}/powerpc64le-skia.patch.0 ${WRKSRC}/external/skia/ pre-configure: @${TOUCH} ${WRKSRC}/autogen.lastrun diff --git a/editors/libreoffice/Makefile.common b/editors/libreoffice/Makefile.common index d609007d14cf..98975547d58a 100644 --- a/editors/libreoffice/Makefile.common +++ b/editors/libreoffice/Makefile.common @@ -7,8 +7,8 @@ LICENSE= LGPL3+ MPL20 LICENSE_COMB= dual DISTVERSION= ${LOVERSION}.${RCVER} -LOVERSION= 25.2.4 -RCVER= 3 +LOVERSION= 25.8.0 +RCVER= 4 #PRERELEASE= yes #DEVRELEASE= yes diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo index cde7b5cc776d..338a76ba903b 100644 --- a/editors/libreoffice/distinfo +++ b/editors/libreoffice/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1750806059 -SHA256 (libreoffice/libreoffice-25.2.4.3.tar.xz) = 01e1985f66c60da0e5cd9d1bb3773b7b46e9a920e318f35c6702d28e78e1c14f -SIZE (libreoffice/libreoffice-25.2.4.3.tar.xz) = 282218988 -SHA256 (libreoffice/libreoffice-help-25.2.4.3.tar.xz) = 5f3bbca9fc96284b6ee78a31f9719c6b9930dd884ec5394b71af9e99b05e0bea -SIZE (libreoffice/libreoffice-help-25.2.4.3.tar.xz) = 60055984 +TIMESTAMP = 1755260616 +SHA256 (libreoffice/libreoffice-25.8.0.4.tar.xz) = 353bd6f2dab04f47dfdb94ec063e1f45746ee0548d6478ee7288a6b411e3cb12 +SIZE (libreoffice/libreoffice-25.8.0.4.tar.xz) = 285601164 +SHA256 (libreoffice/libreoffice-help-25.8.0.4.tar.xz) = bb481127c368afa3e87972f71db87923b043ae81c69782565dc354e131bc9a52 +SIZE (libreoffice/libreoffice-help-25.8.0.4.tar.xz) = 60167792 SHA256 (libreoffice/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140 SIZE (libreoffice/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 207992 SHA256 (libreoffice/dtoa-20180411.tgz) = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 @@ -11,8 +11,8 @@ SHA256 (libreoffice/dragonbox-1.1.3.tar.gz) = 09d63b05e9c594ec423778ab59b7a5aa1d SIZE (libreoffice/dragonbox-1.1.3.tar.gz) = 4337233 SHA256 (libreoffice/frozen-1.2.0.tar.gz) = ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823 SIZE (libreoffice/frozen-1.2.0.tar.gz) = 187169 -SHA256 (libreoffice/skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz) = 53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d -SIZE (libreoffice/skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz) = 14368844 +SHA256 (libreoffice/skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz) = 2384f5f44a0b714d8dc78923fdf17453ab5a1808ca638154e3e27b361531db25 +SIZE (libreoffice/skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz) = 14601640 SHA256 (libreoffice/zxcvbn-c-2.5.tar.gz) = 77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd SIZE (libreoffice/zxcvbn-c-2.5.tar.gz) = 1404434 SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 @@ -51,7 +51,7 @@ SHA256 (libreoffice/bsh-2.1.1-src.zip) = 2248387ceaa319840434a3547a8b2fec12f95a8 SIZE (libreoffice/bsh-2.1.1-src.zip) = 2208737 SHA256 (libreoffice/rhino-1.7.15.zip) = 42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa SIZE (libreoffice/rhino-1.7.15.zip) = 5856077 -SHA256 (libreoffice/pdfium-6764.tar.bz2) = 59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49 -SIZE (libreoffice/pdfium-6764.tar.bz2) = 11121305 +SHA256 (libreoffice/pdfium-7012.tar.bz2) = e647ca4fcc2c91d9dca717452e1b1be1ab6155ac4977dca716041652c7b10bdd +SIZE (libreoffice/pdfium-7012.tar.bz2) = 11270991 SHA256 (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SIZE (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 12288 diff --git a/editors/libreoffice/files/patch-configure b/editors/libreoffice/files/patch-configure index 95b691ef807b..9e3444579b12 100644 --- a/editors/libreoffice/files/patch-configure +++ b/editors/libreoffice/files/patch-configure @@ -1,6 +1,15 @@ ---- configure.orig 2024-11-22 20:15:41 UTC +--- configure.orig 2025-08-12 11:44:26 UTC +++ configure -@@ -15372,6 +15372,11 @@ freebsd*) +@@ -596,7 +596,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed + # + # Initializations. + # +-ac_default_prefix=/usr/local ++ac_default_prefix=%%LOCALBASE%% + ac_clean_files= + ac_config_libobj_dir=. + LIBOBJS= +@@ -15576,6 +15576,11 @@ freebsd*) RTL_ARCH=PowerPC_64 PLATFORMID=freebsd_powerpc64 ;; @@ -12,16 +21,79 @@ powerpc|powerpcspe) CPUNAME=POWERPC RTL_ARCH=PowerPC -@@ -39457,7 +39462,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +@@ -15851,7 +15856,7 @@ openbsd*) + as_fn_error $? "Unsupported host_cpu $host_cpu for host_os $host_os" "$LINENO" 5 + ;; + esac +- SOLARINC="$SOLARINC -I/usr/local/include" ++ SOLARINC="$SOLARINC -I%%LOCALBASE%%/include" + ;; + + solaris*) +@@ -15880,7 +15885,7 @@ solaris*) + as_fn_error $? "Unsupported host_cpu $host_cpu for host_os $host_os" "$LINENO" 5 + ;; + esac +- SOLARINC="$SOLARINC -I/usr/local/include" ++ SOLARINC="$SOLARINC -I%%LOCALBASE%%/include" + ;; + + emscripten*) +@@ -35139,7 +35144,7 @@ else $as_nop + else + search_libsubdirs="$multiarch_libsubdir $libsubdirs" + fi +- for _AX_BOOST_BASE_boost_path_tmp in /usr /usr/local /opt /opt/local /opt/homebrew ; do ++ for _AX_BOOST_BASE_boost_path_tmp in /usr %%LOCALBASE%% /opt /opt/local /opt/homebrew ; do + if test -d "$_AX_BOOST_BASE_boost_path_tmp/include/boost" && test -r "$_AX_BOOST_BASE_boost_path_tmp/include/boost" ; then + for libsubdir in $search_libsubdirs ; do + if ls "$_AX_BOOST_BASE_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi +@@ -35241,7 +35246,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi + else + if test "x$cross_compiling" != "xyes" ; then +- for _AX_BOOST_BASE_boost_path in /usr /usr/local /opt /opt/local /opt/homebrew ; do ++ for _AX_BOOST_BASE_boost_path in /usr %%LOCALBASE%% /opt /opt/local /opt/homebrew ; do + if test -d "$_AX_BOOST_BASE_boost_path" && test -r "$_AX_BOOST_BASE_boost_path" ; then + for i in `ls -d $_AX_BOOST_BASE_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$_AX_BOOST_BASE_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` +@@ -37460,7 +37465,7 @@ else $as_nop + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-as_dummy="$PATH:/usr/sbin:/sbin:/usr/local/sbin" ++as_dummy="$PATH:/usr/sbin:/sbin:%%LOCALBASE%%/sbin" + for as_dir in $as_dummy + do + IFS=$as_save_IFS +@@ -37509,7 +37514,7 @@ else $as_nop + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-as_dummy="$PATH:/usr/sbin:/sbin:/usr/local/sbin" ++as_dummy="$PATH:/usr/sbin:/sbin:%%LOCALBASE%%/sbin" + for as_dir in $as_dummy + do + IFS=$as_save_IFS +@@ -38681,7 +38686,7 @@ ac_x_header_dirs=' + /usr/XFree86/include/X11 + + /usr/include +-/usr/local/include ++%%LOCALBASE%%/include + /usr/unsupported/include + /usr/athena/include + /usr/local/x11r5/include +@@ -40938,7 +40943,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu save_CXXFLAGS=$CXXFLAGS save_IFS=$IFS IFS=$P_SEP - for i in $CPLUS_INCLUDE_PATH /usr/include; do -+ for i in $CPLUS_INCLUDE_PATH /usr/local/include /usr/include; do ++ for i in $CPLUS_INCLUDE_PATH %%LOCALBASE%%/include /usr/include; do IFS=$save_IFS if test -z "$i"; then continue -@@ -44422,7 +44427,7 @@ printf "%s\n" "no (oss-fuzz)" >&6; } +@@ -46110,7 +46115,7 @@ printf "%s\n" "no (oss-fuzz)" >&6; } elif test "$enable_fuzzers" = "yes"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (oss-fuzz)" >&5 printf "%s\n" "no (oss-fuzz)" >&6; } @@ -30,21 +102,39 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which gpgmepp to use" >&5 -@@ -44436,7 +44441,7 @@ then : +@@ -46124,7 +46129,7 @@ then : ac_fn_c_check_header_compile "$LINENO" "gpgme++/gpgmepp_version.h" "ac_cv_header_gpgmepp_gpgmepp_version_h" "$ac_includes_default" if test "x$ac_cv_header_gpgmepp_gpgmepp_version_h" = xyes then : - GPGMEPP_CFLAGS=-I/usr/include/gpgme++ -+ GPGMEPP_CFLAGS=-I/usr/local/include/gpgme++ ++ GPGMEPP_CFLAGS=-I%%LOCALBASE%%/include/gpgme++ else $as_nop as_fn_error $? "gpgmepp headers not found, install gpgmepp >= 1.14 development package" "$LINENO" 5 fi -@@ -48095,7 +48100,7 @@ if test -z "$SHA256SUM"; then +@@ -49689,7 +49694,7 @@ CURL=`command -v curl` + + CURL=`command -v curl` + +-for i in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/wget /opt/local/bin/wget; do ++for i in wget /usr/bin/wget %%LOCALBASE%%/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/wget /opt/local/bin/wget; do + # wget new enough? + $i --help 2> /dev/null | $GREP no-use-server-timestamps 2>&1 > /dev/null + if test $? -eq 0; then +@@ -49712,7 +49717,7 @@ SHA256SUM= + # + SHA256SUM= + +-for i in shasum /usr/local/bin/shasum /usr/sfw/bin/shasum /opt/sfw/bin/shasum /opt/local/bin/shasum; do ++for i in shasum %%LOCALBASE%%/bin/shasum /usr/sfw/bin/shasum /opt/sfw/bin/shasum /opt/local/bin/shasum; do + eval "$i -a 256 --version" > /dev/null 2>&1 + ret=$? + if test $ret -eq 0; then +@@ -49722,7 +49727,7 @@ if test -z "$SHA256SUM"; then done if test -z "$SHA256SUM"; then - for i in sha256sum /usr/local/bin/sha256sum /usr/sfw/bin/sha256sum /opt/sfw/bin/sha256sum /opt/local/bin/sha256sum; do -+ for i in gsha256sum /usr/local/bin/sha256sum /usr/sfw/bin/sha256sum /opt/sfw/bin/sha256sum /opt/local/bin/sha256sum; do ++ for i in gsha256sum %%LOCALBASE%%/bin/sha256sum /usr/sfw/bin/sha256sum /opt/sfw/bin/sha256sum /opt/local/bin/sha256sum; do eval "$i --version" > /dev/null 2>&1 ret=$? if test $ret -eq 0; then diff --git a/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk b/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk index 5ef39cb9bef4..07039ca14ffa 100644 --- a/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk +++ b/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk @@ -1,11 +1,10 @@ ---- external/skia/UnpackedTarball_skia.mk.orig 2024-11-22 20:05:31 UTC +--- external/skia/UnpackedTarball_skia.mk.orig 2025-05-10 18:09:26 UTC +++ external/skia/UnpackedTarball_skia.mk -@@ -41,6 +41,8 @@ skia_patches := \ - help-msvc-analyzer.patch \ - always_inline_and_multiversioning_conflict.patch.1 \ - windows-define-conflict.patch.1 \ +@@ -43,6 +43,7 @@ skia_patches := \ + 0002-loong64-Honor-existing-LASX-LSX-settings.patch \ + 0003-loong64-Fix-missing-rounding-in-loong64-scaled_mult-.patch \ + 0004-loong64-Fix-the-remaining-implicit-vector-casts.patch \ + freebsd-limits.h.patch.0 \ -+ powerpc64le-skia.patch.0 \ - - $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) + ifneq ($(MSYSTEM),) + # use binary flag so patch from git-bash won't choke on mixed line-endings in patches diff --git a/editors/libreoffice/files/powerpc64le-skia.patch.0 b/editors/libreoffice/files/powerpc64le-skia.patch.0 deleted file mode 100644 index 4b093080be4e..000000000000 --- a/editors/libreoffice/files/powerpc64le-skia.patch.0 +++ /dev/null @@ -1,21 +0,0 @@ ---- modules/skcms/src/skcms_internals.h.orig -+++ modules/skcms/src/skcms_internals.h -@@ -48,6 +48,7 @@ extern "C" { - && !defined(__arm__) \ - && !defined(__riscv) \ - && !defined(__loongarch__) \ -+ && !defined(__powerpc__) \ - && !defined(_WIN32) && !defined(__SYMBIAN32__) - #define SKCMS_HAS_MUSTTAIL 1 - #endif ---- src/core/SkRasterPipeline.h.orig 2024-10-10 12:39:49 UTC -+++ src/core/SkRasterPipeline.h -@@ -26,7 +26,7 @@ struct skcms_TransferFunction; - struct SkImageInfo; - struct skcms_TransferFunction; - --#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) && !defined(SK_CPU_ARM32) && \ -+#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) && !defined(SK_CPU_ARM32) && !defined(__powerpc__) && \ - !defined(SK_CPU_LOONGARCH) && !(defined(_WIN32) && defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)) - // [[clang::musttail]] is disabled for the Android version of Skia running on Windows as it - // causes crashes (This is probably related to http://crbug.com/1505442). |