From 3fb48c2a108a40ae837e613d505e44fad2472d5d Mon Sep 17 00:00:00 2001 From: robert Date: Sat, 30 May 2020 13:34:23 +0000 Subject: [PATCH] update to 6.4.4.2 --- editors/libreoffice/Makefile | 6 +++--- editors/libreoffice/distinfo | 20 ++++++++++---------- editors/libreoffice/patches/patch-configure | 12 ++++++------ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 2b8eb39aec7..c5767748d3a 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.227 2020/04/17 18:14:37 robert Exp $ +# $OpenBSD: Makefile,v 1.228 2020/05/30 13:34:23 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.10 # 4.10 BV= 6.4 -VERSION= ${BV}.3.2 +VERSION= ${BV}.4.2 DISTNAME= libreoffice-${VERSION} WRKDIST= ${WRKDIR}/libreoffice-${VERSION} PKGNAME= libreoffice-${VERSION} @@ -107,7 +107,7 @@ DISTFILES += e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip:0 DISTFILES += edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz:0 DISTFILES += eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip:0 DISTFILES += f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip:0 -DISTFILES += language-subtag-registry-2019-09-16.tar.bz2:0 +DISTFILES += language-subtag-registry-2020-04-01.tar.bz2:0 DISTFILES += libabw-0.1.3.tar.xz:0 DISTFILES += libcdr-0.1.5.tar.xz:0 DISTFILES += libcdr-0.1.3.tar.bz2:0 diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo index 84851de0aca..4a5b9cca1c1 100644 --- a/editors/libreoffice/distinfo +++ b/editors/libreoffice/distinfo @@ -39,7 +39,7 @@ SHA256 (libreoffice/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip) SHA256 (libreoffice/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz) = 57yaH+x4elKeSfWia5Pc3PQVBkSd/HD5LN720X62+2E= SHA256 (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = dcgDWcnONDwgqrijakXLO57nxhz5LBOuRTmdhUQjqbo= SHA256 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = BWQKH2gFsrLX4sucUNuaXLCE48Uqsacc4BUjm0odQ0M= -SHA256 (libreoffice/language-subtag-registry-2019-09-16.tar.bz2) = B7ZrwPJ4b95V9rvLy0pFWoRuuOI1HIzj0KIZpzaTc2o= +SHA256 (libreoffice/language-subtag-registry-2020-04-01.tar.bz2) = +x7g2r/ZVqRF++nzUehqUnZ4CFWPIPQlbmf7uzdo6do= SHA256 (libreoffice/libabw-0.1.3.tar.xz) = 52Op3CHD0mZ0AtZuIC4/jvTbUbNLee9B9WysuG3Nbu0= SHA256 (libreoffice/libcdr-0.1.3.tar.bz2) = UWC7v+/lK9SICED60rB6USgT43v6+MysBi/KI48jD00= SHA256 (libreoffice/libcdr-0.1.5.tar.xz) = as5cSZqL40rYceglRCzjiGFK4thnXEOBdWpzGUKeOkg= @@ -60,10 +60,10 @@ SHA256 (libreoffice/liborcus-0.15.3.tar.gz) = DdJvPy5hHFHfnuAtbb8IiHmJ6qQXtz9od8 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-6.4.3.2.tar.xz) = vBRUfBiO+hX0yzbPs9p8rLMDenRI0buopY7WoyDMq7I= -SHA256 (libreoffice/libreoffice-dictionaries-6.4.3.2.tar.xz) = dd6q5i+qqcBq/gS14Sk+ZcXm7V2RiVoUMqgXR4qzWUE= -SHA256 (libreoffice/libreoffice-help-6.4.3.2.tar.xz) = hXDqqJA+T7dHUArb8G1p0tPLbtOhGjqARAOHjx7P71Y= -SHA256 (libreoffice/libreoffice-translations-6.4.3.2.tar.xz) = AyYLra030dlsm8rHnuSKsqsAAAq6eMOkpKzNUcmH6Rs= +SHA256 (libreoffice/libreoffice-6.4.4.2.tar.xz) = VDiFl9/8nDL4FEbm5jT3r3bKDg5aDSe8P+iQM6ARwHg= +SHA256 (libreoffice/libreoffice-dictionaries-6.4.4.2.tar.xz) = 0EwyWKb4qEnSqsYXDMz31db0ckY/Dgrbs4xldyRWLGo= +SHA256 (libreoffice/libreoffice-help-6.4.4.2.tar.xz) = xhrHuc6smqCBO85AXOJbE9wbaYUJzjOCf/fGXf/eJaw= +SHA256 (libreoffice/libreoffice-translations-6.4.4.2.tar.xz) = Sc04Wqvn8ZdEesBkWo/NunWwRkKzj6xJNCqs4gVQmL0= SHA256 (libreoffice/librevenge-0.0.4.tar.bz2) = xRYBzQgyC3VwKBLGSq4GU0CRZNp4Jf0PRRrCxdvnfL8= SHA256 (libreoffice/libstaroffice-0.0.6.tar.xz) = awDh7YGU5gcr5EQQJdG4iOOTZXJ+1bI+DoySxACdHsQ= SHA256 (libreoffice/libvisio-0.1.7.tar.xz) = j6+N+HDLJ7CaeHoZWdbGRvqkTQ2KsVGIPfQItxZr6kw= @@ -121,7 +121,7 @@ SIZE (libreoffice/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip) = SIZE (libreoffice/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz) = 1098827 SIZE (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 427800 SIZE (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919 -SIZE (libreoffice/language-subtag-registry-2019-09-16.tar.bz2) = 75514 +SIZE (libreoffice/language-subtag-registry-2020-04-01.tar.bz2) = 76147 SIZE (libreoffice/libabw-0.1.3.tar.xz) = 318808 SIZE (libreoffice/libcdr-0.1.3.tar.bz2) = 731755 SIZE (libreoffice/libcdr-0.1.5.tar.xz) = 612252 @@ -142,10 +142,10 @@ SIZE (libreoffice/liborcus-0.15.3.tar.gz) = 2602283 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-6.4.3.2.tar.xz) = 230409812 -SIZE (libreoffice/libreoffice-dictionaries-6.4.3.2.tar.xz) = 45908104 -SIZE (libreoffice/libreoffice-help-6.4.3.2.tar.xz) = 88297704 -SIZE (libreoffice/libreoffice-translations-6.4.3.2.tar.xz) = 172348568 +SIZE (libreoffice/libreoffice-6.4.4.2.tar.xz) = 231325236 +SIZE (libreoffice/libreoffice-dictionaries-6.4.4.2.tar.xz) = 45910896 +SIZE (libreoffice/libreoffice-help-6.4.4.2.tar.xz) = 88296340 +SIZE (libreoffice/libreoffice-translations-6.4.4.2.tar.xz) = 172568720 SIZE (libreoffice/librevenge-0.0.4.tar.bz2) = 529833 SIZE (libreoffice/libstaroffice-0.0.6.tar.xz) = 706324 SIZE (libreoffice/libvisio-0.1.7.tar.xz) = 854296 diff --git a/editors/libreoffice/patches/patch-configure b/editors/libreoffice/patches/patch-configure index 7a4659e1776..6fb006aac97 100644 --- a/editors/libreoffice/patches/patch-configure +++ b/editors/libreoffice/patches/patch-configure @@ -50,7 +50,7 @@ Index: configure test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros -@@ -34028,7 +34028,7 @@ $as_echo "internal" >&6; } +@@ -34033,7 +34033,7 @@ $as_echo "internal" >&6; } if test "$COM" = "MSC"; then HYPHEN_LIB="${WORKDIR}/LinkTarget/StaticLibrary/hyphen.lib" else @@ -59,7 +59,7 @@ Index: configure fi fi -@@ -34221,7 +34221,7 @@ $as_echo "internal" >&6; } +@@ -34226,7 +34226,7 @@ $as_echo "internal" >&6; } if test "$COM" = "MSC"; then MYTHES_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/mythes.lib" else @@ -68,7 +68,7 @@ Index: configure fi fi -@@ -35032,7 +35032,7 @@ else +@@ -35037,7 +35037,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking the flex version" >&5 $as_echo_n "checking the flex version... " >&6; } _flex_version=$($FLEX --version | $SED -e 's/^.*\([[:digit:]]\{1,\}\.[[:digit:]]\{1,\}\.[[:digit:]]\{1,\}\).*$/\1/') @@ -77,7 +77,7 @@ Index: configure as_fn_error $? "failed ($FLEX $_flex_version found, but need at least 2.6.0)" "$LINENO" 5 fi fi -@@ -37348,7 +37348,8 @@ $as_echo "$qt5_incdir" >&6; } +@@ -37353,7 +37353,8 @@ $as_echo "$qt5_incdir" >&6; } $as_echo_n "checking for Qt5 libraries... " >&6; } qt5_libdir="no" for lib_dir in $qt5_libdirs; do @@ -87,7 +87,7 @@ Index: configure qt5_libdir="$lib_dir" break fi -@@ -37755,7 +37756,7 @@ $as_echo "$kf5_incdir" >&6; } +@@ -37760,7 +37761,7 @@ $as_echo "$kf5_incdir" >&6; } $as_echo_n "checking for KF5 libraries... " >&6; } kf5_libdir="no" for kf5_check in $kf5_libdirs; do @@ -96,7 +96,7 @@ Index: configure kf5_libdir="$kf5_check" break fi -@@ -39367,7 +39368,7 @@ for i in shasum /usr/local/bin/shasum /usr/sfw/bin/sha +@@ -39372,7 +39373,7 @@ for i in shasum /usr/local/bin/shasum /usr/sfw/bin/sha done if test -z "$SHA256SUM"; then