[SCM] Qt 4 packaging branch, master, updated. debian/4.8.7+dfsg-8-3-g6d183d0

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=6d183d0

The following commit has been merged in the master branch:
commit 6d183d09349b39b2f49684b58441c9b58acd4667
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Sep 9 08:26:10 2016 -0300

    Add support for LXDE.
---
 debian/changelog                      |  1 +
 debian/patches/add-lxde-support.patch | 22 ++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f22d0d5..580a8ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qt4-x11 (4:4.8.7+dfsg-9) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Update symbols files with buildds' logs.
+  * Add support for LXDE (Closes: #836894).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 09 Sep 2016 08:13:56 -0300
 
diff --git a/debian/patches/add-lxde-support.patch b/debian/patches/add-lxde-support.patch
new file mode 100644
index 0000000..c066512
--- /dev/null
+++ b/debian/patches/add-lxde-support.patch
@@ -0,0 +1,22 @@
+Description: Add support for LXDE desktop
+ This patch checks for an environment variable set by LXDE desktop, in order to
+ make Qt4 applications natively use the GTK+ style when run on this desktop
+Author: Raphaël Halimi <raphael.halimi at gmail.com>
+Origin: other
+Last-Update: 2016-09-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/gui/kernel/qapplication_x11.cpp
++++ b/src/gui/kernel/qapplication_x11.cpp
+@@ -2355,6 +2355,11 @@
+                 break;
+             }
+ 
++            if (qgetenv("DESKTOP_SESSION") == "LXDE") {
++                X11->desktopEnvironment = DE_GNOME;
++                break;
++            }
++
+             // GNOME_DESKTOP_SESSION_ID is deprecated for some reason, but still check it
+             if (!qgetenv("GNOME_DESKTOP_SESSION_ID").isEmpty()) {
+                 X11->desktopEnvironment = DE_GNOME;
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 7128430..4858f9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -62,3 +62,4 @@ x32.diff
 no-ssl3.patch
 qt-everywhere-opensource-src-4.8.7-gcc6.patch
 add-mate-support.patch
+add-lxde-support.patch

-- 
Qt 4 packaging