diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 701820f22b3..e09d29341c1 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= 7.6 -VERSION= ${BV}.3.2 +VERSION= ${BV}.4.1 DISTNAME= libreoffice-${VERSION} WRKDIST= ${WRKDIR}/libreoffice-${VERSION} CATEGORIES= editors productivity diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo index 994390c805c..3b2c4159130 100644 --- a/editors/libreoffice/distinfo +++ b/editors/libreoffice/distinfo @@ -59,10 +59,10 @@ SHA256 (libreoffice/liborcus-0.18.1.tar.xz) = YAa58VdjFeMT33FafnKhfz4LF9e2vRGc+o 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.6.3.2.tar.xz) = kelLmacnDEUNix8x+oMzl/xJzHEmAmfY4ESmRi7X4V0= -SHA256 (libreoffice/libreoffice-dictionaries-7.6.3.2.tar.xz) = 0+OqiPqqOAbdGW5E/4KjpbmS/erJYmEm0TpWqBVhuIs= -SHA256 (libreoffice/libreoffice-help-7.6.3.2.tar.xz) = 2QnvueAwwP8zrqUt/dNYCzH1jBapsod/T4W4sDVed9U= -SHA256 (libreoffice/libreoffice-translations-7.6.3.2.tar.xz) = dtctnx+fOvIP32aFYGE3Bg+FJ7XlPrCoVp4iUHVneKI= +SHA256 (libreoffice/libreoffice-7.6.4.1.tar.xz) = E/6nuPJMd2MTueCGKKpZA5C+pFBkvnO8cO57G3Cqah4= +SHA256 (libreoffice/libreoffice-dictionaries-7.6.4.1.tar.xz) = NsBSbkwSqzjdHhdmzYeBGN1WkleLgEEbm0Q+OJ43Evo= +SHA256 (libreoffice/libreoffice-help-7.6.4.1.tar.xz) = 7XhMAUCW4Of/hilOumJL2S7L5b6IGwGVDuzWmu19hng= +SHA256 (libreoffice/libreoffice-translations-7.6.4.1.tar.xz) = OloNvkCr3FXN2ZlIlfZXfX5UfSajayBkHzLzZAo7dnk= SHA256 (libreoffice/libstaroffice-0.0.7.tar.xz) = +U+wrYIW+XEnvt7xY6RYhrQ8Yt6sXlsPXmKOI0IgyNs= SHA256 (libreoffice/libvisio-0.1.7.tar.xz) = j6+N+HDLJ7CaeHoZWdbGRvqkTQ2KsVGIPfQItxZr6kw= SHA256 (libreoffice/libwpg-0.3.4.tar.xz) = tV/alEDR4HBjDrJIfYuGl89BLCFKJ8runfac7HwATeM= @@ -138,10 +138,10 @@ SIZE (libreoffice/liborcus-0.18.1.tar.xz) = 2070352 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.6.3.2.tar.xz) = 281497724 -SIZE (libreoffice/libreoffice-dictionaries-7.6.3.2.tar.xz) = 53055372 -SIZE (libreoffice/libreoffice-help-7.6.3.2.tar.xz) = 166957988 -SIZE (libreoffice/libreoffice-translations-7.6.3.2.tar.xz) = 216943668 +SIZE (libreoffice/libreoffice-7.6.4.1.tar.xz) = 281547116 +SIZE (libreoffice/libreoffice-dictionaries-7.6.4.1.tar.xz) = 53057396 +SIZE (libreoffice/libreoffice-help-7.6.4.1.tar.xz) = 166959028 +SIZE (libreoffice/libreoffice-translations-7.6.4.1.tar.xz) = 216976788 SIZE (libreoffice/libstaroffice-0.0.7.tar.xz) = 707920 SIZE (libreoffice/libvisio-0.1.7.tar.xz) = 854296 SIZE (libreoffice/libwpg-0.3.4.tar.xz) = 340428 diff --git a/editors/libreoffice/patches/patch-RepositoryExternal_mk b/editors/libreoffice/patches/patch-RepositoryExternal_mk index 784caac4121..460f0204e05 100644 --- a/editors/libreoffice/patches/patch-RepositoryExternal_mk +++ b/editors/libreoffice/patches/patch-RepositoryExternal_mk @@ -1,7 +1,7 @@ Index: RepositoryExternal.mk --- RepositoryExternal.mk.orig +++ RepositoryExternal.mk -@@ -647,6 +647,7 @@ endef +@@ -648,6 +648,7 @@ endef gb_ExternalProject__use_boost_system := define gb_LinkTarget__use_boost_headers @@ -9,7 +9,7 @@ Index: RepositoryExternal.mk $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(BOOST_CPPFLAGS) \ -@@ -3696,6 +3697,10 @@ gb_LinkTarget__use_libgpg-error := +@@ -3697,6 +3698,10 @@ gb_LinkTarget__use_libgpg-error := endif # ENABLE_GPGMEPP define gb_LinkTarget__use_dconf diff --git a/editors/libreoffice/patches/patch-configure b/editors/libreoffice/patches/patch-configure index 2fee72b8edd..0b88e673132 100644 --- a/editors/libreoffice/patches/patch-configure +++ b/editors/libreoffice/patches/patch-configure @@ -11,7 +11,7 @@ Index: configure using_x11=yes PTHREAD_CFLAGS="-D_THREAD_SAFE" PTHREAD_LIBS="-pthread" -@@ -14979,6 +14982,11 @@ openbsd*) +@@ -14993,6 +14996,11 @@ openbsd*) P_SEP=: case "$host_cpu" in @@ -23,7 +23,7 @@ Index: configure i*86) CPUNAME=INTEL RTL_ARCH=x86 -@@ -21698,9 +21706,6 @@ _ACEOF +@@ -21696,9 +21704,6 @@ _ACEOF rm -fr libconftest* { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gccvisinlineshiddenok" >&5 printf "%s\n" "$gccvisinlineshiddenok" >&6; } @@ -33,7 +33,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 -@@ -29017,7 +29022,7 @@ then : +@@ -29015,7 +29020,7 @@ then : printf %s "(cached) " >&6 else $as_nop @@ -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 -@@ -29458,7 +29463,7 @@ then : +@@ -29470,7 +29475,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 -@@ -29907,7 +29912,7 @@ then : +@@ -29933,7 +29938,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 -@@ -38295,7 +38300,7 @@ printf "%s\n" "internal" >&6; } +@@ -38335,7 +38340,7 @@ printf "%s\n" "internal" >&6; } if test "$COM" = "MSC"; then HYPHEN_LIB="${WORKDIR}/LinkTarget/StaticLibrary/hyphen.lib" else @@ -69,7 +69,7 @@ Index: configure fi fi -@@ -38498,7 +38503,7 @@ printf "%s\n" "internal" >&6; } +@@ -38538,7 +38543,7 @@ printf "%s\n" "internal" >&6; } if test "$COM" = "MSC"; then MYTHES_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/mythes.lib" else @@ -78,7 +78,7 @@ Index: configure fi fi -@@ -39346,8 +39351,8 @@ else +@@ -39386,8 +39391,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/') @@ -89,7 +89,7 @@ Index: configure fi fi -@@ -43243,7 +43248,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -43283,7 +43288,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 -@@ -44052,7 +44057,7 @@ printf "%s\n" "$kf5_incdir" >&6; } +@@ -44092,7 +44097,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 -@@ -46040,7 +46045,7 @@ for i in shasum /usr/local/bin/shasum /usr/sfw/bin/sha +@@ -46080,7 +46085,7 @@ for i in shasum /usr/local/bin/shasum /usr/sfw/bin/sha done if test -z "$SHA256SUM"; then @@ -116,7 +116,7 @@ Index: configure eval "$i --version" > /dev/null 2>&1 ret=$? if test $ret -eq 0; then -@@ -46728,7 +46733,7 @@ if test $_os = iOS -o $_os = Android; then +@@ -46768,7 +46773,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-external_skia_UnpackedTarball_skia_mk b/editors/libreoffice/patches/patch-external_skia_UnpackedTarball_skia_mk index cafe4882906..4adb22b3dc2 100644 --- a/editors/libreoffice/patches/patch-external_skia_UnpackedTarball_skia_mk +++ b/editors/libreoffice/patches/patch-external_skia_UnpackedTarball_skia_mk @@ -1,10 +1,10 @@ Index: external/skia/UnpackedTarball_skia.mk --- external/skia/UnpackedTarball_skia.mk.orig +++ external/skia/UnpackedTarball_skia.mk -@@ -39,6 +39,7 @@ skia_patches := \ - tdf147342.patch.0 \ +@@ -40,6 +40,7 @@ skia_patches := \ redefinition-of-op.patch.0 \ 0001-Added-missing-include-cstdio.patch \ + 0001-AvoidCombiningExtrememelyLargeMeshes.patch.1 \ + openbsd.patch.2 \ $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) diff --git a/editors/libreoffice/patches/patch-vcl_source_app_svapp_cxx b/editors/libreoffice/patches/patch-vcl_source_app_svapp_cxx index 4269183bbcc..2d0eb3d4631 100644 --- a/editors/libreoffice/patches/patch-vcl_source_app_svapp_cxx +++ b/editors/libreoffice/patches/patch-vcl_source_app_svapp_cxx @@ -1,7 +1,7 @@ Index: vcl/source/app/svapp.cxx --- vcl/source/app/svapp.cxx.orig +++ vcl/source/app/svapp.cxx -@@ -1208,7 +1208,7 @@ OUString Application::GetHWOSConfInfo(const int bSelec +@@ -1218,7 +1218,7 @@ OUString Application::GetHWOSConfInfo(const int bSelec #endif appendDetails(u"", Localize(SV_APP_DEFAULT, bLocalize));