[SCM] Qt 4 packaging branch, master, updated. debian/4.8.4+dfsg-4-13-g9fcc663

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 9fcc66348d29e8b7b8ea4d925cad14400c1a3c18
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Jun 22 11:11:59 2013 -0300

    Import patch from upstream to solve GTK style crash.
---
 debian/changelog                                   |    4 +++
 ...emove-an-unnecessary-sanity-check-for-the.patch |   36 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 41 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 71f6bcc..7d22fb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qt4-x11 (4:4.8.4+dfsg-5) UNRELEASED; urgency=low
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add QGtkStyle-remove-an-unnecessary-sanity-check-for-the.patch, taken from
+    upstream, to solve a crash in GTK style (Closes: 712886).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Jun 2013 11:08:53 -0300
 
 qt4-x11 (4:4.8.4+dfsg-4) unstable; urgency=low
diff --git a/debian/patches/QGtkStyle-remove-an-unnecessary-sanity-check-for-the.patch b/debian/patches/QGtkStyle-remove-an-unnecessary-sanity-check-for-the.patch
new file mode 100644
index 0000000..c98ba75
--- /dev/null
+++ b/debian/patches/QGtkStyle-remove-an-unnecessary-sanity-check-for-the.patch
@@ -0,0 +1,36 @@
+From a9dc50330acee2ac4fe4e09677ec71885e7baf08 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57 at gmail.com>
+Date: Thu, 11 Apr 2013 17:32:00 +0400
+Subject: [PATCH 001/132] QGtkStyle: remove an unnecessary sanity check for
+ theme name
+
+This makes QGtkStyle working again on Debian experimental
+and Ubuntu 13.04, where getThemeName() returns empty value.
+
+Backported from QtBase b72aa1cad30a44b1.
+
+Change-Id: If4cc822970088a5fb31aa28d9951db1efc0bb4fd
+Reviewed-by: J-P Nurmi <jpnurmi at digia.com>
+---
+ src/gui/styles/qgtkstyle_p.cpp | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/gui/styles/qgtkstyle_p.cpp b/src/gui/styles/qgtkstyle_p.cpp
+index a21eead..302cf09 100644
+--- a/src/gui/styles/qgtkstyle_p.cpp
++++ b/src/gui/styles/qgtkstyle_p.cpp
+@@ -507,10 +507,7 @@ void QGtkStylePrivate::initGtkWidgets() const
+     if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) {
+         themeName = getThemeName();
+ 
+-        if (themeName.isEmpty()) {
+-            qWarning("QGtkStyle was unable to detect the current GTK+ theme.");
+-            return;
+-        } else if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
++        if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
+             // Due to namespace conflicts with Qt3 and obvious recursion with Qt4,
+             // we cannot support the GTK_Qt Gtk engine
+             qWarning("QGtkStyle cannot be used together with the GTK_Qt engine.");
+-- 
+1.8.3.1
+
diff --git a/debian/patches/series b/debian/patches/series
index e328e77..dc7dc2b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@ Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
 QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch
 SSL-certificates-blacklist-mis-issued-Turktrust-cert.patch
 Fix_binary_incompatibility_between_openssl_versions.patch
+QGtkStyle-remove-an-unnecessary-sanity-check-for-the.patch
 
 # qt-copy patches
 0195-compositing-properties.diff

-- 
Qt 4 packaging