openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

update to 25.8.3.2

Browse Source
This commit is contained in:
robert
2025-11-13 16:33:23 +00:00
parent e85baca213
commit 18b978a579
6 changed files with 35 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editors/libreoffice/Makefile
+7 -9
View File
@@ -7,8 +7,8 @@ COMMENT-main= multi-platform productivity suite
COMMENT-kde= optional integration of LibreOffice to the KDE environment
COMMENT-java= optional integration of LibreOffice java features
SHARED_LIBS += etonyek-0.1-lo 1.12 # 1.12
SHARED_LIBS += langtag-lo 5.1 # 5.1
SHARED_LIBS += etonyek-0.1-lo 1.13 # 1.13
SHARED_LIBS += langtag-lo 5.2 # 5.2
SHARED_LIBS += mwaw-0.3-lo 3.22 # 3.22
SHARED_LIBS += odfgen-0.1-lo 1.8 # 1.8
SHARED_LIBS += orcus-0.20 0.0 # 0.0
@@ -23,15 +23,13 @@ SHARED_LIBS += wpg-0.3-lo 3.4 # 3.4
SHARED_LIBS += wps-0.4-lo 4.14 # 4.14
BV= 25.8
VERSION= ${BV}.2.2
VERSION= ${BV}.3.2
DISTNAME= libreoffice-${VERSION}
WRKDIST= ${WRKDIR}/libreoffice-${VERSION}
CATEGORIES= editors productivity
DPB_PROPERTIES= parallel
EPOCH= 0
REVISION-main= 0
REVISION-kde= 0
MAINTAINER= Robert Nagy <robert@openbsd.org>
@@ -117,10 +115,10 @@ DISTFILES.a += libe-book-0.1.3.tar.xz
DISTFILES.a += libepubgen-0.1.1.tar.xz
DISTFILES.a += liberation-fonts-ttf-2.1.5.tar.gz
DISTFILES.a += liberation-narrow-fonts-ttf-1.07.6.tar.gz
DISTFILES.a += libetonyek-0.1.12.tar.xz
DISTFILES.a += libetonyek-0.1.13.tar.xz
DISTFILES.a += libexttextcat-3.4.7.tar.xz
DISTFILES.a += libfreehand-0.1.2.tar.xz
DISTFILES.a += liblangtag-0.6.7.tar.bz2
DISTFILES.a += liblangtag-0.6.8.tar.bz2
DISTFILES.a += libmspub-0.1.4.tar.xz
DISTFILES.a += libmwaw-0.3.22.tar.xz
DISTFILES.a += libnumbertext-1.0.11.tar.xz
@@ -130,7 +128,7 @@ DISTFILES.a += libpagemaker-0.0.4.tar.xz
DISTFILES.a += libqxp-0.0.2.tar.xz
DISTFILES.a += libre-hebrew-1.0.tar.gz
DISTFILES.a += libstaroffice-0.0.7.tar.xz
DISTFILES.a += libvisio-0.1.8.tar.xz
DISTFILES.a += libvisio-0.1.10.tar.xz
DISTFILES.a += libwpg-0.3.4.tar.xz
DISTFILES.a += libwps-0.4.14.tar.xz
DISTFILES.a += libzmf-0.0.2.tar.xz
@@ -140,7 +138,7 @@ DISTFILES.a += noto-fonts-20171024.tar.gz
DISTFILES.a += pdfium-7012.tar.bz2
DISTFILES.a += phc-winner-argon2-20190702.tar.gz
DISTFILES.a += skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz
DISTFILES.a += xmlsec1-1.3.7.tar.gz
DISTFILES.a += xmlsec1-1.3.8.tar.gz
DISTFILES.a += zxcvbn-c-2.6.tar.gz
DISTFILES.a += zxing-cpp-2.3.0.tar.gz
editors/libreoffice/distinfo
+16 -16
View File
@@ -56,10 +56,10 @@ SHA256 (libreoffice/libe-book-0.1.3.tar.xz) = fo2P808ngxrKO8b5zFMsL5DSBXx3iWO4hP
SHA256 (libreoffice/libepubgen-0.1.1.tar.xz) = A+CEuZTL7/yMPdEzA7LLgF9E2PLDt592kNfj/H9iFa0=
SHA256 (libreoffice/liberation-fonts-ttf-2.1.5.tar.gz) = cZHGab84iZ9zoglO0A97gAVTNk+Q4mNwEKacDiaPJdA=
SHA256 (libreoffice/liberation-narrow-fonts-ttf-1.07.6.tar.gz) = iHnYm1/3tQbJ/CjvwxpcC5VLvpMz5m5Sg9J9IKhRnqM=
SHA256 (libreoffice/libetonyek-0.1.12.tar.xz) = ufqC++uMt6cBEBBg5PPh5O98OPV0soWdPsvkNgTCH4M=
SHA256 (libreoffice/libetonyek-0.1.13.tar.xz) = Aytxy1l+3ZKgsnC5FhiCgbw1vlUpayY/aBeymtvLFwk=
SHA256 (libreoffice/libexttextcat-3.4.7.tar.xz) = 3wpZ1BOlsgJXPY1PUVnjOoU42k+OjmCXn6zGTWKQzr0=
SHA256 (libreoffice/libfreehand-0.1.2.tar.xz) = DkItFWSm2/IqmvWYU1QlJx5YNRTA97p9kJFnZCDeNKw=
SHA256 (libreoffice/liblangtag-0.6.7.tar.bz2) = Xta81K4/PAXJEuYvIWzRpEEjhGFH9ymkn7VmjaUeAw4=
SHA256 (libreoffice/liblangtag-0.6.8.tar.bz2) = qWl1t53dj+9tkpXAg/4/GvoaiJilcjXUBpJVreROXPI=
SHA256 (libreoffice/libmspub-0.1.4.tar.xz) = 7zbBoaq7K6Owvtqq/nF79EgL4rqN5vOJS+X9NwKwE7o=
SHA256 (libreoffice/libmwaw-0.3.22.tar.xz) = oaOf/Oo/8qenquDCOHfd9JGLVUv4Kw3l186Of2HqjjI=
SHA256 (libreoffice/libnumbertext-1.0.11.tar.xz) = XctNs7I0D4H2Ac6G2NdraeNNcPhPgEGSyQHkt/hNX7A=
@@ -68,12 +68,12 @@ SHA256 (libreoffice/liborcus-0.20.1.tar.xz) = 7CfzDoRFoqPzB/foKfxEb9SBkxULf48ju1
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.8.2.2.tar.xz) = ACyi7sPfgY02VbxatXAiYxlP68AhLwLhLfHu4RvXwV4=
SHA256 (libreoffice/libreoffice-dictionaries-25.8.2.2.tar.xz) = H8Z9QQxIyCFVYtn9hNJ7HKtnsfslAqRX5vu9kcMphRY=
SHA256 (libreoffice/libreoffice-help-25.8.2.2.tar.xz) = u5/eLANcdXWB9JVFzL+wRvwx9ylotTso0Jh/HFVH618=
SHA256 (libreoffice/libreoffice-translations-25.8.2.2.tar.xz) = +wEYj9cli02jZ4JhjXkOQHN2kJfAWX4QPrgUlj4nKDA=
SHA256 (libreoffice/libreoffice-25.8.3.2.tar.xz) = 6TltdqJHHV2jzNPlxqepuDJF84wsR8KadiGfYhSRSII=
SHA256 (libreoffice/libreoffice-dictionaries-25.8.3.2.tar.xz) = 3jD9EORE+8DNsBmlYO5wwa8lw5NYnG6yasGh595GNtU=
SHA256 (libreoffice/libreoffice-help-25.8.3.2.tar.xz) = 1vP0s1J0U7CvrzpWYWOkAbTkLjS6BtNUk76WN8TIvX0=
SHA256 (libreoffice/libreoffice-translations-25.8.3.2.tar.xz) = HHCw3Pnw2KutV0L7u7vzE7Q1MIIddubt7/0krJ3ErZ0=
SHA256 (libreoffice/libstaroffice-0.0.7.tar.xz) = +U+wrYIW+XEnvt7xY6RYhrQ8Yt6sXlsPXmKOI0IgyNs=
SHA256 (libreoffice/libvisio-0.1.8.tar.xz) = tAmP+/TcuecSE/oKzdvZKPJ77TDbLYAjSBOxXVPQQFs=
SHA256 (libreoffice/libvisio-0.1.10.tar.xz) = np7/dREtTZLZImKtf8JZnCHib4/FulSQDv3IPAUB5HI=
SHA256 (libreoffice/libwpg-0.3.4.tar.xz) = tV/alEDR4HBjDrJIfYuGl89BLCFKJ8runfac7HwATeM=
SHA256 (libreoffice/libwps-0.4.14.tar.xz) = NluWjicOhahGnGsWCqavVhmk5smV27BMHswbTdE+gN4=
SHA256 (libreoffice/libzmf-0.0.2.tar.xz) = JwUaMMsFf9tdXeZaHxZccVPcduJ/5iJRy7hmOessryI=
@@ -83,7 +83,7 @@ SHA256 (libreoffice/noto-fonts-20171024.tar.gz) = KazBWkxNa1EgG6XWDzA9+8LlrL/bcE
SHA256 (libreoffice/pdfium-7012.tar.bz2) = 5kfKT8wskdncpxdFLhsb4athVaxJd9ynFgQWUsexC90=
SHA256 (libreoffice/phc-winner-argon2-20190702.tar.gz) = 2vlyqJV3+HcmAr8us4tqPdPZIr9XJNRef5WJtegwRCw=
SHA256 (libreoffice/skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz) = I4T19EoLcU2Nx4kj/fF0U6taGAjKY4FU4+J7NhUx2yU=
SHA256 (libreoffice/xmlsec1-1.3.7.tar.gz) = 2C6TtpuKogWmFrYpF6JpMiv2Oj6q+zd1AU5hdSsgE+o=
SHA256 (libreoffice/xmlsec1-1.3.8.tar.gz) = 0BgJFq5xvihBWm+pGaBoRDPsnsO6HMCGaRCwLl4T9b0=
SHA256 (libreoffice/zxcvbn-c-2.6.tar.gz) = EeOfZ3b5yCxosqy5QzbjJpfUq2zbSsFvlYPMvdc1ETo=
SHA256 (libreoffice/zxing-cpp-2.3.0.tar.gz) = ZOQTkQP9vFd1JpjuFbXwsPevmgMx7L3EkgR+B3LEF7o=
SIZE (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 811606
@@ -144,10 +144,10 @@ SIZE (libreoffice/libe-book-0.1.3.tar.xz) = 416268
SIZE (libreoffice/libepubgen-0.1.1.tar.xz) = 324380
SIZE (libreoffice/liberation-fonts-ttf-2.1.5.tar.gz) = 2385008
SIZE (libreoffice/liberation-narrow-fonts-ttf-1.07.6.tar.gz) = 300832
SIZE (libreoffice/libetonyek-0.1.12.tar.xz) = 1513688
SIZE (libreoffice/libetonyek-0.1.13.tar.xz) = 1514256
SIZE (libreoffice/libexttextcat-3.4.7.tar.xz) = 1122804
SIZE (libreoffice/libfreehand-0.1.2.tar.xz) = 516132
SIZE (libreoffice/liblangtag-0.6.7.tar.bz2) = 757041
SIZE (libreoffice/liblangtag-0.6.8.tar.bz2) = 768482
SIZE (libreoffice/libmspub-0.1.4.tar.xz) = 377472
SIZE (libreoffice/libmwaw-0.3.22.tar.xz) = 1476620
SIZE (libreoffice/libnumbertext-1.0.11.tar.xz) = 302676
@@ -156,12 +156,12 @@ SIZE (libreoffice/liborcus-0.20.1.tar.xz) = 2246732
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.8.2.2.tar.xz) = 286175060
SIZE (libreoffice/libreoffice-dictionaries-25.8.2.2.tar.xz) = 61975212
SIZE (libreoffice/libreoffice-help-25.8.2.2.tar.xz) = 60167812
SIZE (libreoffice/libreoffice-translations-25.8.2.2.tar.xz) = 230464936
SIZE (libreoffice/libreoffice-25.8.3.2.tar.xz) = 286480740
SIZE (libreoffice/libreoffice-dictionaries-25.8.3.2.tar.xz) = 61978416
SIZE (libreoffice/libreoffice-help-25.8.3.2.tar.xz) = 60168492
SIZE (libreoffice/libreoffice-translations-25.8.3.2.tar.xz) = 231029728
SIZE (libreoffice/libstaroffice-0.0.7.tar.xz) = 707920
SIZE (libreoffice/libvisio-0.1.8.tar.xz) = 1686344
SIZE (libreoffice/libvisio-0.1.10.tar.xz) = 2041876
SIZE (libreoffice/libwpg-0.3.4.tar.xz) = 340428
SIZE (libreoffice/libwps-0.4.14.tar.xz) = 719016
SIZE (libreoffice/libzmf-0.0.2.tar.xz) = 320952
@@ -171,6 +171,6 @@ SIZE (libreoffice/noto-fonts-20171024.tar.gz) = 6646182
SIZE (libreoffice/pdfium-7012.tar.bz2) = 11270991
SIZE (libreoffice/phc-winner-argon2-20190702.tar.gz) = 1505307
SIZE (libreoffice/skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz) = 14601640
SIZE (libreoffice/xmlsec1-1.3.7.tar.gz) = 2468083
SIZE (libreoffice/xmlsec1-1.3.8.tar.gz) = 2476028
SIZE (libreoffice/zxcvbn-c-2.6.tar.gz) = 1405136
SIZE (libreoffice/zxing-cpp-2.3.0.tar.gz) = 1008541
editors/libreoffice/patches/patch-basic_source_classes_sbxmod_cxx
+1 -1
View File
@@ -1,7 +1,7 @@
Index: basic/source/classes/sbxmod.cxx
--- basic/source/classes/sbxmod.cxx.orig
+++ basic/source/classes/sbxmod.cxx
@@ -1133,7 +1133,7 @@ void SbModule::Run( SbMethod* pMeth )
@@ -1137,7 +1137,7 @@ void SbModule::Run( SbMethod* pMeth )
struct rlimit rl;
getrlimit ( RLIMIT_STACK, &rl );
#endif
editors/libreoffice/patches/patch-configure
+9 -9
View File
@@ -44,7 +44,7 @@ Index: configure
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -30642,7 +30647,7 @@ then :
@@ -30628,7 +30633,7 @@ then :
printf %s "(cached) " >&6
else $as_nop
@@ -53,7 +53,7 @@ Index: configure
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -31099,7 +31104,7 @@ then :
@@ -31071,7 +31076,7 @@ then :
printf %s "(cached) " >&6
else $as_nop
@@ -62,7 +62,7 @@ Index: configure
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -41474,7 +41479,7 @@ printf "%s\n" "internal" >&6; }
@@ -41390,7 +41395,7 @@ printf "%s\n" "internal" >&6; }
if test "$COM" = "MSC"; then
HYPHEN_LIB='$(gb_StaticLibrary_WORKDIR)/hyphen.lib'
else
@@ -71,7 +71,7 @@ Index: configure
fi
fi
@@ -41677,7 +41682,7 @@ printf "%s\n" "internal" >&6; }
@@ -41593,7 +41598,7 @@ printf "%s\n" "internal" >&6; }
if test "$COM" = "MSC"; then
MYTHES_LIBS='$(gb_StaticLibrary_WORKDIR)/mythes.lib'
else
@@ -80,7 +80,7 @@ Index: configure
fi
fi
@@ -42728,7 +42733,7 @@ else
@@ -42644,7 +42649,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/')
@@ -89,7 +89,7 @@ Index: configure
as_fn_error $? "failed ($FLEX $_flex_version found, but need at least 2.6.0)" "$LINENO" 5
fi
fi
@@ -46970,7 +46975,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -46886,7 +46891,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
@@ -98,7 +98,7 @@ Index: configure
qt5_libdir="$lib_dir"
break
fi
@@ -47703,7 +47708,7 @@ printf "%s\n" "$kf5_incdir" >&6; }
@@ -47619,7 +47624,7 @@ printf "%s\n" "$kf5_incdir" >&6; }
printf %s "checking for KF5 libraries... " >&6; }
kf5_libdir="no"
for kf5_check in $kf5_libdirs; do
@@ -107,7 +107,7 @@ Index: configure
kf5_libdir="$kf5_check"
break
fi
@@ -48353,16 +48358,7 @@ if test "$USING_X11" = TRUE; then
@@ -48269,16 +48274,7 @@ if test "$USING_X11" = TRUE; then
else
XINERAMALIB="$x_libraries"
fi
@@ -125,7 +125,7 @@ Index: configure
# we have only the dynamic version
USE_XINERAMA=TRUE
XINERAMA_LINK=dynamic
@@ -49825,7 +49821,7 @@ for i in shasum /usr/local/bin/shasum /usr/sfw/bin/sha
@@ -49741,7 +49737,7 @@ for i in shasum /usr/local/bin/shasum /usr/sfw/bin/sha
done
if test -z "$SHA256SUM"; then
editors/libreoffice/patches/patch-external_liblangtag_ExternalPackage_liblangtag_mk
+2 -2
View File
@@ -5,8 +5,8 @@ Index: external/liblangtag/ExternalPackage_liblangtag.mk
ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag.1.dylib,liblangtag/.libs/liblangtag.1.dylib))
else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag-lo.so.1,liblangtag/.libs/liblangtag-lo.so.1.4.1))
+$(eval $(call gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag-lo.so.5.1,liblangtag/.libs/liblangtag-lo.so.5.1))
-$(eval $(call gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag-lo.so.1,liblangtag/.libs/liblangtag-lo.so.1.4.2))
+$(eval $(call gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag-lo.so.5.2,liblangtag/.libs/liblangtag-lo.so.5.2))
endif
# vim: set noet sw=4 ts=4:
editors/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_wrapper_gpl_cxx
-44
View File
@@ -1,44 +0,0 @@
Fix build with poppler-25.10.0.
From upstream commits ae83e577501c504f89b434606f05ff1d555729c9 and
89841fc69446a597b24b978344cd3c8d656aae09.
Index: sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
--- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx.orig
+++ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -203,6 +203,22 @@ int main(int argc, char **argv)
// PDFDoc takes over ownership for all strings below
GooString* pFileName = new GooString(myStringToStdString(argv[1]));
+#if POPPLER_CHECK_VERSION(22, 6, 0)
+ std::optional<GooString> ownerPasswordStr = {};
+ if (aPwBuf[0] != 0) {
+ ownerPasswordStr = std::make_optional<GooString>(aPwBuf);
+ } else if (ownerPassword) {
+ ownerPasswordStr = std::make_optional<GooString>(myStringToStdString(ownerPassword));
+ }
+ std::optional<GooString> userPasswordStr = {};
+ if (aPwBuf[0] != 0) {
+ userPasswordStr = std::make_optional<GooString>(aPwBuf);
+ } else if (userPassword) {
+ userPasswordStr = std::make_optional<GooString>(myStringToStdString(userPassword));
+ }
+ pDocUnique = std::make_unique<PDFDoc>(
+ std::unique_ptr<GooString>(pFileName), ownerPasswordStr, userPasswordStr);
+#else
// check for password string(s)
GooString* pOwnerPasswordStr(aPwBuf[0] != 0
? new GooString(aPwBuf)
@@ -214,12 +230,6 @@ int main(int argc, char **argv)
: (userPassword
? new GooString(myStringToStdString(userPassword))
: nullptr));
-#if POPPLER_CHECK_VERSION(22, 6, 0)
- pDocUnique = std::unique_ptr<PDFDoc>(
- new PDFDoc(std::make_unique<GooString>(pFileName),
- std::optional<GooString>(pOwnerPasswordStr),
- std::optional<GooString>(pUserPasswordStr)));
-#else
pDocUnique = std::unique_ptr<PDFDoc>(
new PDFDoc(pFileName, pOwnerPasswordStr, pUserPasswordStr));
#endif