[SCM] qtbase packaging branch, ubuntu, updated. debian/5.5.1+dfsg-6-64-gaaae30d

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit aaae30dd8497ab8332d7983835e2fce074e8d936
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Nov 27 12:15:42 2015 +0000

    Add 4 backported patches and one other patch.
---
 debian/changelog                                   |  14 +-
 ...x-crash-on-exit-caused-by-QStringLiterals.patch |  47 ++
 ...-falsely-reported-style-for-fallback-font.patch |  55 +++
 ...fer-QT_PLUGIN_PATH-over-compiled-in-paths.patch |  70 +++
 ...orical-4-padding-in-QFontEngine-alphaMapF.patch |  45 ++
 debian/patches/enable_fonts_always_smoothly.patch  |  26 --
 .../net-bearer-nm-disconnect-ap-signals5.patch     | 519 +++++++++++++++++++++
 debian/patches/series                              |   6 +-
 8 files changed, 754 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ed6034..a8c259d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 qtbase-opensource-src (5.5.1+dfsg-6ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release. (LP: #1437206) (LP: #1450137) (LP: #1474313)
-    (LP: #1470700) (LP: #1504631) (LP: #1423659) (LP: #1474775)
+    (LP: #1470700) (LP: #1504631) (LP: #1423659) (LP: #1474775) (LP: #1508945)
   * Replace load_testability_from_env_var.patch with upstreamed
     Add-environment-variable-support-for-testability-lib.patch
   * Drop patches in upstream:
@@ -21,6 +21,18 @@ qtbase-opensource-src (5.5.1+dfsg-6ubuntu1) UNRELEASED; urgency=medium
   * debian/patches/Use-Node-name-if-Node-logicalModuleName-is-empty-for.patch:
     - Fix a qdoc issue (LP: #1447182)
   * Remove disable_overlay_scrollbars.diff as overlay scrollbars were dropped.
+  * debian/patches/Prefer-QT_PLUGIN_PATH-over-compiled-in-paths.patch:
+    - Backport. Prefer QT_PLUGIN_PATH over compiled-in paths (LP: #1519927)
+  * debian/patches/net-bearer-nm-disconnect-ap-signals5.patch:
+    - Backport. Reduce UI freezing caused by dbus signals (LP: #1480877)
+  * debian/patches/Fix-crash-on-exit-caused-by-QStringLiterals.patch
+    - Backport. Fix a crasher on exit (LP: #1436973)
+  * Replace our workaround for font rendering with new backported upstream 
+    patches:
+    - Add debian/patches/Fix-falsely-reported-style-for-fallback-font.patch
+    - Add debian/patches/Remove-historical-4-padding-in-QFontEngine-alphaMapF.patch
+    - Remove debian/patches/enable_fonts_always_smoothly.patch
+      (LP: #1475205)
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 24 Mar 2015 13:56:14 +0000
 
diff --git a/debian/patches/Fix-crash-on-exit-caused-by-QStringLiterals.patch b/debian/patches/Fix-crash-on-exit-caused-by-QStringLiterals.patch
new file mode 100644
index 0000000..fd1580e
--- /dev/null
+++ b/debian/patches/Fix-crash-on-exit-caused-by-QStringLiterals.patch
@@ -0,0 +1,47 @@
+From 041fae00351164fbd72763e4bd947fdeb9956a5d Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira at intel.com>
+Date: Thu, 20 Aug 2015 14:22:13 -0700
+Subject: [PATCH] Fix crash on exit caused by QStringLiterals
+
+These QStringLiterals are passed to QtDBus, which records them. They
+will be used even after the libQt5XcbQpa.so library is unloaded, which
+causes a crash on exit, one that even valgrind gets lost on.
+
+Change-Id: I7de033f80b0e4431b7f1ffff13fc4888e45a346a
+Reviewed-by: Albert Astals Cid <aacid at kde.org>
+Reviewed-by: Richard J. Moore <rich at kde.org>
+Reviewed-by: Frederik Gladhorn <frederik.gladhorn at theqtcompany.com>
+---
+ src/platformsupport/linuxaccessibility/dbusconnection.cpp | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/platformsupport/linuxaccessibility/dbusconnection.cpp b/src/platformsupport/linuxaccessibility/dbusconnection.cpp
+index 637b065..ae1ba18 100644
+--- a/src/platformsupport/linuxaccessibility/dbusconnection.cpp
++++ b/src/platformsupport/linuxaccessibility/dbusconnection.cpp
+@@ -47,8 +47,11 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
+-QString A11Y_SERVICE = QStringLiteral("org.a11y.Bus");
+-QString A11Y_PATH = QStringLiteral("/org/a11y/bus");
++/* note: do not change these to QStringLiteral;
++   we are unloaded before QtDBus is done using the strings.
++ */
++#define A11Y_SERVICE QLatin1String("org.a11y.Bus")
++#define A11Y_PATH QLatin1String("/org/a11y/bus")
+ 
+ /*!
+     
-- 
qtbase packaging