[SCM] qtbase packaging branch, experimental, updated. debian/5.4.1+dfsg-2-37-gab91ed9

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=5b3f057

The following commit has been merged in the experimental branch:
commit 5b3f057efc8c8daf4b7355fb6175d59866c288c6
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon May 25 19:28:26 2015 -0300

    Delete xcb_delay_showing_tray_icon_window_until_it_is_embedded.patch
    
    Applied upstream.
---
 debian/changelog                                   |  1 +
 debian/patches/series                              |  1 -
 ...ing_tray_icon_window_until_it_is_embedded.patch | 45 ----------------------
 3 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 290b610..57f7baf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qtbase-opensource-src (5.4.1+dfsg-5) UNRELEASED; urgency=medium
   * Delete patches backported from upstream already present in this release:
     - cve-2015-0295.diff
     - qtsystemtrayicon_handle_submenus_correctly.patch
+    - xcb_delay_showing_tray_icon_window_until_it_is_embedded.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 18 May 2015 18:35:01 -0300
 
diff --git a/debian/patches/series b/debian/patches/series
index 434a513..042f824 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 upstream_small-improvements-to-the-hurd-g-mkspec.patch
 upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
 gnukfreebsd.diff
-xcb_delay_showing_tray_icon_window_until_it_is_embedded.patch
 require_fpic_instead_of_fpie.patch
 try_to_ensure_that_fpic_is_used_in_cmake_builds.patch
 make_qglobal_h_complain_if_you_use_fpie.patch
diff --git a/debian/patches/xcb_delay_showing_tray_icon_window_until_it_is_embedded.patch b/debian/patches/xcb_delay_showing_tray_icon_window_until_it_is_embedded.patch
deleted file mode 100644
index 872ec62..0000000
--- a/debian/patches/xcb_delay_showing_tray_icon_window_until_it_is_embedded.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 612953a626ec21b8518ee23a4f5268b566cf41e5 Mon Sep 17 00:00:00 2001
-From: Shawn Rutledge <shawn.rutledge at digia.com>
-Date: Thu, 29 Jan 2015 16:22:08 +0100
-Subject: [PATCH] xcb: delay showing tray icon window until it is embedded
-
-Otherwise there is a race condition: when the tray implementation
-gets around to embedding the window, if it was already shown,
-it will be unmapped, embedded, and then remapped. Some tray
-implementations will resize the tray icon to 1 pixel wide in
-that case. We also never want to show a window that was intended
-for the tray in any other location, so it's better that it remain
-invisible until we are sure it is embedded.
-
-Task-number: QTBUG-31762
-Task-number: QTBUG-35658
-Task-number: QTBUG-32811
-Change-Id: Id324b0bfded0f8258ff1686a223cb2c069827d42
-Reviewed-by: Laszlo Agocs <laszlo.agocs at theqtcompany.com>
----
- src/plugins/platforms/xcb/qxcbwindow.cpp |    6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/src/plugins/platforms/xcb/qxcbwindow.cpp
-+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
-@@ -767,6 +767,9 @@ void QXcbWindow::show()
-     if (connection()->time() != XCB_TIME_CURRENT_TIME)
-         updateNetWmUserTime(connection()->time());
- 
-+    if (window()->objectName() == QLatin1String("QSystemTrayIconSysWindow"))
-+        return; // defer showing until XEMBED_EMBEDDED_NOTIFY
-+
-     Q_XCB_CALL(xcb_map_window(xcb_connection(), m_window));
- 
-     if (QGuiApplication::modalWindow() == window())
-@@ -2350,7 +2353,10 @@ void QXcbWindow::handleXEmbedMessage(con
-     switch (event->data.data32[1]) {
-     case XEMBED_WINDOW_ACTIVATE:
-     case XEMBED_WINDOW_DEACTIVATE:
-+        break;
-     case XEMBED_EMBEDDED_NOTIFY:
-+        Q_XCB_CALL(xcb_map_window(xcb_connection(), m_window));
-+        m_screen->windowShown(this);
-         break;
-     case XEMBED_FOCUS_IN:
-         Qt::FocusReason reason;

-- 
qtbase packaging