diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index ae8ac61bbee..f48d3aedc67 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.260 2022/03/01 13:55:04 sthen Exp $ +# $OpenBSD: Makefile,v 1.261 2022/03/05 20:31:22 robert Exp $ USE_WXNEEDED= Yes @@ -26,7 +26,7 @@ SHARED_LIBS += wpg-0.3-lo 3.3 # 3.3 SHARED_LIBS += wps-0.4-lo 4.12 # 4.12 BV= 7.3 -VERSION= ${BV}.0.3 +VERSION= ${BV}.1.3 DISTNAME= libreoffice-${VERSION} WRKDIST= ${WRKDIR}/libreoffice-${VERSION} CATEGORIES= editors productivity @@ -34,10 +34,6 @@ DPB_PROPERTIES= parallel EPOCH= 0 -REVISION-main= 1 -REVISION-java= 1 -REVISION= 0 - MAINTAINER= Robert Nagy HOMEPAGE= http://www.libreoffice.org/ diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo index 34713f8f4e5..96a471afdc7 100644 --- a/editors/libreoffice/distinfo +++ b/editors/libreoffice/distinfo @@ -58,10 +58,10 @@ SHA256 (libreoffice/liborcus-0.17.2.tar.bz2) = KobEBaWSn3SbJ2N1CVlkIdRoBXUzZKsli 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-7.3.0.3.tar.xz) = mNNpyVQfDDKGNFuT9EjyzrLjRIZe4BvdWPO7J/CPPyU= -SHA256 (libreoffice/libreoffice-dictionaries-7.3.0.3.tar.xz) = 2LYWqo4J4tuthj4wbsJXm9CgY5MoQcZAO/27FtlEcAY= -SHA256 (libreoffice/libreoffice-help-7.3.0.3.tar.xz) = U7CRKRsahX6Y25MyOGMi/6FBCTK1MhX6juy3rNltkxs= -SHA256 (libreoffice/libreoffice-translations-7.3.0.3.tar.xz) = Q+nXaK8adCQkVXQWcKcL2fOh4B7EWZyt2xbgglYU5/4= +SHA256 (libreoffice/libreoffice-7.3.1.3.tar.xz) = a1f2giqFcai9mEtNwEj1GcIUPHaXFNvUkfYLjMcfUaI= +SHA256 (libreoffice/libreoffice-dictionaries-7.3.1.3.tar.xz) = SUNEK7o49Zy8152jamz5ZfLojcUkt3MdMO1YRz8oqhQ= +SHA256 (libreoffice/libreoffice-help-7.3.1.3.tar.xz) = NPtMP1unbe7+QJ0UwCeJmhAU/Y//8Fcji6N8HdF7qqo= +SHA256 (libreoffice/libreoffice-translations-7.3.1.3.tar.xz) = 6bS4zPibqSrQMauQnNHcJBmqg5SO179GlCFaJHU1Ek4= SHA256 (libreoffice/librevenge-0.0.4.tar.bz2) = xRYBzQgyC3VwKBLGSq4GU0CRZNp4Jf0PRRrCxdvnfL8= SHA256 (libreoffice/libstaroffice-0.0.7.tar.xz) = +U+wrYIW+XEnvt7xY6RYhrQ8Yt6sXlsPXmKOI0IgyNs= SHA256 (libreoffice/libvisio-0.1.7.tar.xz) = j6+N+HDLJ7CaeHoZWdbGRvqkTQ2KsVGIPfQItxZr6kw= @@ -137,10 +137,10 @@ SIZE (libreoffice/liborcus-0.17.2.tar.bz2) = 2123970 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-7.3.0.3.tar.xz) = 254873208 -SIZE (libreoffice/libreoffice-dictionaries-7.3.0.3.tar.xz) = 51302316 -SIZE (libreoffice/libreoffice-help-7.3.0.3.tar.xz) = 112208912 -SIZE (libreoffice/libreoffice-translations-7.3.0.3.tar.xz) = 195914764 +SIZE (libreoffice/libreoffice-7.3.1.3.tar.xz) = 255329180 +SIZE (libreoffice/libreoffice-dictionaries-7.3.1.3.tar.xz) = 51298232 +SIZE (libreoffice/libreoffice-help-7.3.1.3.tar.xz) = 112208156 +SIZE (libreoffice/libreoffice-translations-7.3.1.3.tar.xz) = 196069996 SIZE (libreoffice/librevenge-0.0.4.tar.bz2) = 529833 SIZE (libreoffice/libstaroffice-0.0.7.tar.xz) = 707920 SIZE (libreoffice/libvisio-0.1.7.tar.xz) = 854296 diff --git a/editors/libreoffice/patches/patch-configure b/editors/libreoffice/patches/patch-configure index 0dc2a22e5b6..12376ba4db7 100644 --- a/editors/libreoffice/patches/patch-configure +++ b/editors/libreoffice/patches/patch-configure @@ -1,10 +1,7 @@ -$OpenBSD: patch-configure,v 1.48 2022/02/20 08:58:54 robert Exp $ - - Index: configure --- configure.orig +++ configure -@@ -6904,9 +6904,13 @@ aix*) +@@ -6905,9 +6905,13 @@ aix*) openbsd*) using_freetype_fontconfig=yes @@ -18,7 +15,7 @@ Index: configure _os=OpenBSD ;; -@@ -21458,9 +21462,6 @@ _ACEOF +@@ -21464,9 +21468,6 @@ _ACEOF rm -fr libconftest* { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gccvisinlineshiddenok" >&5 printf "%s\n" "$gccvisinlineshiddenok" >&6; } @@ -28,7 +25,7 @@ Index: configure fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CXX_BASE has a visibility bug with class-level attributes (GCC bug 26905)" >&5 -@@ -27638,7 +27639,7 @@ then : +@@ -27661,7 +27662,7 @@ then : printf %s "(cached) " >&6 else $as_nop @@ -37,7 +34,7 @@ Index: configure test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros -@@ -27958,7 +27959,7 @@ then : +@@ -27981,7 +27982,7 @@ then : printf %s "(cached) " >&6 else $as_nop @@ -46,7 +43,7 @@ Index: configure test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros -@@ -28284,7 +28285,7 @@ then : +@@ -28307,7 +28308,7 @@ then : printf %s "(cached) " >&6 else $as_nop @@ -55,7 +52,7 @@ Index: configure test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros -@@ -36557,7 +36558,7 @@ printf "%s\n" "internal" >&6; } +@@ -36580,7 +36581,7 @@ printf "%s\n" "internal" >&6; } if test "$COM" = "MSC"; then HYPHEN_LIB="${WORKDIR}/LinkTarget/StaticLibrary/hyphen.lib" else @@ -64,7 +61,7 @@ Index: configure fi fi -@@ -36760,7 +36761,7 @@ printf "%s\n" "internal" >&6; } +@@ -36783,7 +36784,7 @@ printf "%s\n" "internal" >&6; } if test "$COM" = "MSC"; then MYTHES_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/mythes.lib" else @@ -73,16 +70,18 @@ Index: configure fi fi -@@ -37550,7 +37551,7 @@ else +@@ -37573,8 +37574,8 @@ 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/') - if test $(echo $_flex_version | $AWK -F. '{printf("%d%03d%03d", $1, $2, $3)}') -lt 2006000; then +- as_fn_error $? "failed ($FLEX $_flex_version found, but need at least 2.6.0)" "$LINENO" 5 + if test $(echo $_flex_version | $AWK -F. '{printf("%d%03d%03d", $1, $2, $3)}') -lt 2005000; then - as_fn_error $? "failed ($FLEX $_flex_version found, but need at least 2.6.0)" "$LINENO" 5 ++ as_fn_error $? "failed ($FLEX $_flex_version found, but need at least 2.5.0)" "$LINENO" 5 fi fi -@@ -41039,7 +41040,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + +@@ -41062,7 +41063,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 @@ -91,18 +90,7 @@ Index: configure qt5_libdir="$lib_dir" break fi -@@ -41745,8 +41746,8 @@ then - kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel" - fi - -- kf5_test_include="KF5/kcoreaddons_version.h" -- kf5_test_library="libKF5CoreAddons.so" -+ kf5_test_include="KF5/KIOFileWidgets/KFileWidget" -+ kf5_test_library="libKF5KIOFileWidgets.so" - kf5_libdirs="$qt5_libdir $kf5_libdirs" - - # Extract the first word of "$KF5_CONFIG", so it can be a program name with args. -@@ -41819,7 +41820,7 @@ printf "%s\n" "$kf5_incdir" >&6; } +@@ -41842,7 +41843,7 @@ printf "%s\n" "$kf5_incdir" >&6; } printf %s "checking for KF5 libraries... " >&6; } kf5_libdir="no" for kf5_check in $kf5_libdirs; do @@ -111,7 +99,7 @@ Index: configure kf5_libdir="$kf5_check" break fi -@@ -43445,7 +43446,7 @@ for i in shasum /usr/local/bin/shasum /usr/sfw/bin/sha +@@ -43468,7 +43469,7 @@ for i in shasum /usr/local/bin/shasum /usr/sfw/bin/sha done if test -z "$SHA256SUM"; then @@ -120,7 +108,7 @@ Index: configure eval "$i --version" > /dev/null 2>&1 ret=$? if test $ret -eq 0; then -@@ -44139,7 +44140,7 @@ if test $_os = iOS -o $_os = Android; then +@@ -44162,7 +44163,7 @@ if test $_os = iOS -o $_os = Android; then fi if test -n "$enable_mergelibs" -a "$enable_mergelibs" != "no"; then diff --git a/editors/libreoffice/patches/patch-shell_source_unix_exec_shellexec_cxx b/editors/libreoffice/patches/patch-shell_source_unix_exec_shellexec_cxx index 3b2e978eb7c..aad0d471819 100644 --- a/editors/libreoffice/patches/patch-shell_source_unix_exec_shellexec_cxx +++ b/editors/libreoffice/patches/patch-shell_source_unix_exec_shellexec_cxx @@ -1,9 +1,7 @@ -$OpenBSD: patch-shell_source_unix_exec_shellexec_cxx,v 1.17 2022/02/03 20:09:24 robert Exp $ - Index: shell/source/unix/exec/shellexec.cxx --- shell/source/unix/exec/shellexec.cxx.orig +++ shell/source/unix/exec/shellexec.cxx -@@ -212,7 +212,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCom +@@ -216,7 +216,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCom } OString cmd =