cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 7.4.3.2

Browse Source
This commit is contained in:
robert 2022-11-28 12:09:50 +00:00
parent 471efc1992
commit 13dbed2046
5 changed files with 43 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editors/libreoffice/Makefile
View File

@ -24,14 +24,13 @@ SHARED_LIBS += wpg-0.3-lo 3.3 # 3.3
SHARED_LIBS += wps-0.4-lo 4.12 # 4.12
BV= 7.4
VERSION= ${BV}.2.3
VERSION= ${BV}.3.2
DISTNAME= libreoffice-${VERSION}
WRKDIST= ${WRKDIR}/libreoffice-${VERSION}
CATEGORIES= editors productivity
DPB_PROPERTIES= parallel
EPOCH= 0
REVISION-main= 0
MAINTAINER= Robert Nagy <robert@openbsd.org>

16
editors/libreoffice/distinfo
View File

@ -59,10 +59,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.4.2.3.tar.xz) = gsH/4C8u2O4UUan2fDUzWyemONtZH5vFOe/4arFN2Vo=
SHA256 (libreoffice/libreoffice-dictionaries-7.4.2.3.tar.xz) = Rqf7Aqawa7yMbw6ObChvvbiEBNaPrQY1vdAIaIupPtc=
SHA256 (libreoffice/libreoffice-help-7.4.2.3.tar.xz) = T57V3Z2LOUvkQt24b1fLeHRigtiG4Nw1rdNuizQXD1w=
SHA256 (libreoffice/libreoffice-translations-7.4.2.3.tar.xz) = yAU/hjyVwxqDoHm7Lu/Ztmb/1Z5AxDRAmMBKkkpU9uE=
SHA256 (libreoffice/libreoffice-7.4.3.2.tar.xz) = /7y7GC4iluxo6i7Ea86ApA1TVAcpwAKArVQc2Dxp2zs=
SHA256 (libreoffice/libreoffice-dictionaries-7.4.3.2.tar.xz) = OlXVgHt2OCf4IMSu4KD9n0RSDnBinJ65dI4fjFfGQ4k=
SHA256 (libreoffice/libreoffice-help-7.4.3.2.tar.xz) = 0I9KLxb7N1kDJw+sq1J+KN5X3rm6RS+dRJ1ScdDxGKI=
SHA256 (libreoffice/libreoffice-translations-7.4.3.2.tar.xz) = 0DTfNhGIRPmVjcd1Bps7iwjRHLuLSydTFEm8ZUO8zSA=
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=
@ -139,10 +139,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.4.2.3.tar.xz) = 263628084
SIZE (libreoffice/libreoffice-dictionaries-7.4.2.3.tar.xz) = 51487228
SIZE (libreoffice/libreoffice-help-7.4.2.3.tar.xz) = 112593884
SIZE (libreoffice/libreoffice-translations-7.4.2.3.tar.xz) = 199319988
SIZE (libreoffice/libreoffice-7.4.3.2.tar.xz) = 263885136
SIZE (libreoffice/libreoffice-dictionaries-7.4.3.2.tar.xz) = 51484464
SIZE (libreoffice/libreoffice-help-7.4.3.2.tar.xz) = 112594804
SIZE (libreoffice/libreoffice-translations-7.4.3.2.tar.xz) = 199476756
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

2
editors/libreoffice/patches/patch-RepositoryExternal_mk
View File

@ -9,7 +9,7 @@ Index: RepositoryExternal.mk
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(BOOST_CPPFLAGS) \
@@ -3678,6 +3679,10 @@ gb_LinkTarget__use_libgpg-error :=
@@ -3680,6 +3681,10 @@ gb_LinkTarget__use_libgpg-error :=
endif # ENABLE_GPGMEPP
define gb_LinkTarget__use_dconf

68
editors/libreoffice/patches/patch-configure
View File

