From 61300105b299bca47b245dcd07c3faa4496e8b45 Mon Sep 17 00:00:00 2001 From: robert Date: Mon, 21 Apr 2025 12:16:42 +0000 Subject: [PATCH] update to 25.2.2.2 --- editors/libreoffice/Makefile | 4 ++-- editors/libreoffice/distinfo | 20 +++++++++---------- editors/libreoffice/patches/patch-configure | 18 ++++++++--------- ...ry_schema_org_openoffice_Office_Common_xcs | 2 +- editors/libreoffice/pkg/PLIST-main | 3 ++- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 4631044a6c4..5121b2b3727 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -23,7 +23,7 @@ SHARED_LIBS += wpg-0.3-lo 3.4 # 3.4 SHARED_LIBS += wps-0.4-lo 4.14 # 4.14 BV= 25.2 -VERSION= ${BV}.1.2 +VERSION= ${BV}.2.2 DISTNAME= libreoffice-${VERSION} WRKDIST= ${WRKDIR}/libreoffice-${VERSION} CATEGORIES= editors productivity @@ -107,7 +107,7 @@ DISTFILES.a += eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip DISTFILES.a += f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf DISTFILES.a += f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip DISTFILES.a += frozen-1.2.0.tar.gz -DISTFILES.a += language-subtag-registry-2025-02-06.tar.bz2 +DISTFILES.a += language-subtag-registry-2025-03-10.tar.bz2 DISTFILES.a += libabw-0.1.3.tar.xz DISTFILES.a += libcdr-0.1.8.tar.xz DISTFILES.a += libcmis-0.6.2.tar.xz diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo index 70a59aa88f6..a550727da1b 100644 --- a/editors/libreoffice/distinfo +++ b/editors/libreoffice/distinfo @@ -48,7 +48,7 @@ SHA256 (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = dcgDWc SHA256 (libreoffice/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 9UPm4tcnVVeoOaFklBwKhuXyw/KgBCv8Q0yIxt3p4UA= SHA256 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = BWQKH2gFsrLX4sucUNuaXLCE48Uqsacc4BUjm0odQ0M= SHA256 (libreoffice/frozen-1.2.0.tar.gz) = 7YM5wBfXxf4BmsLGQkd/Q1J48NxkPB1p0/Ox6VkV6CM= -SHA256 (libreoffice/language-subtag-registry-2025-02-06.tar.bz2) = 5f/8vWQOdD+ptpkIfWPM+KtbUu7VIdpo+MiU81CFZmI= +SHA256 (libreoffice/language-subtag-registry-2025-03-10.tar.bz2) = VVlo3UE8af4sByop4PGipIhWUz2SP/2Dd/+G9upwGzk= SHA256 (libreoffice/libabw-0.1.3.tar.xz) = 52Op3CHD0mZ0AtZuIC4/jvTbUbNLee9B9WysuG3Nbu0= SHA256 (libreoffice/libcdr-0.1.8.tar.xz) = ztZ3yDALKckdMAS7Hd3wuZdhv1VEmRwmwu6PQn6HGTw= SHA256 (libreoffice/libcmis-0.6.2.tar.xz) = G1wtclj/k+tfmVj/Dk39czLcdaBxu3F93iIXomYCpkQ= @@ -68,10 +68,10 @@ SHA256 (libreoffice/liborcus-0.19.2.tar.xz) = ae0moA1KqnaI5ipuADy8gZKFIaRelmBeUz SHA256 (libreoffice/libpagemaker-0.0.4.tar.xz) = Zq2s1wWn0ZiV4I6sRtHoUTMq3y5zbFZr7xFk56RCUZ0= SHA256 (libreoffice/libqxp-0.0.2.tar.xz) = 4Te2sRASClLJjt0C69xAle4I0NUpWpQxapgXUAlalFw= SHA256 (libreoffice/libre-hebrew-1.0.tar.gz) = 9ZYlfB23Bs41eVsY1/ZqTbmdQncl8g6ThJFLU0FCV5o= -SHA256 (libreoffice/libreoffice-25.2.1.2.tar.xz) = gAGuJHfFBMVYGU6jHBWa+nF0eB+m7HLO7n3y/C/Vt10= -SHA256 (libreoffice/libreoffice-dictionaries-25.2.1.2.tar.xz) = EOzzoCvtjvcsFnVSxl0j5IQYHGtlfWaMR9yeLHNeU3U= -SHA256 (libreoffice/libreoffice-help-25.2.1.2.tar.xz) = rnEPEd5qTD65xaMcQBoYr+2jnW8d+0rFlNr2jyJc0GQ= -SHA256 (libreoffice/libreoffice-translations-25.2.1.2.tar.xz) = ib3AylUm9eW85kSROc/E/UoUFWSWUndq7pHLtkUQzEs= +SHA256 (libreoffice/libreoffice-25.2.2.2.tar.xz) = AaFFgMFaWxQVP6RsKOkDB/ZoPg0DJnJ6StE+lUXf5qw= +SHA256 (libreoffice/libreoffice-dictionaries-25.2.2.2.tar.xz) = GEYPCuEUCy+u2OUT6D55b7hlcPWrinJ2ecywwe2feDg= +SHA256 (libreoffice/libreoffice-help-25.2.2.2.tar.xz) = WnyfzEOvrWdMOIP5DEb15P3nKIAaDRnjflGL3EiKX54= +SHA256 (libreoffice/libreoffice-translations-25.2.2.2.tar.xz) = p0sFhzd4pHlhwvxE+FswCrggybMz4b6SHKbLrG/vVDA= SHA256 (libreoffice/libstaroffice-0.0.7.tar.xz) = +U+wrYIW+XEnvt7xY6RYhrQ8Yt6sXlsPXmKOI0IgyNs= SHA256 (libreoffice/libvisio-0.1.8.tar.xz) = tAmP+/TcuecSE/oKzdvZKPJ77TDbLYAjSBOxXVPQQFs= SHA256 (libreoffice/libwpg-0.3.4.tar.xz) = tV/alEDR4HBjDrJIfYuGl89BLCFKJ8runfac7HwATeM= @@ -136,7 +136,7 @@ SIZE (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 427800 SIZE (libreoffice/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 207992 SIZE (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919 SIZE (libreoffice/frozen-1.2.0.tar.gz) = 187169 -SIZE (libreoffice/language-subtag-registry-2025-02-06.tar.bz2) = 78840 +SIZE (libreoffice/language-subtag-registry-2025-03-10.tar.bz2) = 79067 SIZE (libreoffice/libabw-0.1.3.tar.xz) = 318808 SIZE (libreoffice/libcdr-0.1.8.tar.xz) = 625836 SIZE (libreoffice/libcmis-0.6.2.tar.xz) = 488736 @@ -156,10 +156,10 @@ SIZE (libreoffice/liborcus-0.19.2.tar.xz) = 2211268 SIZE (libreoffice/libpagemaker-0.0.4.tar.xz) = 306496 SIZE (libreoffice/libqxp-0.0.2.tar.xz) = 341760 SIZE (libreoffice/libre-hebrew-1.0.tar.gz) = 531276 -SIZE (libreoffice/libreoffice-25.2.1.2.tar.xz) = 281777028 -SIZE (libreoffice/libreoffice-dictionaries-25.2.1.2.tar.xz) = 58033240 -SIZE (libreoffice/libreoffice-help-25.2.1.2.tar.xz) = 60010044 -SIZE (libreoffice/libreoffice-translations-25.2.1.2.tar.xz) = 228677276 +SIZE (libreoffice/libreoffice-25.2.2.2.tar.xz) = 281524108 +SIZE (libreoffice/libreoffice-dictionaries-25.2.2.2.tar.xz) = 58290492 +SIZE (libreoffice/libreoffice-help-25.2.2.2.tar.xz) = 60056352 +SIZE (libreoffice/libreoffice-translations-25.2.2.2.tar.xz) = 229291508 SIZE (libreoffice/libstaroffice-0.0.7.tar.xz) = 707920 SIZE (libreoffice/libvisio-0.1.8.tar.xz) = 1686344 SIZE (libreoffice/libwpg-0.3.4.tar.xz) = 340428 diff --git a/editors/libreoffice/patches/patch-configure b/editors/libreoffice/patches/patch-configure index 50e56542feb..04d4a8f946e 100644 --- a/editors/libreoffice/patches/patch-configure +++ b/editors/libreoffice/patches/patch-configure @@ -42,7 +42,7 @@ Index: configure test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros -@@ -30596,7 +30601,7 @@ then : +@@ -30610,7 +30615,7 @@ then : printf %s "(cached) " >&6 else $as_nop @@ -51,7 +51,7 @@ Index: configure test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros -@@ -31045,7 +31050,7 @@ then : +@@ -31073,7 +31078,7 @@ then : printf %s "(cached) " >&6 else $as_nop @@ -60,7 +60,7 @@ Index: configure test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros -@@ -39963,7 +39968,7 @@ printf "%s\n" "internal" >&6; } +@@ -40005,7 +40010,7 @@ printf "%s\n" "internal" >&6; } if test "$COM" = "MSC"; then HYPHEN_LIB='$(gb_StaticLibrary_WORKDIR)/hyphen.lib' else @@ -69,7 +69,7 @@ Index: configure fi fi -@@ -40166,7 +40171,7 @@ printf "%s\n" "internal" >&6; } +@@ -40208,7 +40213,7 @@ printf "%s\n" "internal" >&6; } if test "$COM" = "MSC"; then MYTHES_LIBS='$(gb_StaticLibrary_WORKDIR)/mythes.lib' else @@ -78,7 +78,7 @@ Index: configure fi fi -@@ -41014,7 +41019,7 @@ else +@@ -41056,7 +41061,7 @@ else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the flex version" >&5 printf %s "checking the flex version... " >&6; } _flex_version=$($FLEX --version | $SED -e 's/^.*\([[:digit:]]\{1,\}\.[[:digit:]]\{1,\}\.[[:digit:]]\{1,\}\).*$/\1/') @@ -87,7 +87,7 @@ Index: configure as_fn_error $? "failed ($FLEX $_flex_version found, but need at least 2.6.0)" "$LINENO" 5 fi fi -@@ -45252,7 +45257,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -45294,7 +45299,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu printf %s "checking for Qt5 libraries... " >&6; } qt5_libdir="no" for lib_dir in $qt5_libdirs; do @@ -96,7 +96,7 @@ Index: configure qt5_libdir="$lib_dir" break fi -@@ -45985,7 +45990,7 @@ printf "%s\n" "$kf5_incdir" >&6; } +@@ -46027,7 +46032,7 @@ printf "%s\n" "$kf5_incdir" >&6; } printf %s "checking for KF5 libraries... " >&6; } kf5_libdir="no" for kf5_check in $kf5_libdirs; do @@ -105,7 +105,7 @@ Index: configure kf5_libdir="$kf5_check" break fi -@@ -46653,16 +46658,7 @@ if test "$USING_X11" = TRUE; then +@@ -46695,16 +46700,7 @@ if test "$USING_X11" = TRUE; then else XINERAMALIB="$x_libraries" fi @@ -123,7 +123,7 @@ Index: configure # we have only the dynamic version USE_XINERAMA=TRUE XINERAMA_LINK=dynamic -@@ -48125,7 +48121,7 @@ for i in shasum /usr/local/bin/shasum /usr/sfw/bin/sha +@@ -48167,7 +48163,7 @@ for i in shasum /usr/local/bin/shasum /usr/sfw/bin/sha done if test -z "$SHA256SUM"; then diff --git a/editors/libreoffice/patches/patch-officecfg_registry_schema_org_openoffice_Office_Common_xcs b/editors/libreoffice/patches/patch-officecfg_registry_schema_org_openoffice_Office_Common_xcs index 0469ec51369..a2ce48f0f23 100644 --- a/editors/libreoffice/patches/patch-officecfg_registry_schema_org_openoffice_Office_Common_xcs +++ b/editors/libreoffice/patches/patch-officecfg_registry_schema_org_openoffice_Office_Common_xcs @@ -3,7 +3,7 @@ disble tip-of-the-day dialog by default Index: officecfg/registry/schema/org/openoffice/Office/Common.xcs --- officecfg/registry/schema/org/openoffice/Office/Common.xcs.orig +++ officecfg/registry/schema/org/openoffice/Office/Common.xcs -@@ -5354,7 +5354,7 @@ +@@ -5364,7 +5364,7 @@ Determines whether the Tip-of-the-Day dialog is shown on startup. diff --git a/editors/libreoffice/pkg/PLIST-main b/editors/libreoffice/pkg/PLIST-main index 608ecea04c5..889724bcbf6 100644 --- a/editors/libreoffice/pkg/PLIST-main +++ b/editors/libreoffice/pkg/PLIST-main @@ -10940,7 +10940,8 @@ lib/libreoffice/share/extensions/dict-en/pythonpath/lightproof_impl_en.py lib/libreoffice/share/extensions/dict-en/pythonpath/lightproof_opts_en.py lib/libreoffice/share/extensions/dict-en/th_en_US_v2.dat lib/libreoffice/share/extensions/dict-en/th_en_US_v2.idx -lib/libreoffice/share/extensions/dict-es/RLA-ES.png +lib/libreoffice/share/extensions/dict-es/images/ +lib/libreoffice/share/extensions/dict-es/images/RLA-ES.png lib/libreoffice/share/extensions/dict-fa/ lib/libreoffice/share/extensions/dict-fa/LICENSE lib/libreoffice/share/extensions/dict-fa/META-INF/