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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 7956aff09ce89fa5578689fc3ae49276e68bf54f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Jul 2 14:42:32 2013 -0300

    Remove QGtkStyle-remove-an-unnecessary-sanity-check-for-the.patch
---
 debian/changelog                                   |    1 +
 ...emove-an-unnecessary-sanity-check-for-the.patch |   36 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 97961ec..2399ebe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qt4-x11 (4:4.8.5+dfsg-1) UNRELEASED; urgency=low
   * Remove patches taken from upstream, already applied:
     - SSL-certificates-blacklist-mis-issued-Turktrust-cert.patch
     - Fix_binary_incompatibility_between_openssl_versions.patch
+    - QGtkStyle-remove-an-unnecessary-sanity-check-for-the.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Jun 2013 11:08:53 -0300
 
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
deleted file mode 100644
index c98ba75..0000000
--- a/debian/patches/QGtkStyle-remove-an-unnecessary-sanity-check-for-the.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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 8fa6f27..273497b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 # upstream patches
 Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
 QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch
-QGtkStyle-remove-an-unnecessary-sanity-check-for-the.patch
 
 # qt-copy patches
 0195-compositing-properties.diff

-- 
Qt 4 packaging