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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 10fac310e782260604e823937fe3f44324b8660c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun May 29 16:38:55 2016 -0300

    Apply Raphaël Halimi's patch to add MATE detection (Closes: #825769).
---
 debian/changelog                      |  3 +++
 debian/patches/add-mate-support.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0dd346b..51d1cbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qt4-x11 (4:4.8.7+dfsg-8) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * Disable pch also on powerpcspe; thanks Roland Stigge. (Closes: #773270)
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Apply Raphaël Halimi's patch to add MATE detection (Closes: #825769).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 22 May 2016 19:33:08 +0200
 
 qt4-x11 (4:4.8.7+dfsg-7) unstable; urgency=medium
diff --git a/debian/patches/add-mate-support.patch b/debian/patches/add-mate-support.patch
new file mode 100644
index 0000000..504333b
--- /dev/null
+++ b/debian/patches/add-mate-support.patch
@@ -0,0 +1,27 @@
+Description: Add support for MATE desktop
+ This patch checks for an environment variable set by MATE 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-05-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ src/gui/kernel/qapplication_x11.cpp |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/src/gui/kernel/qapplication_x11.cpp
++++ b/src/gui/kernel/qapplication_x11.cpp
+@@ -2361,6 +2361,12 @@ void qt_init(QApplicationPrivate *priv,
+                 break;
+             }
+ 
++            // Check the equivalent environment variable set by MATE
++            if (!qgetenv("MATE_DESKTOP_SESSION_ID").isEmpty()) {
++                X11->desktopEnvironment = DE_GNOME;
++                break;
++            }
++
+             rc = XGetWindowProperty(X11->display, QX11Info::appRootWindow(), ATOM(_DT_SAVE_MODE),
+                                     0, 2, False, XA_STRING, &type, &format, &length,
+                                     &after, &data);
diff --git a/debian/patches/series b/debian/patches/series
index 7b31876..7128430 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -61,3 +61,4 @@ QtScript_x32_config.diff
 x32.diff
 no-ssl3.patch
 qt-everywhere-opensource-src-4.8.7-gcc6.patch
+add-mate-support.patch

-- 
Qt 4 packaging