[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-14-3-gee3fcce

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit 84b32133b01915929bfcddf08db526ac03d381a8
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jan 18 08:38:13 2016 +0000

    Backport XCB patch related to screen disconnection handling QTBUG-42985:
    
    * Backport XCB patch related to screen disconnection handling QTBUG-42985:
      - xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
---
 debian/changelog                                   |  3 +-
 debian/patches/series                              |  1 +
 ...-another-crash-when-screens-are-disconnec.patch | 37 ++++++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5b979bc..0dd8079 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qtbase-opensource-src (5.5.1+dfsg-15) UNRELEASED; urgency=medium
 
-  * 
+  * Backport XCB patch related to screen disconnection handling QTBUG-42985:
+    - xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 Feb 2016 10:15:48 +0000
 
diff --git a/debian/patches/series b/debian/patches/series
index 15d3738..f4c57c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@ set_positionautomatic.diff
 set_WA_OutsideWSRange_for_native_widgets.patch
 bsd_volumeinfo.diff
 hurd_forkfd.diff
+xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
 mips_no_atomic.diff
 detect_64bit_atomic.diff
 qnetworkreply_abort_socket.diff
diff --git a/debian/patches/xcb-fix-yet-another-crash-when-screens-are-disconnec.patch b/debian/patches/xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
new file mode 100644
index 0000000..303120e
--- /dev/null
+++ b/debian/patches/xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
@@ -0,0 +1,37 @@
+From d72da0b4b2ee089156d1bd614523838b1635bbf5 Mon Sep 17 00:00:00 2001
+From: Shawn Rutledge <shawn.rutledge at theqtcompany.com>
+Date: Fri, 4 Sep 2015 13:27:48 +0200
+Subject: [PATCH] xcb: fix yet another crash when screens are disconnected
+
+Can't assume that m_screens is not an empty list.
+
+Task-number: QTBUG-42985
+Change-Id: I6f9422638c219123dc898813910d03c7afbd1450
+Reviewed-by: Uli Schlachter <psychon at znc.in>
+Reviewed-by: Laszlo Agocs <laszlo.agocs at theqtcompany.com>
+---
+ src/plugins/platforms/xcb/qxcbconnection.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
+index f65437f..c35b019 100644
+--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
++++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
+@@ -1300,10 +1300,12 @@ void QXcbConnection::sendConnectionEvent(QXcbAtom::Atom a, uint id)
+     memset(&event, 0, sizeof(event));
+ 
+     const xcb_window_t eventListener = xcb_generate_id(m_connection);
++    xcb_screen_iterator_t it = xcb_setup_roots_iterator(m_setup);
++    xcb_screen_t *screen = it.data;
+     Q_XCB_CALL(xcb_create_window(m_connection, XCB_COPY_FROM_PARENT,
+-                                 eventListener, m_screens.at(0)->root(),
++                                 eventListener, screen->root,
+                                  0, 0, 1, 1, 0, XCB_WINDOW_CLASS_INPUT_ONLY,
+-                                 m_screens.at(0)->screen()->root_visual, 0, 0));
++                                 screen->root_visual, 0, 0));
+ 
+     event.response_type = XCB_CLIENT_MESSAGE;
+     event.format = 32;
+-- 
+2.7.0.rc3
+

-- 
qtbase packaging