[SCM] qtbase packaging branch, experimental, updated. debian/5.6.0-beta+dfsg-4-36-gb858859

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit b8588590541ce33b200e223c514c9fc4182dfe8c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Feb 15 15:02:07 2016 -0300

    Merge master to experimental.
---
 debian/changelog                                   |  2 +-
 .../patches/fix_potential_division_by_zero.patch   | 29 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6c2d26..31b001c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ qtbase-opensource-src (5.6.0~beta+dfsg-5) UNRELEASED; urgency=medium
       the experimental version have a proper package update.
   * Remove the transitional package libqt5xcbqpa5, their only rdeps
     lived in sid/testing and already removed it.
-  * Merge 5.5.1+dfsg-14 from master, importing the patches added there.
+  * Merge 5.5.1+dfsg-14 from master, importing fix_not_delivering_focus.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 08 Jan 2016 12:17:40 -0300
 
diff --git a/debian/patches/fix_potential_division_by_zero.patch b/debian/patches/fix_potential_division_by_zero.patch
deleted file mode 100644
index 40c4013..0000000
--- a/debian/patches/fix_potential_division_by_zero.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 79447068579ea93d616d840bb8cbbf8adb1ed6ec Mon Sep 17 00:00:00 2001
-From: Nicolas Capens <capn at google.com>
-Date: Tue, 10 Nov 2015 00:03:34 -0500
-Subject: [PATCH] Fix potential division by zero.
-
-In a Chrome Remote Desktop session the htotal and/or vtotal timings
-can be zero and lead to a SIGFPE exception.
-
-Task-number: QTBUG-49322
-Change-Id: Id530335cc760d1938ed888ad095427fcf32c651d
-Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen at theqtcompany.com>
-Reviewed-by: Nicolas Capens <nicolas.capens at gmail.com>
-Reviewed-by: Gatis Paeglis <gatis.paeglis at theqtcompany.com>
----
- src/plugins/platforms/xcb/qxcbscreen.cpp |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/src/plugins/platforms/xcb/qxcbscreen.cpp
-+++ b/src/plugins/platforms/xcb/qxcbscreen.cpp
-@@ -544,7 +544,8 @@ void QXcbScreen::updateRefreshRate(xcb_r
-         for (; modesIter.rem; xcb_randr_mode_info_next(&modesIter)) {
-             xcb_randr_mode_info_t *modeInfo = modesIter.data;
-             if (modeInfo->id == mode) {
--                m_refreshRate = modeInfo->dot_clock / (modeInfo->htotal * modeInfo->vtotal);
-+                const uint32_t dotCount = modeInfo->htotal * modeInfo->vtotal;
-+                m_refreshRate = (dotCount != 0) ? modeInfo->dot_clock / dotCount : 0;
-                 m_mode = mode;
-                 break;
-             }
diff --git a/debian/patches/series b/debian/patches/series
index 4b935b5..7e30bb0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@ multiscreen.diff
 xcb_dont_select_XInput_events_on_root_window.patch
 xcb_fix_drag_and_drop_when_window_is_hidden.patch
 fix_not_delivering_focus.patch
-fix_potential_division_by_zero.patch
 
 # Debian specific.
 gnukfreebsd.diff

-- 
qtbase packaging