diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2023-02-04 08:39:55 +0000 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2023-02-04 08:43:03 +0000 |
| commit | 60ab1114e266535fe195279162212c9dc7f69397 (patch) | |
| tree | d53fcde3c6acb9a1ec28688c7169b1439cd45127 /editors/libreoffice | |
| parent | 645c54e10d3bd939a03d65e87aee074623c333d2 (diff) | |
| download | ports-60ab1114e266535fe195279162212c9dc7f69397.tar.gz ports-60ab1114e266535fe195279162212c9dc7f69397.zip | |
*/libreoffice*: update to 7.5.0 release (+)
Office team is proud to announce LibreOffice 7.5 Community,
the new major release of the volunteer-supported free office suite for desktop productivity
Read more: https://blog.documentfoundation.org/blog/2023/02/02/tdf-announces-libreoffice-75-community/
Diffstat (limited to 'editors/libreoffice')
26 files changed, 125 insertions, 124 deletions
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index de332680c35c..014e36456e62 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 1 +PORTREVISION= 0 .include "${.CURDIR}/Makefile.common" @@ -10,10 +10,6 @@ DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ DIST_SUBDIR= libreoffice EXTRACT_ONLY:= ${DISTFILES} -#ZXing 2.0.0 -PATCH_SITES+= https://github.com/LibreOffice/core/commit/ -PATCHFILES+= 15e5d86cc55ad94ac946e04d5e25b84be5810970.diff:-p1 - COMMENT= Full integrated office productivity suite WWW?= https://www.libreoffice.org/ @@ -54,8 +50,6 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \ libzmf-0.0.so:graphics/libzmf \ libpng.so:graphics/png \ libpoppler.so:graphics/poppler \ - libqrcodegencpp.so:graphics/qr-code-generator \ - libtiff.so:graphics/tiff \ libwebp.so:graphics/webp \ liblpsolve55.so:math/lp_solve \ libcmis-0.5.so:net/libcmis \ @@ -139,7 +133,7 @@ OPTIONS_DEFAULT= CUPS DOCS JAVA MMEDIA PDFIUM QT5 #OPTIONS_EXCLUDE= GTK4 COINMP_DESC= Enable CoinMP (deprecated) math solver -GTK4_DESC= GTK+ 4 GUI toolkit support (broken) +GTK4_DESC= GTK+ 4 GUI toolkit support (experimental, broken) JAVA_DESC= Add Java support (XML filters, macros, DB connections) KF5_DESC= KF5/Qt5 GUI toolkit support (implies QT5) MMEDIA_DESC= Enable multimedia backend for Impress @@ -171,7 +165,6 @@ GNOME_USE= GNOME=dconf GTK3_CONFIGURE_ENABLE= gtk3 GTK3_USE= GNOME=gtk30 -GTK4_BROKEN= GTK4 is still experimental and breaks in compat code GTK4_CONFIGURE_ENABLE= gtk4 GTK4_USE= GNOME=gtk40 @@ -227,7 +220,7 @@ MMEDIA_USES= gstreamer MMEDIA_CONFIGURE_ENABLE= gstreamer-1-0 PDFIUM_CONFIGURE_ENABLE= pdfium -PDFIUM_DISTFILES= pdfium-5058.tar.bz2:src +PDFIUM_DISTFILES= pdfium-5408.tar.bz2:src PDFIUM_LIB_DEPENDS= libabsl_strings.so:devel/abseil \ libopenjp2.so:graphics/openjpeg @@ -329,6 +322,8 @@ MAKE_ENV+= GNUSED=${LOCALBASE}/bin/gsed MAKE_ENV+= DISPLAY= MAKE_ENV+= verbose=1 +BINARY_ALIAS= sed=gsed + #MAKE_JOBS_UNSAFE= yes .include <bsd.port.options.mk> @@ -392,7 +387,7 @@ post-install: .endfor post-install-SDK-on: -.for subdir in include share share/doc share/idl +.for subdir in include share share/doc @cd ${STAGEDIR}${PREFIX} && \ ${FIND} -s ${subdir}/libreoffice -not -type d >> ${TMPPLIST} .endfor diff --git a/editors/libreoffice/Makefile.common b/editors/libreoffice/Makefile.common index 516d2a3fae6b..55583a84625c 100644 --- a/editors/libreoffice/Makefile.common +++ b/editors/libreoffice/Makefile.common @@ -7,8 +7,8 @@ LICENSE= LGPL3+ MPL20 LICENSE_COMB= dual DISTVERSION= ${LOVERSION}.${RCVER} -LOVERSION= 7.4.4 -RCVER= 2 +LOVERSION= 7.5.0 +RCVER= 3 #PRERELEASE= yes #DEVRELEASE= yes diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo index 394d9a7267ad..8464442fe7f1 100644 --- a/editors/libreoffice/distinfo +++ b/editors/libreoffice/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1673555689 -SHA256 (libreoffice/libreoffice-7.4.4.2.tar.xz) = 8ae1d9a91fab98d9601ee5e256389e3da26c6ad9836930b151504b742e729d0b -SIZE (libreoffice/libreoffice-7.4.4.2.tar.xz) = 264346748 -SHA256 (libreoffice/libreoffice-help-7.4.4.2.tar.xz) = 301efcc2bf9f2f946486796c7275188880940d41d04089991fefae03280fe85d -SIZE (libreoffice/libreoffice-help-7.4.4.2.tar.xz) = 112594808 +TIMESTAMP = 1675413307 +SHA256 (libreoffice/libreoffice-7.5.0.3.tar.xz) = f5120fa3ae80a7deb08150038a6e78335bcab578bd7c41ddc733c2057977003b +SIZE (libreoffice/libreoffice-7.5.0.3.tar.xz) = 266035636 +SHA256 (libreoffice/libreoffice-help-7.5.0.3.tar.xz) = 7e3e9542ad4bf608d12a10c8792c8905b0f2a7d4c96a30beb000a632b4fda8cd +SIZE (libreoffice/libreoffice-help-7.5.0.3.tar.xz) = 166236976 SHA256 (libreoffice/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140 SIZE (libreoffice/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 207992 SHA256 (libreoffice/dtoa-20180411.tgz) = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 @@ -45,8 +45,8 @@ SHA256 (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 75c803 SIZE (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 427800 SHA256 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343 SIZE (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919 -SHA256 (libreoffice/pdfium-5058.tar.bz2) = eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac -SIZE (libreoffice/pdfium-5058.tar.bz2) = 9771391 +SHA256 (libreoffice/pdfium-5408.tar.bz2) = 7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358225b12a0f35 +SIZE (libreoffice/pdfium-5408.tar.bz2) = 10077997 SHA256 (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SIZE (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 12288 SHA256 (libreoffice/15e5d86cc55ad94ac946e04d5e25b84be5810970.diff) = 8c7262f8439bce704d4344d59c632a781a60901470b3265d31748cfed1620570 diff --git a/editors/libreoffice/files/patch-Makefile.in b/editors/libreoffice/files/patch-Makefile.in index 8b8b746be4d4..6cd49ec893e0 100644 --- a/editors/libreoffice/files/patch-Makefile.in +++ b/editors/libreoffice/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2020-11-22 14:05:28 UTC +--- Makefile.in.orig 2022-12-22 00:14:09 UTC +++ Makefile.in -@@ -268,7 +268,7 @@ endif +@@ -276,7 +276,7 @@ endif # # Bootstrap # @@ -9,12 +9,12 @@ # # Build -@@ -393,7 +393,7 @@ else - @exit 1 - endif +@@ -448,7 +448,7 @@ endif + $(SRCDIR)/bin/merge-app-bundles macosx_x86_64/"$(PRODUCTNAME)".app macosx_aarch64/"$(PRODUCTNAME)".app universal/"$(PRODUCTNAME)".app + touch $@ -distro-pack-install: install +distro-pack-install: install-strip - $(SRCDIR)/bin/distro-install-clean-up + WITH_LANG_LIST="$(WITH_LANG_LIST)" WITH_POOR_HELP_LOCALIZATIONS="$(WITH_POOR_HELP_LOCALIZATIONS)" $(SRCDIR)/bin/distro-install-clean-up $(SRCDIR)/bin/distro-install-desktop-integration $(SRCDIR)/bin/distro-install-sdk diff --git a/editors/libreoffice/files/patch-RepositoryExternal.mk b/editors/libreoffice/files/patch-RepositoryExternal.mk index 40589b578ab4..e1b355714250 100644 --- a/editors/libreoffice/files/patch-RepositoryExternal.mk +++ b/editors/libreoffice/files/patch-RepositoryExternal.mk @@ -1,6 +1,6 @@ ---- RepositoryExternal.mk.orig 2022-02-28 18:19:33 UTC +--- RepositoryExternal.mk.orig 2022-12-22 00:14:09 UTC +++ RepositoryExternal.mk -@@ -4203,6 +4203,7 @@ $(call gb_LinkTarget_set_include,$(1),\ +@@ -4157,6 +4157,7 @@ $(call gb_LinkTarget_use_libraries,$(1),pdfium) $$(INCLUDE) \ ) $(call gb_LinkTarget_use_libraries,$(1),pdfium) diff --git a/editors/libreoffice/files/patch-basic_source_classes_sbxmod.cxx b/editors/libreoffice/files/patch-basic_source_classes_sbxmod.cxx index e4bed6e1290b..14b2f21fb4c7 100644 --- a/editors/libreoffice/files/patch-basic_source_classes_sbxmod.cxx +++ b/editors/libreoffice/files/patch-basic_source_classes_sbxmod.cxx @@ -1,6 +1,6 @@ ---- basic/source/classes/sbxmod.cxx.orig 2020-11-22 14:05:28 UTC +--- basic/source/classes/sbxmod.cxx.orig 2022-12-22 00:14:09 UTC +++ basic/source/classes/sbxmod.cxx -@@ -1130,7 +1130,7 @@ void SbModule::Run( SbMethod* pMeth ) +@@ -1131,7 +1131,7 @@ void SbModule::Run( SbMethod* pMeth ) struct rlimit rl; getrlimit ( RLIMIT_STACK, &rl ); #endif diff --git a/editors/libreoffice/files/patch-basic_source_runtime_methods.cxx b/editors/libreoffice/files/patch-basic_source_runtime_methods.cxx index 69a066d4d15c..1285e2c11d11 100644 --- a/editors/libreoffice/files/patch-basic_source_runtime_methods.cxx +++ b/editors/libreoffice/files/patch-basic_source_runtime_methods.cxx @@ -1,6 +1,6 @@ ---- basic/source/runtime/methods.cxx.orig 2020-11-22 14:05:28 UTC +--- basic/source/runtime/methods.cxx.orig 2022-12-22 00:14:09 UTC +++ basic/source/runtime/methods.cxx -@@ -85,6 +85,7 @@ using namespace com::sun::star::uno; +@@ -95,6 +95,7 @@ using namespace com::sun::star::uno; #include <stdio.h> #include <stdlib.h> #include <errno.h> diff --git a/editors/libreoffice/files/patch-bin_distro-install-sdk b/editors/libreoffice/files/patch-bin_distro-install-sdk new file mode 100644 index 000000000000..25427acaed01 --- /dev/null +++ b/editors/libreoffice/files/patch-bin_distro-install-sdk @@ -0,0 +1,44 @@ +--- bin/distro-install-sdk.orig 2022-12-22 00:14:09 UTC ++++ bin/distro-install-sdk +@@ -17,14 +17,14 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; then + # relative paths to $DESTDIR$INSTALLDIR/sdk/setting and it does not work via + # a symlink + mkdir -p $DESTDIR$PREFIXDIR/include +- mkdir -p $DESTDIR$DATADIR/idl ++# mkdir -p $DESTDIR$DATADIR/idl + mkdir -p $DESTDIR$DATADIR/$INSTALLDIRNAME/sdk + mkdir -p $DESTDIR$DOCDIR/sdk + mv $DESTDIR$INSTALLDIR/sdk/include $DESTDIR$PREFIXDIR/include/$INSTALLDIRNAME + if [ -d $DESTDIR$INSTALLDIR/sdk/classes ]; then + mv $DESTDIR$INSTALLDIR/sdk/classes $DESTDIR$DATADIR/$INSTALLDIRNAME/sdk/classes + fi +- mv $DESTDIR$INSTALLDIR/sdk/idl $DESTDIR$DATADIR/idl/$INSTALLDIRNAME ++# mv $DESTDIR$INSTALLDIR/sdk/idl $DESTDIR$DATADIR/idl/$INSTALLDIRNAME + mv $DESTDIR$INSTALLDIR/sdk/docs $DESTDIR$DOCDIR/sdk + mv $DESTDIR$INSTALLDIR/sdk/share/readme $DESTDIR$DOCDIR/sdk/readme + mv $DESTDIR$INSTALLDIR/sdk/index.html $DESTDIR$DOCDIR/sdk +@@ -32,7 +32,7 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; then + # compat symlinks + ln -sf $PREFIXDIR/include/$INSTALLDIRNAME $DESTDIR$INSTALLDIR/sdk/include + ln -sf $DATADIR/$INSTALLDIRNAME/sdk/classes $DESTDIR$INSTALLDIR/sdk/classes +- ln -sf $DATADIR/idl/$INSTALLDIRNAME $DESTDIR$INSTALLDIR/sdk/idl ++# ln -sf $DATADIR/idl/$INSTALLDIRNAME $DESTDIR$INSTALLDIR/sdk/idl + ln -sf $DOCDIR/sdk/docs $DESTDIR$INSTALLDIR/sdk/ + ln -sf $DOCDIR/sdk/index.html $DESTDIR$INSTALLDIR/sdk/index.html + ln -sf $INSTALLDIR/sdk/examples $DESTDIR$DOCDIR/sdk/examples +@@ -53,13 +53,13 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; then + # + echo "%dir $DATADIR/$INSTALLDIRNAME/sdk" >>$DESTDIR/gid_Module_Root_SDK + echo "%dir $DATADIR/$INSTALLDIRNAME" >>$DESTDIR/gid_Module_Root_SDK +- echo "%dir $DATADIR/idl" >>$DESTDIR/gid_Module_Root_SDK ++# echo "%dir $DATADIR/idl" >>$DESTDIR/gid_Module_Root_SDK + echo "%dir $DOCDIR/sdk/docs" >>$DESTDIR/gid_Module_Root_SDK + echo "%dir $DOCDIR/sdk" >>$DESTDIR/gid_Module_Root_SDK + echo "%dir $DOCDIR" >>$DESTDIR/gid_Module_Root_SDK + echo "$INSTALLDIR/sdk/include" >>$DESTDIR/gid_Module_Root_SDK + echo "$INSTALLDIR/sdk/classes" >>$DESTDIR/gid_Module_Root_SDK +- echo "$INSTALLDIR/sdk/idl" >>$DESTDIR/gid_Module_Root_SDK ++# echo "$INSTALLDIR/sdk/idl" >>$DESTDIR/gid_Module_Root_SDK + echo "$INSTALLDIR/sdk/docs" >>$DESTDIR/gid_Module_Root_SDK + echo "$INSTALLDIR/sdk/index.html" >>$DESTDIR/gid_Module_Root_SDK + echo "$DOCDIR/sdk/examples" >>$DESTDIR/gid_Module_Root_SDK diff --git a/editors/libreoffice/files/patch-boost-1.81-compat b/editors/libreoffice/files/patch-boost-1.81-compat deleted file mode 100644 index d739183c6576..000000000000 --- a/editors/libreoffice/files/patch-boost-1.81-compat +++ /dev/null @@ -1,26 +0,0 @@ ---- libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx.orig -+++ libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx -@@ -11,6 +11,7 @@ - - #include <cmath> - #include <iostream> -+#include <vector> - - #include "gtv-calc-header-bar.hxx" - ---- unotools/source/i18n/resmgr.cxx -+++ unotools/source/i18n/resmgr.cxx -@@ -127,8 +127,13 @@ namespace Translate - if (aFind != aCache.end()) - return aFind->second; - boost::locale::generator gen; -+#if BOOST_VERSION < 108100 - gen.characters(boost::locale::char_facet); - gen.categories(boost::locale::message_facet | boost::locale::information_facet); -+#else -+ gen.characters(boost::locale::char_facet_t::char_f); -+ gen.categories(boost::locale::category_t::message | boost::locale::category_t::information); -+#endif - #if defined(ANDROID) - OString sPath(OString(lo_get_app_data_dir()) + "/program/resource"); - #else diff --git a/editors/libreoffice/files/patch-configure b/editors/libreoffice/files/patch-configure index 3d841a2413c6..3643a0e4352d 100644 --- a/editors/libreoffice/files/patch-configure +++ b/editors/libreoffice/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2022-05-12 13:56:44 UTC +--- configure.orig 2022-12-22 00:21:43 UTC +++ configure -@@ -14668,6 +14668,11 @@ freebsd*) +@@ -14720,6 +14720,11 @@ freebsd*) RTL_ARCH=PowerPC_64 PLATFORMID=freebsd_powerpc64 ;; @@ -12,7 +12,7 @@ powerpc|powerpcspe) CPUNAME=POWERPC RTL_ARCH=PowerPC -@@ -37451,7 +37456,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +@@ -37429,7 +37434,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu save_CXXFLAGS=$CXXFLAGS save_IFS=$IFS IFS=$P_SEP @@ -21,7 +21,7 @@ IFS=$save_IFS if test -z "$i"; then continue -@@ -45202,7 +45207,7 @@ if test -z "$SHA256SUM"; then +@@ -45541,7 +45546,7 @@ if test -z "$SHA256SUM"; then done if test -z "$SHA256SUM"; then diff --git a/editors/libreoffice/files/patch-desktop_source_app_app.cxx b/editors/libreoffice/files/patch-desktop_source_app_app.cxx index 1d779a94cadb..99528c633787 100644 --- a/editors/libreoffice/files/patch-desktop_source_app_app.cxx +++ b/editors/libreoffice/files/patch-desktop_source_app_app.cxx @@ -1,6 +1,6 @@ ---- desktop/source/app/app.cxx.orig 2020-11-22 14:05:28 UTC +--- desktop/source/app/app.cxx.orig 2022-12-22 00:14:09 UTC +++ desktop/source/app/app.cxx -@@ -524,6 +524,7 @@ void Desktop::InitFinished() +@@ -539,6 +539,7 @@ void Desktop::DeInit() void Desktop::DeInit() { @@ -8,7 +8,7 @@ try { // instead of removing of the configManager just let it commit all the changes utl::ConfigManager::storeConfigItems(); -@@ -540,7 +541,9 @@ void Desktop::DeInit() +@@ -555,7 +556,9 @@ void Desktop::DeInit() // clear lockfile m_xLockfile.reset(); diff --git a/editors/libreoffice/files/patch-external_pdfium_Library__pdfium.mk b/editors/libreoffice/files/patch-external_pdfium_Library__pdfium.mk index fa718027da5d..251976f4a832 100644 --- a/editors/libreoffice/files/patch-external_pdfium_Library__pdfium.mk +++ b/editors/libreoffice/files/patch-external_pdfium_Library__pdfium.mk @@ -1,7 +1,7 @@ Index: external/pdfium/Library_pdfium.mk ---- external/pdfium/Library_pdfium.mk.orig 2022-01-26 14:35:29 UTC +--- external/pdfium/Library_pdfium.mk.orig 2022-12-22 00:14:09 UTC +++ external/pdfium/Library_pdfium.mk -@@ -726,7 +726,7 @@ $(eval $(call gb_Library_add_generated_exception_objec +@@ -718,7 +718,7 @@ endif )) endif diff --git a/editors/libreoffice/files/patch-external_pdfium_UnpackedTarball__pdfium.mk b/editors/libreoffice/files/patch-external_pdfium_UnpackedTarball__pdfium.mk index 94f2a7f7d383..7c00519010dd 100644 --- a/editors/libreoffice/files/patch-external_pdfium_UnpackedTarball__pdfium.mk +++ b/editors/libreoffice/files/patch-external_pdfium_UnpackedTarball__pdfium.mk @@ -1,9 +1,9 @@ Index: external/pdfium/UnpackedTarball_pdfium.mk ---- external/pdfium/UnpackedTarball_pdfium.mk.orig 2022-01-26 14:35:29 UTC +--- external/pdfium/UnpackedTarball_pdfium.mk.orig 2022-12-22 00:14:09 UTC +++ external/pdfium/UnpackedTarball_pdfium.mk -@@ -24,6 +24,8 @@ pdfium_patches += AndroidNDK19.patch.1 - # --with-latest-c++: - pdfium_patches += gcc-c++20-comparison.patch +@@ -25,6 +25,8 @@ pdfium_patches += constexpr-template.patch + + pdfium_patches += constexpr-template.patch +pdfium_patches += pdfium-bsd.patch + diff --git a/editors/libreoffice/files/patch-external_pdfium_pdfium-bsd.patch b/editors/libreoffice/files/patch-external_pdfium_pdfium-bsd.patch index 9884c0a95147..2d7cc570e7bb 100644 --- a/editors/libreoffice/files/patch-external_pdfium_pdfium-bsd.patch +++ b/editors/libreoffice/files/patch-external_pdfium_pdfium-bsd.patch @@ -1,18 +1,7 @@ Index: external/pdfium/pdfium-bsd.patch --- external/pdfium/pdfium-bsd.patch.orig 2022-02-15 12:21:30 UTC +++ external/pdfium/pdfium-bsd.patch -@@ -0,0 +1,33 @@ -+--- core/fxcrt/cfx_datetime.cpp.orig Thu Feb 3 17:25:02 2022 -++++ core/fxcrt/cfx_datetime.cpp Thu Feb -+@@ -11,7 +11,7 @@ -+ #include "third_party/base/check.h" -+ -+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -+- BUILDFLAG(IS_APPLE) || defined(OS_ASMJS) -++ BUILDFLAG(IS_APPLE) || defined(OS_ASMJS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) -+ #include <sys/time.h> -+ #include <time.h> -+ #endif +@@ -0,0 +1,22 @@ +--- core/fxge/linux/fx_linux_impl.cpp.orig Thu Feb 3 17:25:22 2022 ++++ core/fxge/linux/fx_linux_impl.cpp Thu Feb +@@ -18,7 +18,7 @@ diff --git a/editors/libreoffice/files/patch-external_skia_Library__skia.mk b/editors/libreoffice/files/patch-external_skia_Library__skia.mk index fb476fdaecf7..c5f4999ba42e 100644 --- a/editors/libreoffice/files/patch-external_skia_Library__skia.mk +++ b/editors/libreoffice/files/patch-external_skia_Library__skia.mk @@ -1,6 +1,6 @@ ---- external/skia/Library_skia.mk.orig 2020-11-22 14:05:28 UTC +--- external/skia/Library_skia.mk.orig 2022-12-22 00:14:09 UTC +++ external/skia/Library_skia.mk -@@ -71,7 +71,7 @@ $(eval $(call gb_Library_use_externals,skia,\ +@@ -96,7 +96,7 @@ $(eval $(call gb_Library_use_externals,skia,\ libpng \ )) diff --git a/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk b/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk index 09707c1a5817..637c17cb9105 100644 --- a/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk +++ b/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk @@ -1,9 +1,9 @@ --- external/skia/UnpackedTarball_skia.mk.orig 2022-05-12 13:26:05 UTC +++ external/skia/UnpackedTarball_skia.mk -@@ -38,6 +38,7 @@ skia_patches := \ - allow-no-es2restrictions.patch.1 \ - vk_mem_alloc.patch.1 \ +@@ -40,6 +40,7 @@ skia_patches := \ tdf148624.patch.1 \ + constexpr-template.patch.0 \ + missing-include.patch.0 \ + gfx-skia-skia-src-core-SkCpu.cpp.patch.0 \ $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) diff --git a/editors/libreoffice/files/patch-helpcontent2_CustomTarget__html.mk b/editors/libreoffice/files/patch-helpcontent2_CustomTarget__html.mk index 21ef8e5c044b..e7a37b10c6ea 100644 --- a/editors/libreoffice/files/patch-helpcontent2_CustomTarget__html.mk +++ b/editors/libreoffice/files/patch-helpcontent2_CustomTarget__html.mk @@ -1,11 +1,11 @@ ---- helpcontent2/CustomTarget_html.mk.orig 2021-10-29 17:06:25 UTC +--- helpcontent2/CustomTarget_html.mk.orig 2022-12-22 00:14:09 UTC +++ helpcontent2/CustomTarget_html.mk -@@ -116,7 +116,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3x - $(SRCDIR)/helpcontent2/CustomTarget_html.mk - ( \ - printf 'var languagesSet = new Set([' ; \ -- for lang in $(gb_HELP_LANGS) ; do printf '%s' "'$$lang', " ; done | sed 's/, $$//' ; \ -+ for lang in $(ALL_LANGS) ; do printf '%s' "'$$lang', " ; done | sed 's/, $$//' ; \ - printf ']);\n' \ - ) > $@ +@@ -115,7 +115,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3x + # set of installed languages - has to be language independent + $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/languages.js : \ + $(SRCDIR)/helpcontent2/CustomTarget_html.mk +- printf 'var languagesSet = new Set([%s]);\n' "$(subst $(WHITESPACE),$(COMMA) ,$(patsubst %,'%',$(gb_HELP_LANGS)))" > $@ ++ printf 'var languagesSet = new Set([%s]);\n' "$(subst $(WHITESPACE),$(COMMA) ,$(patsubst %,'%',$(ALL_LANGS)))" > $@ + define html_gen_langnames_js_dep + $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/langnames.js : \ diff --git a/editors/libreoffice/files/patch-idl_source_objects_types.cxx b/editors/libreoffice/files/patch-idl_source_objects_types.cxx index dd41934be885..ecbb2a6ec451 100644 --- a/editors/libreoffice/files/patch-idl_source_objects_types.cxx +++ b/editors/libreoffice/files/patch-idl_source_objects_types.cxx @@ -1,6 +1,6 @@ ---- idl/source/objects/types.cxx.orig 2022-01-26 14:35:29 UTC +--- idl/source/objects/types.cxx.orig 2022-12-22 00:14:09 UTC +++ idl/source/objects/types.cxx -@@ -251,7 +251,7 @@ void SvMetaType::WriteSfxItem( +@@ -249,7 +249,7 @@ void SvMetaType::WriteSfxItem( // write the implementation part rOutStm.WriteCharPtr( "#ifdef SFX_TYPEMAP" ) << endl; diff --git a/editors/libreoffice/files/patch-libreofficekit_qa_gtktiledviewer_gtv-calc-header-bar.cxx b/editors/libreoffice/files/patch-libreofficekit_qa_gtktiledviewer_gtv-calc-header-bar.cxx new file mode 100644 index 000000000000..54ff73b0e27b --- /dev/null +++ b/editors/libreoffice/files/patch-libreofficekit_qa_gtktiledviewer_gtv-calc-header-bar.cxx @@ -0,0 +1,10 @@ +--- libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx.orig 2022-12-22 00:14:09 UTC ++++ libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx +@@ -11,6 +11,7 @@ + + #include <cmath> + #include <iostream> ++#include <vector> + + #include "gtv-calc-header-bar.hxx" + diff --git a/editors/libreoffice/files/patch-officecfg_registry_schema_org_openoffice_Office_Common.xcs b/editors/libreoffice/files/patch-officecfg_registry_schema_org_openoffice_Office_Common.xcs deleted file mode 100644 index be80442b5b03..000000000000 --- a/editors/libreoffice/files/patch-officecfg_registry_schema_org_openoffice_Office_Common.xcs +++ /dev/null @@ -1,11 +0,0 @@ ---- officecfg/registry/schema/org/openoffice/Office/Common.xcs.orig 2020-11-22 14:05:28 UTC -+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs -@@ -5480,7 +5480,7 @@ - <info> - <desc>Special font for rendering of emojis</desc> - </info> -- <value>EmojiOne Color</value> -+ <value>Twitter Color Emoji</value> - </prop> - <prop oor:name="FontsUseWinMetrics" oor:type="oor:string-list" oor:nillable="false"> - <info> diff --git a/editors/libreoffice/files/patch-sal_cppunittester_cppunittester.cxx b/editors/libreoffice/files/patch-sal_cppunittester_cppunittester.cxx index 33e33c56f267..f3eb3fd650b7 100644 --- a/editors/libreoffice/files/patch-sal_cppunittester_cppunittester.cxx +++ b/editors/libreoffice/files/patch-sal_cppunittester_cppunittester.cxx @@ -1,6 +1,6 @@ ---- sal/cppunittester/cppunittester.cxx.orig 2022-01-26 14:35:29 UTC +--- sal/cppunittester/cppunittester.cxx.orig 2022-12-22 00:14:09 UTC +++ sal/cppunittester/cppunittester.cxx -@@ -385,6 +385,7 @@ void reportResourceUsage([[maybe_unused]] const OUStri +@@ -389,6 +389,7 @@ static bool main2() static bool main2() { diff --git a/editors/libreoffice/files/patch-sal_osl_unx_uunxapi.cxx b/editors/libreoffice/files/patch-sal_osl_unx_uunxapi.cxx index febc692a4128..8517a8f905bc 100644 --- a/editors/libreoffice/files/patch-sal_osl_unx_uunxapi.cxx +++ b/editors/libreoffice/files/patch-sal_osl_unx_uunxapi.cxx @@ -1,6 +1,6 @@ ---- sal/osl/unx/uunxapi.cxx.orig 2020-11-22 14:05:28 UTC +--- sal/osl/unx/uunxapi.cxx.orig 2022-12-22 00:14:09 UTC +++ sal/osl/unx/uunxapi.cxx -@@ -595,14 +595,22 @@ std::string UnixErrnoString(int nErrno) +@@ -604,14 +604,22 @@ std::string UnixErrnoString(int nErrno) case EBFONT: return "EBFONT"; #endif diff --git a/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx b/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx index aad12fca2875..9e5f62181d32 100644 --- a/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx +++ b/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx @@ -1,11 +1,11 @@ ---- shell/source/unix/exec/shellexec.cxx.orig 2022-01-26 14:35:29 UTC +--- shell/source/unix/exec/shellexec.cxx.orig 2022-12-22 00:14:09 UTC +++ shell/source/unix/exec/shellexec.cxx -@@ -212,7 +212,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCom +@@ -229,7 +229,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCom } OString cmd = -#ifdef LINUX +#if defined(LINUX) || defined(__FreeBSD__) // avoid blocking (call it in background) - "( " + aBuffer.makeStringAndClear() + " ) &"; + "( " + aBuffer + " ) &"; #else diff --git a/editors/libreoffice/files/patch-solenv_gbuild_platform_unxgcc.mk b/editors/libreoffice/files/patch-solenv_gbuild_platform_unxgcc.mk index b805c8678460..3bac7767ea5d 100644 --- a/editors/libreoffice/files/patch-solenv_gbuild_platform_unxgcc.mk +++ b/editors/libreoffice/files/patch-solenv_gbuild_platform_unxgcc.mk @@ -1,6 +1,6 @@ ---- solenv/gbuild/platform/unxgcc.mk.orig 2020-11-22 14:05:28 UTC +--- solenv/gbuild/platform/unxgcc.mk.orig 2022-12-22 00:14:09 UTC +++ solenv/gbuild/platform/unxgcc.mk -@@ -52,8 +52,7 @@ endif +@@ -55,8 +55,7 @@ gb_CXXFLAGS := \ gb_CXXFLAGS := \ $(gb_CXXFLAGS_COMMON) \ -fPIC \ diff --git a/editors/libreoffice/files/patch-svtools_source_svrtf_parrtf.cxx b/editors/libreoffice/files/patch-svtools_source_svrtf_parrtf.cxx index b9f7ca1ed98b..1844eee42860 100644 --- a/editors/libreoffice/files/patch-svtools_source_svrtf_parrtf.cxx +++ b/editors/libreoffice/files/patch-svtools_source_svrtf_parrtf.cxx @@ -1,6 +1,6 @@ ---- svtools/source/svrtf/parrtf.cxx.orig 2020-11-22 14:05:28 UTC +--- svtools/source/svrtf/parrtf.cxx.orig 2022-12-22 00:14:09 UTC +++ svtools/source/svrtf/parrtf.cxx -@@ -50,6 +50,7 @@ SvRTFParser::~SvRTFParser() +@@ -51,6 +51,7 @@ SvRTFParser::~SvRTFParser() { } diff --git a/editors/libreoffice/files/patch-vcl_qt5_QtInstance.cxx b/editors/libreoffice/files/patch-vcl_qt5_QtInstance.cxx index 59eec180e738..c0fb5cd2591e 100644 --- a/editors/libreoffice/files/patch-vcl_qt5_QtInstance.cxx +++ b/editors/libreoffice/files/patch-vcl_qt5_QtInstance.cxx @@ -1,6 +1,6 @@ ---- vcl/qt5/QtInstance.cxx.orig 2022-01-26 14:35:29 UTC +--- vcl/qt5/QtInstance.cxx.orig 2022-12-22 00:14:09 UTC +++ vcl/qt5/QtInstance.cxx -@@ -479,7 +479,7 @@ QtInstance::createPicker(css::uno::Reference<css::uno: +@@ -492,7 +492,7 @@ QtInstance::createPicker(css::uno::Reference<css::uno: { SolarMutexGuard g; rtl::Reference<QtFilePicker> pPicker; @@ -9,7 +9,7 @@ assert(pPicker); return pPicker; } -@@ -689,7 +689,7 @@ std::unique_ptr<QApplication> QtInstance::CreateQAppli +@@ -751,7 +751,7 @@ VCLPLUG_QT_PUBLIC SalInstance* create_SalInstance() extern "C" { VCLPLUG_QT_PUBLIC SalInstance* create_SalInstance() { |