[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.9.0+dfsg-1-257-gb51360c
Simon Quigley
tsimonq2-guest at moszumanska.debian.org
Sun Jun 11 23:58:32 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=a83c9ae
The following commit has been merged in the ubuntu+1 branch:
commit a83c9ae309a27893cbb40e2e84c048506e4dc5bf
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date: Sun Jun 11 07:51:14 2017 -0500
Remove Merge-the-QDBusMetaType-s-custom-information-to-QDBu.patch as it was applied upstream.
---
debian/changelog | 1 +
...DBusMetaType-s-custom-information-to-QDBu.patch | 409 ---------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 410 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 50c88fd..4b1c72b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ qtbase-opensource-src (5.9.0+dfsg-1ubuntu1) UNRELEASED; urgency=medium
- vnc_big_endian.diff
- global_menu_shortcuts.diff
- Add-support-for-selecting-the-printer-plugin-via-the.patch
+ - Merge-the-QDBusMetaType-s-custom-information-to-QDBu.patch
* Change build deps from 5.8.0 to 5.7.1 because 5.8.0 never made it in
Ubuntu.
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
deleted file mode 100644
index eaad8f5..0000000
--- a/debian/patches/Merge-the-QDBusMetaType-s-custom-information-to-QDBu.patch
+++ /dev/null
@@ -1,409 +0,0 @@
-From 93eb0169cbec0de47a66c1b78b734863fb921326 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira at intel.com>
-Date: Thu, 28 Apr 2016 15:00:58 -0700
-Subject: [PATCH] Merge the QDBusMetaType's custom information to
- QDBusConnectionManager
-
-This allows us to get rid of two Q_GLOBAL_STATIC in QtDBus, which means
-fewer opportunities for screwing up the order of destruction. And since
-QDBusConnectionManager now ensures that the types are initialized, we
-don't need to re-initialize them everywhere.
-
-The Q_GLOBAL_STATIC for QDBusConnectionManager ensures the proper
-thread-safe locking, so we don't need to lock for every type that we're
-trying to register. This should make things faster.
-
-But as a side-effect, trying to register a D-Bus metatype will cause the
-QDBusConnectionManager thread to start too.
-
-Change-Id: Ifea6e497f11a461db432ffff1449a4e535234485
----
- src/dbus/qdbusconnection.cpp | 1 +
- src/dbus/qdbusconnectionmanager_p.h | 3 +-
- src/dbus/qdbusintegrator.cpp | 1 -
- src/dbus/qdbusmetatype.cpp | 185 +++++++++++++++++++-----------------
- src/dbus/qdbusmetatype_p.h | 27 +++++-
- src/dbus/qdbusmisc.cpp | 3 +-
- 6 files changed, 127 insertions(+), 93 deletions(-)
-
-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();
-+ customTypes.clear();
-
- // allow deletion from any thread without warning
- moveToThread(Q_NULLPTR);
-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"
-
- #ifndef QT_NO_DBUS
-
- QT_BEGIN_NAMESPACE
-
--class QDBusConnectionManager : public QDaemonThread
-+class QDBusConnectionManager : public QDaemonThread, public QDBusMetaTypeId
- {
- Q_OBJECT
- struct ConnectionRequestData;
-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
-
-- QDBusMetaTypeId::init();
- connect(this, &QDBusConnectionPrivate::dispatchStatusChanged,
- this, &QDBusConnectionPrivate::doDispatch, Qt::QueuedConnection);
- connect(this, &QDBusConnectionPrivate::spyHooksFinished,
-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"
--
--#include <string.h>
- #include "qdbus_symbols_p.h"
-
--#include <qbytearray.h>
--#include <qglobal.h>
--#include <qreadwritelock.h>
--#include <qvector.h>
-+#include <string.h>
-
- #include "qdbusargument_p.h"
- #include "qdbusutil_p.h"
- #include "qdbusunixfiledescriptor.h"
- #ifndef QT_BOOTSTRAPPED
-+#include "qdbusconnectionmanager_p.h"
- #include "qdbusmessage.h"
- #endif
-
-@@ -64,82 +60,72 @@
-
- QT_BEGIN_NAMESPACE
-
--class QDBusCustomTypeInfo
--{
--public:
-- QDBusCustomTypeInfo() : signature(), marshall(0), demarshall(0)
-- { }
--
-- // Suggestion:
-- // change 'signature' to char* and make QDBusCustomTypeInfo a Movable type
-- QByteArray signature;
-- QDBusMetaType::MarshallFunction marshall;
-- QDBusMetaType::DemarshallFunction demarshall;
--};
-+static void registerMarshallOperatorsNoLock(QVector<QDBusCustomTypeInfo> &ct, int id,
-+ QDBusMetaType::MarshallFunction mf,
-+ QDBusMetaType::DemarshallFunction df);
-
- template<typename T>
--inline static void registerHelper(T * = 0)
-+inline static void registerHelper(QVector<QDBusCustomTypeInfo> &ct)
- {
- void (*mf)(QDBusArgument &, const T *) = qDBusMarshallHelper<T>;
- void (*df)(const QDBusArgument &, T *) = qDBusDemarshallHelper<T>;
-- QDBusMetaType::registerMarshallOperators(qMetaTypeId<T>(),
-+ registerMarshallOperatorsNoLock(ct, qMetaTypeId<T>(),
- reinterpret_cast<QDBusMetaType::MarshallFunction>(mf),
- reinterpret_cast<QDBusMetaType::DemarshallFunction>(df));
- }
-
--void QDBusMetaTypeId::init()
-+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()) {
-- // register our types with Qt Core (calling qMetaTypeId<T>() does this implicitly)
-- (void)message();
-- (void)argument();
-- (void)variant();
-- (void)objectpath();
-- (void)signature();
-- (void)error();
-- (void)unixfd();
-+QDBusMetaTypeId::QDBusMetaTypeId()
-+{
-+ // register our types with Qt Core (calling qMetaTypeId<T>() does this implicitly)
-+ (void)message();
-+ (void)argument();
-+ (void)variant();
-+ (void)objectpath();
-+ (void)signature();
-+ (void)error();
-+ (void)unixfd();
-
- #ifndef QDBUS_NO_SPECIALTYPES
-- // and register Qt Core's with us
-- registerHelper<QDate>();
-- registerHelper<QTime>();
-- registerHelper<QDateTime>();
-- registerHelper<QRect>();
-- registerHelper<QRectF>();
-- registerHelper<QSize>();
-- registerHelper<QSizeF>();
-- registerHelper<QPoint>();
-- registerHelper<QPointF>();
-- registerHelper<QLine>();
-- registerHelper<QLineF>();
-- registerHelper<QVariantList>();
-- registerHelper<QVariantMap>();
-- registerHelper<QVariantHash>();
--
-- qDBusRegisterMetaType<QList<bool> >();
-- qDBusRegisterMetaType<QList<short> >();
-- qDBusRegisterMetaType<QList<ushort> >();
-- qDBusRegisterMetaType<QList<int> >();
-- qDBusRegisterMetaType<QList<uint> >();
-- qDBusRegisterMetaType<QList<qlonglong> >();
-- qDBusRegisterMetaType<QList<qulonglong> >();
-- qDBusRegisterMetaType<QList<double> >();
-- qDBusRegisterMetaType<QList<QDBusObjectPath> >();
-- qDBusRegisterMetaType<QList<QDBusSignature> >();
-- qDBusRegisterMetaType<QList<QDBusUnixFileDescriptor> >();
-+ // and register Qt Core's with us
-+ registerHelper<QDate>(customTypes);
-+ registerHelper<QTime>(customTypes);
-+ registerHelper<QDateTime>(customTypes);
-+ registerHelper<QRect>(customTypes);
-+ registerHelper<QRectF>(customTypes);
-+ registerHelper<QSize>(customTypes);
-+ registerHelper<QSizeF>(customTypes);
-+ registerHelper<QPoint>(customTypes);
-+ registerHelper<QPointF>(customTypes);
-+ registerHelper<QLine>(customTypes);
-+ registerHelper<QLineF>(customTypes);
-+ registerHelper<QVariantList>(customTypes);
-+ registerHelper<QVariantMap>(customTypes);
-+ registerHelper<QVariantHash>(customTypes);
-+
-+ registerHelper<QList<bool> >(customTypes);
-+ registerHelper<QList<short> >(customTypes);
-+ registerHelper<QList<ushort> >(customTypes);
-+ registerHelper<QList<int> >(customTypes);
-+ registerHelper<QList<uint> >(customTypes);
-+ registerHelper<QList<qlonglong> >(customTypes);
-+ registerHelper<QList<qulonglong> >(customTypes);
-+ registerHelper<QList<double> >(customTypes);
-+ registerHelper<QList<QDBusObjectPath> >(customTypes);
-+ registerHelper<QList<QDBusSignature> >(customTypes);
-+ registerHelper<QList<QDBusUnixFileDescriptor> >(customTypes);
- #endif
--
-- initialized.store(true);
-- }
- }
-
--Q_GLOBAL_STATIC(QVector<QDBusCustomTypeInfo>, customTypes)
--Q_GLOBAL_STATIC(QReadWriteLock, customTypesLock)
--
- /*!
-
--
qtbase packaging
More information about the pkg-kde-commits
mailing list