From d919e9890c401fc5bd4209e1e105653be4e0f94c Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 4 Apr 2020 20:48:21 +0300 Subject: [PATCH] patch: prefer gtk3_kde5 over kde5 because of maturity of gtk3 rendering --- gtk3_kde5-priority.patch | 21 +++++++++++++++++++++ libreoffice.spec | 4 +++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 gtk3_kde5-priority.patch diff --git a/gtk3_kde5-priority.patch b/gtk3_kde5-priority.patch new file mode 100644 index 0000000..7a9a1bc --- /dev/null +++ b/gtk3_kde5-priority.patch @@ -0,0 +1,21 @@ +--- libreoffice-6.3.5.2/vcl/source/app/salplug.cxx.orig2 2020-04-04 20:44:52.950045617 +0300 ++++ libreoffice-6.3.5.2/vcl/source/app/salplug.cxx 2020-04-04 20:44:55.713958634 +0300 +@@ -151,12 +151,15 @@ + { + static const char* const pKDEFallbackList[] = + { +-#if ENABLE_KDE5 +- "kde5", +-#endif + #if ENABLE_GTK3_KDE5 ++// prefer gtk3_kde5 over kde5 because of maturity of gtk3 rendering; ++// based on kde4 vcl experience, I don't trust kde5 VCL, ++// and other people wrote about problems in it //mikhailnov + "gtk3_kde5", + #endif ++#if ENABLE_KDE5 ++ "kde5", ++#endif + "gtk3", "gtk", "gen", nullptr + }; + diff --git a/libreoffice.spec b/libreoffice.spec index dfc4cac..dec7c81 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -45,7 +45,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.3.5 -Release: 6 +Release: 7 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org @@ -95,6 +95,8 @@ Patch2: libreoffice-6.3.5.2-kde4-detection.patch Patch3: 6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c.patch # For Clang <9, GCC <10, when building with libstdc++-gcc10 Patch4: span-old-compilers.patch +# prefer gtk3_kde5 over kde5 because of maturity of gtk3 rendering +Patch5: gtk3_kde5-priority.patch # ROSA vendor patch Patch100: libreoffice-4.1-vendor.patch