diff options
Diffstat (limited to 'editors/libreoffice/files')
7 files changed, 37 insertions, 61 deletions
diff --git a/editors/libreoffice/files/patch-configure b/editors/libreoffice/files/patch-configure index fdcdef6bd6c2..3d841a2413c6 100644 --- a/editors/libreoffice/files/patch-configure +++ b/editors/libreoffice/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2022-06-01 21:09:01 UTC +--- configure.orig 2022-05-12 13:56:44 UTC +++ configure -@@ -14498,6 +14498,11 @@ freebsd*) +@@ -14668,6 +14668,11 @@ freebsd*) RTL_ARCH=PowerPC_64 PLATFORMID=freebsd_powerpc64 ;; @@ -12,7 +12,7 @@ powerpc|powerpcspe) CPUNAME=POWERPC RTL_ARCH=PowerPC -@@ -36227,7 +36232,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +@@ -37451,7 +37456,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 -@@ -43503,7 +43508,7 @@ for i in shasum /usr/local/bin/shasum /usr/sfw/bin/sha +@@ -45202,7 +45207,7 @@ if test -z "$SHA256SUM"; then done if test -z "$SHA256SUM"; then diff --git a/editors/libreoffice/files/patch-external_pdfium_pdfium-bsd.patch b/editors/libreoffice/files/patch-external_pdfium_pdfium-bsd.patch index 57b07e636f8b..9884c0a95147 100644 --- a/editors/libreoffice/files/patch-external_pdfium_pdfium-bsd.patch +++ b/editors/libreoffice/files/patch-external_pdfium_pdfium-bsd.patch @@ -1,49 +1,37 @@ 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,45 @@ -+--- ./core/fxcrt/cfx_datetime.cpp.orig Thu Feb 3 17:25:02 2022 -++++ ./core/fxcrt/cfx_datetime.cpp Thu Feb +@@ -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 defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+- defined(OS_APPLE) || defined(OS_ASMJS) -++ defined(OS_APPLE) || defined(OS_ASMJS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) ++ #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 -+--- ./core/fxge/linux/fx_linux_impl.cpp.orig Thu Feb 3 17:25:22 2022 -++++ ./core/fxge/linux/fx_linux_impl.cpp Thu Feb -+@@ -17,7 +17,7 @@ ++--- 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 @@ + #include "third_party/base/check.h" -+ #include "third_party/base/cxx17_backports.h" + -+-#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ASMJS) -++#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ASMJS) && !defined(OS_FREEBSD) && !defined(OS_OPENBSD) ++ #if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_FUCHSIA) && \ ++- !defined(OS_ASMJS) +++ !defined(OS_ASMJS) && !defined(OS_FREEBSD) && !defined(OS_OPENBSD) + #error "Included on the wrong platform" + #endif + -+@@ -165,9 +165,8 @@ -+ std::unique_ptr<SystemFontInfoIface> CreateDefaultSystemFontInfo() override { -+ auto pInfo = std::make_unique<CFX_LinuxFontInfo>(); -+ if (!pInfo->ParseFontCfg(CFX_GEModule::Get()->GetUserFontPaths())) { -+- pInfo->AddPath("/usr/share/fonts"); -+- pInfo->AddPath("/usr/share/X11/fonts/Type1"); -+- pInfo->AddPath("/usr/share/X11/fonts/TTF"); -++ pInfo->AddPath("/usr/X11R6/lib/X11/fonts/Type1"); -++ pInfo->AddPath("/usr/X11R6/lib/X11/fonts/TTF"); -+ pInfo->AddPath("/usr/local/share/fonts"); -+ } -+ return pInfo; -+--- ./core/fxge/cfx_fontmapper.cpp.orig Thu Feb 3 17:25:53 2022 -++++ ./core/fxge/cfx_fontmapper.cpp Thu Feb -+@@ -156,7 +156,7 @@ ++--- core/fxge/cfx_fontmapper.cpp.orig Thu Feb 3 17:25:53 2022 +++++ core/fxge/cfx_fontmapper.cpp Thu Feb ++@@ -155,7 +155,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { + {"ForteMT", "Forte"}, + }; + -+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ASMJS) -++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ASMJS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) ++-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(OS_ASMJS) +++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(OS_ASMJS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) + const char kNarrowFamily[] = "LiberationSansNarrow"; -+ #elif defined(OS_ANDROID) ++ #elif BUILDFLAG(IS_ANDROID) + const char kNarrowFamily[] = "RobotoCondensed"; diff --git a/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk b/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk index e430b575d286..09707c1a5817 100644 --- a/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk +++ b/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk @@ -1,8 +1,8 @@ ---- external/skia/UnpackedTarball_skia.mk.orig 2022-01-26 14:35:29 UTC +--- external/skia/UnpackedTarball_skia.mk.orig 2022-05-12 13:26:05 UTC +++ external/skia/UnpackedTarball_skia.mk @@ -38,6 +38,7 @@ skia_patches := \ - windows-libraries-system32.patch.1 \ - fix-graphite-ifdef.patch.1 \ + allow-no-es2restrictions.patch.1 \ + vk_mem_alloc.patch.1 \ tdf148624.patch.1 \ + gfx-skia-skia-src-core-SkCpu.cpp.patch.0 \ diff --git a/editors/libreoffice/files/patch-libreofficekit_qa_gtktiledviewer_gtv-lok-dialog.cxx b/editors/libreoffice/files/patch-libreofficekit_qa_gtktiledviewer_gtv-lok-dialog.cxx index a04ca1acf4e4..f19a4b5c55ef 100644 --- a/editors/libreoffice/files/patch-libreofficekit_qa_gtktiledviewer_gtv-lok-dialog.cxx +++ b/editors/libreoffice/files/patch-libreofficekit_qa_gtktiledviewer_gtv-lok-dialog.cxx @@ -1,12 +1,12 @@ ---- libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx.orig 2020-05-06 18:00:34 UTC +--- libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx.orig 2022-05-12 13:26:05 UTC +++ libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx -@@ -10,8 +10,12 @@ +@@ -10,7 +10,12 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> +#include <cmath> #include <iostream> - #include <sstream> ++#include <sstream> +#include <strstream> +#include <string> +#include <vector> diff --git a/editors/libreoffice/files/patch-ucb_source_ucp_webdav_DateTimeHelper.cxx b/editors/libreoffice/files/patch-ucb_source_ucp_webdav_DateTimeHelper.cxx index 8f20dd897d49..8db0d08cf85a 100644 --- a/editors/libreoffice/files/patch-ucb_source_ucp_webdav_DateTimeHelper.cxx +++ b/editors/libreoffice/files/patch-ucb_source_ucp_webdav_DateTimeHelper.cxx @@ -1,5 +1,5 @@ ---- ucb/source/ucp/webdav/DateTimeHelper.cxx.orig 2016-10-28 14:50:26 UTC -+++ ucb/source/ucp/webdav/DateTimeHelper.cxx +--- ucb/source/ucp/webdav-curl/DateTimeHelper.cxx.orig 2016-10-28 14:50:26 UTC ++++ ucb/source/ucp/webdav-curl/DateTimeHelper.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ diff --git a/editors/libreoffice/files/patch-vcl_skia_gdiimpl.cxx b/editors/libreoffice/files/patch-vcl_skia_gdiimpl.cxx deleted file mode 100644 index ff2345b78a52..000000000000 --- a/editors/libreoffice/files/patch-vcl_skia_gdiimpl.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- vcl/skia/gdiimpl.cxx.orig 2022-01-26 14:35:29 UTC -+++ vcl/skia/gdiimpl.cxx -@@ -999,7 +999,7 @@ void SkiaSalGraphicsImpl::performDrawPolyPolygon(const - getDrawCanvas()->drawPath(polygonPath, aPaint); - } - postDraw(); --#if defined LINUX -+#if defined LINUX || defined FREEBSD - // WORKAROUND: The logo in the about dialog has drawing errors. This seems to happen - // only on Linux (not Windows on the same machine), with both AMDGPU and Mesa, - // and only when antialiasing is enabled. Flushing seems to avoid the problem. diff --git a/editors/libreoffice/files/patch-vcl_source_app_salplug.cxx b/editors/libreoffice/files/patch-vcl_source_app_salplug.cxx index 6637a0ab3466..fc1470ed01bb 100644 --- a/editors/libreoffice/files/patch-vcl_source_app_salplug.cxx +++ b/editors/libreoffice/files/patch-vcl_source_app_salplug.cxx @@ -1,6 +1,6 @@ ---- vcl/source/app/salplug.cxx.orig 2020-05-27 12:17:53 UTC +--- vcl/source/app/salplug.cxx.orig 2022-05-12 13:26:05 UTC +++ vcl/source/app/salplug.cxx -@@ -152,6 +152,7 @@ SalInstance* autodetect_plugin() +@@ -202,6 +202,7 @@ const char* const* autodetect_plugin_list() #if ENABLE_KF5 "kf5", #endif @@ -8,12 +8,11 @@ #if ENABLE_GTK3_KDE5 "gtk3_kde5", #endif -@@ -160,7 +161,7 @@ SalInstance* autodetect_plugin() +@@ -216,6 +217,7 @@ const char* const* autodetect_plugin_list() static const char* const pStandardFallbackList[] = { -- "gtk3", "gen", nullptr -+ "gtk3", "qt5", "gen", nullptr - }; - - #ifdef HEADLESS_VCLPLUG ++ "qt5", + #if ENABLE_GTK3 + "gtk3", + #endif |