[SCM] qtbase packaging branch, ubuntu+1, updated. ubuntu/5.6.1+dfsg-3ubuntu2-6-ge10cc67

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu+1 branch:
commit e10cc6748eb5fb0bf893a008d76ae3ca80d2ef91
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Aug 24 08:51:28 2016 +0000

    Tweak ubuntu's arm mkspec and add a 5.6 series fix for networkmanager.
    
    * debian/patches/qt5-qmake-arm-linux-gnueabihf:
      - Support manual cross-compilation inside chroot (LP: #1580981)
    * debian/patches/Make-sure-connection-is-not-null-before-using-it.patch:
      - Fix unity8 crasher (LP: #1612309)
---
 debian/changelog                                   |  4 +++
 ...re-connection-is-not-null-before-using-it.patch | 42 ++++++++++++++++++++++
 debian/patches/qt5-qmake-arm-linux-gnueabihf       |  5 ++-
 debian/patches/series                              |  1 +
 4 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3f01a44..180769c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ qtbase-opensource-src (5.6.1+dfsg-3ubuntu3) UNRELEASED; urgency=medium
     - Fix DBus message processing (LP: #1608822) 
   * debian/patches/xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch:
     - Fix drag and drop from Qt to skype (LP: #1586857)
+  * debian/patches/qt5-qmake-arm-linux-gnueabihf:
+    - Support manual cross-compilation inside chroot (LP: #1580981) 
+  * debian/patches/Make-sure-connection-is-not-null-before-using-it.patch:
+    - Fix unity8 crasher (LP: #1612309)
 
   [ Dmitry Shachnev ]
   * Backport some upstream patches to add support for D-Bus global menus,
diff --git a/debian/patches/Make-sure-connection-is-not-null-before-using-it.patch b/debian/patches/Make-sure-connection-is-not-null-before-using-it.patch
new file mode 100644
index 0000000..c0b22ab
--- /dev/null
+++ b/debian/patches/Make-sure-connection-is-not-null-before-using-it.patch
@@ -0,0 +1,42 @@
+From 3fa18bf8816ccbbdf43eed2759c9a223cec039e8 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <albert.astals at canonical.com>
+Date: Tue, 16 Aug 2016 11:42:42 +0200
+Subject: [PATCH] Make sure connection is not null before using it
+
+connectionFromId can return null if the id isn't found.
+
+This causes crashes like http://paste.ubuntu.com/23061009/
+
+Change-Id: Ib72412f61dc7661455394679b3e90662de505920
+Reviewed-by: Lorn Potter <lorn.potter at canonical.com>
+---
+ src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
+index 42037ffb..13b64a5 100644
+--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
++++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
+@@ -218,6 +218,10 @@ void QNetworkManagerEngine::disconnectFromId(const QString &id)
+     QMutexLocker locker(&mutex);
+ 
+     QNetworkManagerSettingsConnection *connection = connectionFromId(id);
++
++    if (!connection)
++        return;
++
+     QNmSettingsMap map = connection->getSettings();
+     bool connectionAutoconnect = map.value("connection").value("autoconnect",true).toBool(); //if not present is true !!
+     if (connectionAutoconnect) { //autoconnect connections will simply be reconnected by nm
+@@ -563,7 +567,7 @@ bool QNetworkManagerEngine::isConnectionActive(const QString &settingsPath)
+     }
+ 
+     QNetworkManagerSettingsConnection *settingsConnection = connectionFromId(settingsPath);
+-    if (settingsConnection->getType() == DEVICE_TYPE_MODEM) {
++    if (settingsConnection && settingsConnection->getType() == DEVICE_TYPE_MODEM) {
+         return isActiveContext(settingsConnection->path());
+     }
+ 
+-- 
+2.8.1
+
diff --git a/debian/patches/qt5-qmake-arm-linux-gnueabihf b/debian/patches/qt5-qmake-arm-linux-gnueabihf
index d625977..aec8e9b 100644
--- a/debian/patches/qt5-qmake-arm-linux-gnueabihf
+++ b/debian/patches/qt5-qmake-arm-linux-gnueabihf
@@ -21,7 +21,7 @@ Last-Update: <YYYY-MM-DD>
 
 --- /dev/null
 +++ qtbase-opensource-src/mkspecs/ubuntu-arm-gnueabihf-g++/qmake.conf
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,34 @@
 +#
 +# qmake configuration for building with arm-linux-gnueabi-g++
 +#
@@ -51,6 +51,9 @@ Last-Update: <YYYY-MM-DD>
 +QMAKE_STRIP             = arm-linux-gnueabihf-strip
 +QMAKE_LIBDIR            = /usr/lib/arm-linux-gnueabihf
 +
++contains(DISTRO_OPTS, deb-multi-arch): \
++ PKG_CONFIG = $${CROSS_COMPILE}pkg-config
++
 +load(qt_config)
 +QMAKE_DEFAULT_INCDIRS   = /usr/include/arm-linux-gnueabihf/c++/4.9 /usr/include/arm-linux-gnueabihf/c++/4.9/backward /usr/include/arm-linux-gnueabihf
 --- /dev/null
diff --git a/debian/patches/series b/debian/patches/series
index 211e803..5b0cdac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,7 @@ dbustray_use_separate_connections.diff
 dbusmenu_exclusive_groups.diff
 qplatformmenubar_createmenu.diff
 dbusmenu_global_menu.diff
+Make-sure-connection-is-not-null-before-using-it.patch
 
 # Debian specific.
 gnukfreebsd.diff

-- 
qtbase packaging