@ -1,7 +1,7 @@
Index: configure
--- configure.orig
+++ configure
@@ -6428,9 +6428,13 @@ aix*)
@@ -6928,6 +6928,9 @@ aix*)
openbsd*)
using_freetype_fontconfig=yes
@ -11,11 +11,7 @@ Index: configure
using_x11=yes
PTHREAD_CFLAGS="-D_THREAD_SAFE"
PTHREAD_LIBS="-pthread"
+ SED="/usr/local/bin/gsed"
_os=OpenBSD
;;
@@ -14253,6 +14257,11 @@ openbsd*)
@@ -15026,6 +15029,11 @@ openbsd*)
P_SEP=:
case "$host_cpu" in
@ -27,44 +23,44 @@ Index: configure
i*86)
CPUNAME=INTEL
RTL_ARCH=x86
@@ -20754,9 +20763,6 @@ _ACEOF
@@ -21759,9 +21767,6 @@ _ACEOF
rm -fr libconftest*
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gccvisinlineshiddenok" >&5
$as_echo "$gccvisinlineshiddenok" >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gccvisinlineshiddenok" >&5
printf "%s\n" "$gccvisinlineshiddenok" >&6; }
- if test "$gccvisinlineshiddenok" = "no"; then
- as_fn_error $? "Your gcc/clang is not -fvisibility-inlines-hidden safe. This is no longer supported." "$LINENO" 5
- fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX_BASE has a visibility bug with class-level attributes (GCC bug 26905)" >&5
@@ -28090,7 +28096,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
$as_echo_n "(cached) " >&6
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CXX_BASE has a visibility bug with class-level attributes (GCC bug 26905)" >&5
@@ -29210,7 +29215,7 @@ then :
printf %s "(cached) " >&6
else $as_nop
- for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python3.9 python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -28396,7 +28402,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
$as_echo_n "(cached) " >&6
else
- for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in 3.9 python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -28710,7 +28716,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -29528,7 +29533,7 @@ then :
printf %s "(cached) " >&6
else $as_nop
- for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python3.9 python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -36712,7 +36718,7 @@ $as_echo "internal" >&6; }
@@ -29854,7 +29859,7 @@ then :
printf %s "(cached) " >&6
else $as_nop
- for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python3.9 python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -38014,7 +38019,7 @@ printf "%s\n" "internal" >&6; }
if test "$COM" = "MSC"; then
HYPHEN_LIB="${WORKDIR}/LinkTarget/StaticLibrary/hyphen.lib"
else
@ -73,7 +69,7 @@ Index: configure
fi
fi
@@ -36905,7 +36911,7 @@ $as_echo "internal" >&6; }
@@ -38217,7 +38222,7 @@ printf "%s\n" "internal" >&6; }
if test "$COM" = "MSC"; then
MYTHES_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/mythes.lib"
else
@ -82,9 +78,9 @@ Index: configure
fi
fi
@@ -37739,8 +37745,8 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the flex version" >&5
$as_echo_n "checking the flex version... " >&6; }
@@ -39065,8 +39070,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
@ -93,8 +89,8 @@ Index: configure
fi
fi
@@ -41378,7 +41384,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
$as_echo_n "checking for Qt5 libraries... " >&6; }
@@ -42786,7 +42791,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
- if test -r "$lib_dir/$qt5_test_library"; then
@ -102,8 +98,8 @@ Index: configure
qt5_libdir="$lib_dir"
break
fi
@@ -42155,7 +42161,7 @@ $as_echo "$kf5_incdir" >&6; }
$as_echo_n "checking for KF5 libraries... " >&6; }
@@ -43588,7 +43593,7 @@ printf "%s\n" "$kf5_incdir" >&6; }
printf %s "checking for KF5 libraries... " >&6; }
kf5_libdir="no"
for kf5_check in $kf5_libdirs; do
- if test -r "$kf5_check/$kf5_test_library"; then
@ -111,7 +107,7 @@ Index: configure
kf5_libdir="$kf5_check"
break
fi
@@ -44106,7 +44112,7 @@ for i in shasum /usr/local/bin/shasum /usr/sfw/bin/sha
@@ -45562,7 +45567,7 @@ for i in shasum /usr/local/bin/shasum /usr/sfw/bin/sha
done
if test -z "$SHA256SUM"; then
@ -120,7 +116,7 @@ Index: configure
eval "$i --version" > /dev/null 2>&1
ret=$?
if test $ret -eq 0; then
@@ -44799,7 +44805,7 @@ if test $_os = iOS -o $_os = Android; then
@@ -46247,7 +46252,7 @@ if test $_os = iOS -o $_os = Android; then
fi
if test -n "$enable_mergelibs" -a "$enable_mergelibs" != "no"; then

2
editors/libreoffice/patches/patch-sal_osl_unx_uunxapi_cxx
View File

@ -1,7 +1,7 @@
Index: sal/osl/unx/uunxapi.cxx
--- sal/osl/unx/uunxapi.cxx.orig
+++ sal/osl/unx/uunxapi.cxx
@@ -639,8 +639,10 @@ std::string UnixErrnoString(int nErrno)
@@ -640,8 +640,10 @@ std::string UnixErrnoString(int nErrno)
#endif
case EPROTO:
return "EPROTO";