[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.6.1+dfsg-3ubuntu2-10-ge76670e

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 3d3a452edfd9fee716663e389dbe3bb348701375
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jul 18 07:43:36 2016 +0000

    Rebase patches for 5.6.1, and drop the following:
    
    * Rebase patches for 5.6.1, and drop the following:
      - Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch: upstreamed
      - debian/patches/detect-indicator-application.diff: upstreamed
      - debian/patches/fix-duplicate-qnam-finished.patch: folded in to the
        remaining parts of qnam-ubuntu-fix6.patch, half of which were upstreamed
        in Qt 5.6.1
---
 debian/changelog                                   |   6 +
 ...-Mali-T760-Mali-T720-from-supporting-BGRA.patch |  41 ----
 debian/patches/detect-indicator-application.diff   |  63 ------
 debian/patches/enable-tests.patch                  |  17 +-
 debian/patches/fix-duplicate-qnam-finished.patch   |  53 -----
 debian/patches/qnam-ubuntu-fix6.patch              | 238 +--------------------
 debian/patches/series                              |   6 -
 7 files changed, 16 insertions(+), 408 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f5a3d77..ef9566b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,12 @@ qtbase-opensource-src (5.6.1+dfsg-3ubuntu1) UNRELEASED; urgency=medium
     - Fixed differently in Qt 5.6.
   * Tests enablement for Qt 5.6.
   * Add arm64 to gles archs.
+  * Rebase patches for 5.6.1, and drop the following:
+    - Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch: upstreamed
+    - debian/patches/detect-indicator-application.diff: upstreamed
+    - debian/patches/fix-duplicate-qnam-finished.patch: folded in to the 
+      remaining parts of qnam-ubuntu-fix6.patch, half of which were upstreamed 
+      in Qt 5.6.1
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 18 Jan 2016 10:06:17 +0000
 
diff --git a/debian/patches/Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch b/debian/patches/Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch
deleted file mode 100644
index 9767f82..0000000
--- a/debian/patches/Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 87715cc4917e0edcc1090658ea09be508f47f3b7 Mon Sep 17 00:00:00 2001
-From: Timo Jyrinki <timo.jyrinki at canonical.com>
-Date: Wed, 23 Mar 2016 09:41:50 +0000
-Subject: [PATCH] Blacklist Mali-T760/Mali-T720 from supporting BGRA.
-
-Extend the blacklist with Mali-T760 and Mali-T720 as found on Meizu
-Pro 5 and Bq Aquaris M10 Ubuntu Editions. Reading from FBO like
-taking screenshots does not produce correct result otherwise.
-
-Initially reported at: https://launchpad.net/bugs/1557915 and
-https://launchpad.net/bugs/1559906
-
-Change-Id: Ic875bd083277bf933863a3a50f8e874dd6e04365
-Reviewed-by: Laszlo Agocs <laszlo.agocs at theqtcompany.com>
----
- src/gui/opengl/qopenglframebufferobject.cpp | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp
-index 5184283..0e1074f 100644
---- a/src/gui/opengl/qopenglframebufferobject.cpp
-+++ b/src/gui/opengl/qopenglframebufferobject.cpp
-@@ -1281,9 +1281,13 @@ static inline QImage qt_gl_read_framebuffer_rgba8(const QSize &size, bool includ
-     const char *renderer = reinterpret_cast<const char *>(funcs->glGetString(GL_RENDERER));
-     const char *ver = reinterpret_cast<const char *>(funcs->glGetString(GL_VERSION));
- 
--    // Blacklist PowerVR Rogue G6200 as it has problems with its BGRA support.
-+    // Blacklist GPU chipsets that have problems with their BGRA support.
-     const bool blackListed = (qstrcmp(renderer, "PowerVR Rogue G6200") == 0
--                             && ::strstr(ver, "1.3") != 0);
-+                             && ::strstr(ver, "1.3") != 0) ||
-+                             (qstrcmp(renderer, "Mali-T760") == 0
-+                             && ::strstr(ver, "3.1") != 0) ||
-+                             (qstrcmp(renderer, "Mali-T720") == 0
-+                             && ::strstr(ver, "3.1") != 0);
- 
-     const bool supports_bgra = has_bgra_ext && !blackListed;
- 
--- 
-2.7.4
-
diff --git a/debian/patches/detect-indicator-application.diff b/debian/patches/detect-indicator-application.diff
deleted file mode 100644
index 0c4739e..0000000
--- a/debian/patches/detect-indicator-application.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: dbustray: implement better detection of indicator-application
- We need to do the icon cache trick all desktops using indicator-application,
- these are not limited to Unity. For example, the default Xubuntu and Lubuntu
- desktops use indicator-application too.
- .
- Without this, tray icons will be improperly shown on these desktops.
-Origin: upstream, http://code.qt.io/cgit/qt/qtbase.git/commit/?id=f156c33c2739d84b
-Last-Update: 2016-04-12
-
---- a/src/corelib/io/qlockfile_p.h
-+++ b/src/corelib/io/qlockfile_p.h
-@@ -75,7 +75,8 @@
-     // Returns 
-- 
qtbase packaging