Disable gtk3 plugin unless explicitly requested via SAL_USE_VCLPLUGIN=gtk3

This commit is contained in:
Andrey Bondrov 2016-11-14 23:57:10 +10:00
parent d81813f2de
commit d14f8a2b2c
2 changed files with 22 additions and 1 deletions

View file

@ -0,0 +1,18 @@
diff -urN libreoffice-5.2.3.3/vcl/unx/generic/plugadapt/salplug.cxx libreoffice-5.2.3.3-patched/vcl/unx/generic/plugadapt/salplug.cxx
--- libreoffice-5.2.3.3/vcl/unx/generic/plugadapt/salplug.cxx 2016-10-29 00:50:26.000000000 +1000
+++ libreoffice-5.2.3.3-patched/vcl/unx/generic/plugadapt/salplug.cxx 2016-11-14 23:54:15.921687817 +1000
@@ -68,6 +68,14 @@
return svp_create_SalInstance();
SalInstance* pInst = nullptr;
+ // Disable gtk3 plugin for now unless explicitly requested via
+ // SAL_USE_VCLPLUGIN=gtk3 (would ideally depend on experimental mode, but
+ // reading the experimental mode setting requires the UNO service manager
+ // which has not yet been instantiated):
+ if (!bForce && rModuleBase == "gtk3")
+ {
+ return nullptr;
+ }
OUString aModule(
#ifdef SAL_DLLPREFIX
SAL_DLLPREFIX

View file

@ -41,7 +41,7 @@ Summary: Office suite
Name: libreoffice
Epoch: 1
Version: 5.2.3
Release: 1
Release: 2
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
@ -109,6 +109,9 @@ Patch101: libreoffice-5.2.1.2-desktop-categories.patch
Patch102: libreoffice-5.2.1.2-desktop-protocols.patch
#Patch103: libreoffice-5.1.1.3-desktop-startcenter-nodisplay.patch
Patch104: libreoffice-5.1.2.2-desktop-startcenter-nomate.patch
# Disable gtk3 plugin unless explicitly requested via SAL_USE_VCLPLUGIN=gtk3
# It's still very experimental and doesn't work properly
Patch105: libreoffice-5.2.3.3-gtk3.patch
BuildRequires: bison
BuildRequires: bsh