[libreoffice] 05/06: remove gtk3 from fallback list for xfce
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 08ea672d772afeeadd5e64aad160e3e92bcf45d8
Author: Rene Engelhard <rene@debian.org>
Date: Sun Sep 4 12:26:48 2016 +0200
remove gtk3 from fallback list for xfce
---
changelog | 5 ++++-
patches/series | 1 +
patches/xfce-fallback-list.diff | 27 +++++++++++++++++++++++++++
3 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index e30154f..e440ab0 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,9 @@
libreoffice (1:5.2.1-1) unstable; urgency=medium
* LibreOffice 5.2.1 final (identical to rc2)
+
+ * debian/patches/xfce-fallback-list.diff: remove gtk3 from fallback list
+ for xfce (closes: #836531)
* upload to unstable
@@ -9,7 +12,7 @@ libreoffice (1:5.2.1-1) unstable; urgency=medium
fonts-crosextra-caladea, fonts-crosextra-carlito and fonts-linuxlibertine
* debian/README.Debian-source: update (closes: #836186)
- -- Rene Engelhard <rene@debian.org> Sun, 04 Sep 2016 12:04:33 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 04 Sep 2016 12:25:34 +0200
libreoffice (1:5.2.1~rc2-1) experimental; urgency=medium
diff --git a/patches/series b/patches/series
index 8d6d406..18dc860 100644
--- a/patches/series
+++ b/patches/series
@@ -30,3 +30,4 @@ rsc-no-error-about-unknown-switch.diff
debian-branding.diff
no-packagekit-per-default.diff
sparc64.diff
+xfce-fallback-list.diff
diff --git a/patches/xfce-fallback-list.diff b/patches/xfce-fallback-list.diff
new file mode 100644
index 0000000..33c03ee
--- /dev/null
+++ b/patches/xfce-fallback-list.diff
@@ -0,0 +1,27 @@
+--- libreoffice-5.2.1.orig/vcl/unx/generic/plugadapt/salplug.cxx
++++ libreoffice-5.2.1/vcl/unx/generic/plugadapt/salplug.cxx
+@@ -187,6 +187,11 @@ static SalInstance* autodetect_plugin()
+ "gtk3", "gtk", "gen", nullptr
+ };
+
++ static const char* const pXFCEFallbackList[] =
++ {
++ "gtk", "gen", nullptr
++ };
++
+ static const char* const pHeadlessFallbackList[] =
+ {
+ "svp", nullptr
+@@ -201,10 +206,11 @@ static SalInstance* autodetect_plugin()
+ pList = pHeadlessFallbackList;
+ else if ( desktop == DESKTOP_GNOME ||
+ desktop == DESKTOP_UNITY ||
+- desktop == DESKTOP_XFCE ||
+ desktop == DESKTOP_KDE3 ||
+ desktop == DESKTOP_MATE )
+ pList = pStandardFallbackList;
++ else if ( desktop == DESKTOP_XFCE)
++ pList = pXFCEFallbackList;
+ else if( desktop == DESKTOP_TDE )
+ pList = pTDEFallbackList;
+ else if( desktop == DESKTOP_KDE4 || desktop == DESKTOP_KDE5 )
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: