[libreoffice] 01/01: Revert "remove gtk3 from fallback list for xfce"

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 7d25b57d3e980acbd6a823937fa82191a8e8ba18
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Sep 14 08:09:56 2016 +0200

    Revert "remove gtk3 from fallback list for xfce"
    
    This reverts commit 08ea672d772afeeadd5e64aad160e3e92bcf45d8.
---
 changelog                       |  6 ++++++
 patches/series                  |  1 -
 patches/xfce-fallback-list.diff | 27 ---------------------------
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/changelog b/changelog
index 52626f1..3f6f3a1 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.2.1-3) UNRELEASED; urgency=medium
+
+  * debian/patches/xfce-fallback-list.diff: remove again, didn't help
+
+ -- Rene Engelhard <rene at debian.org>  Wed, 14 Sep 2016 08:11:38 +0200
+
 libreoffice (1:5.2.1-2) unstable; urgency=medium
 
   * debian/rules: install typesizes.h into
diff --git a/patches/series b/patches/series
index 18dc860..8d6d406 100644
--- a/patches/series
+++ b/patches/series
@@ -30,4 +30,3 @@ 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
deleted file mode 100644
index 33c03ee..0000000
--- a/patches/xfce-fallback-list.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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