[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.8.0+dfsg-3-244-g2a190a3
Timo Jyrinki
timo at moszumanska.debian.org
Tue Mar 7 12:41:32 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=2a190a3
The following commit has been merged in the ubuntu+1 branch:
commit 2a190a34dabe3dcff064f36f719c5c947094e4e2
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Tue Mar 7 12:41:20 2017 +0000
Rebase some of the patches, remove one unneeded one.
---
...-for-selecting-the-printer-plugin-via-the.patch | 10 +--
...arer-QFactoryLoader-a-member-variable-not.patch | 86 -------------------
...DBusMetaType-s-custom-information-to-QDBu.patch | 98 +++++++++++-----------
debian/patches/global_menu_shortcuts.diff | 2 +-
...qdbus-tray-icon-always-save-icon-in-unity.patch | 4 +-
.../patches/qdbus-tray-icon-use-runtimedir.patch | 4 +-
debian/patches/series | 5 +-
7 files changed, 59 insertions(+), 150 deletions(-)
diff --git a/debian/patches/Add-support-for-selecting-the-printer-plugin-via-the.patch b/debian/patches/Add-support-for-selecting-the-printer-plugin-via-the.patch
index e3f28f9..c4e5592 100644
--- a/debian/patches/Add-support-for-selecting-the-printer-plugin-via-the.patch
+++ b/debian/patches/Add-support-for-selecting-the-printer-plugin-via-the.patch
@@ -11,19 +11,19 @@ Reviewed-by: Andy Shaw <andy.shaw at qt.io>
src/printsupport/kernel/qplatformprintplugin.cpp | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
-Index: qtbase-opensource-src-5.7.1/src/printsupport/kernel/qplatformprintplugin.cpp
+Index: qtbase-opensource-src-5.8.0/src/printsupport/kernel/qplatformprintplugin.cpp
===================================================================
---- qtbase-opensource-src-5.7.1.orig/src/printsupport/kernel/qplatformprintplugin.cpp
-+++ qtbase-opensource-src-5.7.1/src/printsupport/kernel/qplatformprintplugin.cpp
+--- qtbase-opensource-src-5.8.0.orig/src/printsupport/kernel/qplatformprintplugin.cpp
++++ qtbase-opensource-src-5.8.0/src/printsupport/kernel/qplatformprintplugin.cpp
@@ -42,6 +42,7 @@
#include "qprinterinfo.h"
#include "private/qfactoryloader_p.h"
#include <qcoreapplication.h>
+#include <qdebug.h>
- QT_BEGIN_NAMESPACE
+ #ifndef QT_NO_PRINTER
-@@ -77,8 +78,17 @@ QPlatformPrinterSupport *QPlatformPrinte
+@@ -79,8 +80,17 @@ QPlatformPrinterSupport *QPlatformPrinte
{
if (!printerSupport) {
const QMultiMap<int, QString> keyMap = loader()->keyMap();
diff --git a/debian/patches/Make-the-bearer-QFactoryLoader-a-member-variable-not.patch b/debian/patches/Make-the-bearer-QFactoryLoader-a-member-variable-not.patch
deleted file mode 100644
index e6fdb0f..0000000
--- a/debian/patches/Make-the-bearer-QFactoryLoader-a-member-variable-not.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 45b484dee691671fc125e418b1f40815a07880ff Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira at intel.com>
-Date: Tue, 27 Sep 2016 16:52:55 -0700
-Subject: [PATCH] Make the bearer QFactoryLoader a member variable, not a
- static
-
-Because it was a Q_GLOBAL_STATIC, the QFactoryLoader was getting
-destroyed out-of-sync with the bearer thread stopping. Under normal
-conditions, the thread stopped first (~QApplication / ~QCoreApplication
-via qAddPostRoutine), and the static got destroyed when the process
-exited. However, if QApplication leaked or if the destruction order is
-wonky (as seen in PyQt5), the thread could still be running when the
-plugins were already unloaded.
-
-With the loader a member variable, it gets destroyed when the thread
-stops.
-
-Note: in Qt 5.7, QFactoryLoader no longer unloads the plugins (since
-commit 494376f980e96339b6f1eff7c41336ca4d853065), so this crash cannot
-happen in that version. This commit also revises the fix from commit
-6be65702f8922084c1b8da2ed04b2729340f0a6b that went into 5.7.0.
-
-[ChangeLog][QtNetwork][Bearer management] Fixed a bug that could cause a
-crash on application exit, depending on the order of destruction of the
-QCoreApplication object and the QtDBus manager thread.
-
-Task-number: QTBUG-56228
-Task-number: QTBUG-52988
-Change-Id: I33dc971f005a4848bb8ffffd147853376f82de2a
----
- src/network/bearer/qnetworkconfigmanager_p.cpp | 13 ++++---------
- src/network/bearer/qnetworkconfigmanager_p.h | 2 ++
- 2 files changed, 6 insertions(+), 9 deletions(-)
-
-Index: qtbase-opensource-src-5.7.1/src/network/bearer/qnetworkconfigmanager_p.cpp
-===================================================================
---- qtbase-opensource-src-5.7.1.orig/src/network/bearer/qnetworkconfigmanager_p.cpp
-+++ qtbase-opensource-src-5.7.1/src/network/bearer/qnetworkconfigmanager_p.cpp
-@@ -40,8 +40,6 @@
- #include "qnetworkconfigmanager_p.h"
- #include "qbearerplugin_p.h"
-
--#include <QtCore/private/qfactoryloader_p.h>
--
- #include <QtCore/qdebug.h>
- #include <QtCore/qtimer.h>
- #include <QtCore/qstringlist.h>
-@@ -60,7 +58,9 @@
- QT_BEGIN_NAMESPACE
-
- QNetworkConfigurationManagerPrivate::QNetworkConfigurationManagerPrivate()
-- : QObject(), pollTimer(0), mutex(QMutex::Recursive), forcedPolling(0), firstUpdate(true)
-+ : QObject(), pollTimer(0), mutex(QMutex::Recursive),
-+ loader(QBearerEngineFactoryInterface_iid, QLatin1String("/bearer")),
-+ forcedPolling(0), firstUpdate(true)
- {
- qRegisterMetaType<QNetworkConfiguration>();
- qRegisterMetaType<QNetworkConfigurationPrivatePointer>();
-@@ -365,7 +365,6 @@ void QNetworkConfigurationManagerPrivate
- bool envOK = false;
- const int skipGeneric = qEnvironmentVariableIntValue("QT_EXCLUDE_GENERIC_BEARER", &envOK);
- QBearerEngine *generic = 0;
-- static QFactoryLoader loader(QBearerEngineFactoryInterface_iid, QLatin1String("/bearer"));
- QFactoryLoader *l = &loader;
- const PluginKeyMap keyMap = l->keyMap();
- const PluginKeyMapConstIterator cend = keyMap.constEnd();
-Index: qtbase-opensource-src-5.7.1/src/network/bearer/qnetworkconfigmanager_p.h
-===================================================================
---- qtbase-opensource-src-5.7.1.orig/src/network/bearer/qnetworkconfigmanager_p.h
-+++ qtbase-opensource-src-5.7.1/src/network/bearer/qnetworkconfigmanager_p.h
-@@ -54,6 +54,7 @@
- #include "qnetworkconfigmanager.h"
- #include "qnetworkconfiguration_p.h"
-
-+#include <QtCore/private/qfactoryloader_p.h>
- #include <QtCore/qmutex.h>
- #include <QtCore/qset.h>
-
-@@ -117,6 +118,7 @@ private:
- private:
- mutable QMutex mutex;
-
-+ QFactoryLoader loader;
- QList<QBearerEngine *> sessionEngines;
-
- QSet<QString> onlineConfigurations;
diff --git a/debian/patches/Merge-the-QDBusMetaType-s-custom-information-to-QDBu.patch b/debian/patches/Merge-the-QDBusMetaType-s-custom-information-to-QDBu.patch
index 554202f..eaad8f5 100644
--- a/debian/patches/Merge-the-QDBusMetaType-s-custom-information-to-QDBu.patch
+++ b/debian/patches/Merge-the-QDBusMetaType-s-custom-information-to-QDBu.patch
@@ -26,11 +26,11 @@ Change-Id: Ifea6e497f11a461db432ffff1449a4e535234485
src/dbus/qdbusmisc.cpp | 3 +-
6 files changed, 127 insertions(+), 93 deletions(-)
-diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
-index 34b3da7..4db6396 100644
---- a/src/dbus/qdbusconnection.cpp
-+++ b/src/dbus/qdbusconnection.cpp
-@@ -193,6 +193,7 @@ void QDBusConnectionManager::run()
+Index: qtbase-opensource-src-5.8.0/src/dbus/qdbusconnection.cpp
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/src/dbus/qdbusconnection.cpp
++++ qtbase-opensource-src-5.8.0/src/dbus/qdbusconnection.cpp
+@@ -182,6 +182,7 @@ void QDBusConnectionManager::run()
}
}
connectionHash.clear();
@@ -38,13 +38,13 @@ index 34b3da7..4db6396 100644
// allow deletion from any thread without warning
moveToThread(Q_NULLPTR);
-diff --git a/src/dbus/qdbusconnectionmanager_p.h b/src/dbus/qdbusconnectionmanager_p.h
-index c0ab48e..97ecc74 100644
---- a/src/dbus/qdbusconnectionmanager_p.h
-+++ b/src/dbus/qdbusconnectionmanager_p.h
-@@ -48,13 +48,14 @@
- #define QDBUSCONNECTIONMANAGER_P_H
+Index: qtbase-opensource-src-5.8.0/src/dbus/qdbusconnectionmanager_p.h
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/src/dbus/qdbusconnectionmanager_p.h
++++ qtbase-opensource-src-5.8.0/src/dbus/qdbusconnectionmanager_p.h
+@@ -55,13 +55,14 @@
+ #include <QtDBus/private/qtdbusglobal_p.h>
#include "qdbusconnection_p.h"
+#include "qdbusmetatype_p.h"
#include "private/qthread_p.h"
@@ -58,11 +58,11 @@ index c0ab48e..97ecc74 100644
{
Q_OBJECT
struct ConnectionRequestData;
-diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
-index 3be775d..37d2ae1 100644
---- a/src/dbus/qdbusintegrator.cpp
-+++ b/src/dbus/qdbusintegrator.cpp
-@@ -1019,7 +1019,6 @@ QDBusConnectionPrivate::QDBusConnectionPrivate(QObject *p)
+Index: qtbase-opensource-src-5.8.0/src/dbus/qdbusintegrator.cpp
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/src/dbus/qdbusintegrator.cpp
++++ qtbase-opensource-src-5.8.0/src/dbus/qdbusintegrator.cpp
+@@ -1036,7 +1036,6 @@ QDBusConnectionPrivate::QDBusConnectionP
qdbusThreadDebug = qdbusDefaultThreadDebug;
#endif
@@ -70,11 +70,11 @@ index 3be775d..37d2ae1 100644
connect(this, &QDBusConnectionPrivate::dispatchStatusChanged,
this, &QDBusConnectionPrivate::doDispatch, Qt::QueuedConnection);
connect(this, &QDBusConnectionPrivate::spyHooksFinished,
-diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp
-index 2aaf0e2..ce0d0c8 100644
---- a/src/dbus/qdbusmetatype.cpp
-+++ b/src/dbus/qdbusmetatype.cpp
-@@ -33,19 +34,15 @@
+Index: qtbase-opensource-src-5.8.0/src/dbus/qdbusmetatype.cpp
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/src/dbus/qdbusmetatype.cpp
++++ qtbase-opensource-src-5.8.0/src/dbus/qdbusmetatype.cpp
+@@ -39,19 +39,15 @@
#include "qdbusmetatype.h"
#include "qdbusmetatype_p.h"
@@ -96,7 +96,7 @@ index 2aaf0e2..ce0d0c8 100644
#include "qdbusmessage.h"
#endif
-@@ -58,82 +55,72 @@
+@@ -64,82 +60,72 @@
QT_BEGIN_NAMESPACE
@@ -132,7 +132,14 @@ index 2aaf0e2..ce0d0c8 100644
+QDBusMetaTypeId *QDBusMetaTypeId::instance()
{
- static QBasicAtomicInt initialized = Q_BASIC_ATOMIC_INITIALIZER(false);
--
++#ifdef QT_BOOTSTRAPPED
++ static QDBusMetaTypeId self;
++ return &self;
++#else
++ return QDBusConnectionManager::instance();
++#endif
++}
+
- // reentrancy is not a problem since everything else is locked on their own
- // set the guard variable at the end
- if (!initialized.load()) {
@@ -144,14 +151,6 @@ index 2aaf0e2..ce0d0c8 100644
- (void)signature();
- (void)error();
- (void)unixfd();
-+#ifdef QT_BOOTSTRAPPED
-+ static QDBusMetaTypeId self;
-+ return &self;
-+#else
-+ return QDBusConnectionManager::instance();
-+#endif
-+}
-+
+QDBusMetaTypeId::QDBusMetaTypeId()
+{
+ // register our types with Qt Core (calling qMetaTypeId<T>() does this implicitly)
@@ -230,7 +229,7 @@ index 2aaf0e2..ce0d0c8 100644
/*!
--
qtbase packaging
More information about the pkg-kde-commits
mailing list