[SCM] qtbase packaging branch, experimental, updated. debian/5.5.0+dfsg-6-8-g2b9e394

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 2841f5336d89ba7b79ebba19d911284341a9fb41
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Oct 9 18:34:15 2015 -0300

    Remove patch already present upstream.
---
 debian/changelog                  |  1 +
 debian/patches/screen_crash.patch | 30 ------------------------------
 debian/patches/series             |  1 -
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7d029c5..ed39142 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ qtbase-opensource-src (5.5.1+dfsg-1) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
   * Bump qtbase-abi to 5-5-1.
+  * Remove screen_crash.patch, already present upstream.
 
  -- Sune Vuorela <sune at debian.org>  Tue, 22 Sep 2015 08:28:30 +0200
 
diff --git a/debian/patches/screen_crash.patch b/debian/patches/screen_crash.patch
deleted file mode 100644
index 59b526c..0000000
--- a/debian/patches/screen_crash.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: When a screen comes back online, the windows need to be told
- about it
-Author: Ralf Jung <post at ralfj.de>
-Forwarded: b0b08cc0e4e38504d6b833702f7477aee4e2a192
-Last-Update: 2015-09-07
-
----
- src/plugins/platforms/xcb/qxcbconnection.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/src/plugins/platforms/xcb/qxcbconnection.cpp
-+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
-@@ -252,6 +252,14 @@ void QXcbConnection::updateScreens(const xcb_randr_notify_event_t *event)
-                         otherScreen->addVirtualSibling(screen);
-                 m_screens << screen;
-                 QXcbIntegration::instance()->screenAdded(screen, screen->isPrimary());
-+
-+                // Windows which had null screens have already had expose events by now.
-+                // They need to be told the screen is back, it's OK to render.
-+                foreach (QWindow *window, QGuiApplication::topLevelWindows()) {
-+                    QXcbWindow *xcbWin = static_cast<QXcbWindow*>(window->handle());
-+                    if (xcbWin)
-+                        xcbWin->maybeSetScreen(screen);
-+                }
-             }
-             // else ignore disabled screens
-         } else if (screen) {
--- 
-2.4.6
-
diff --git a/debian/patches/series b/debian/patches/series
index 3d777a4..148b172 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 # Backported stuff
 Fix-compile-error-on-big-endian.patch
-screen_crash.patch
 
 # Debian specific.
 gnukfreebsd.diff

-- 
qtbase packaging