| 1 |
yngwin 13/03/02 15:26:24 |
| 2 |
|
| 3 |
Added: qtdbus-4.8.4-qdbusconnection-silence-warning.patch |
| 4 |
qtdbus-4.7-qdbusintegrator-no-const.patch |
| 5 |
Log: |
| 6 |
Move to new dev-qt category |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha164/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x2B2474AD43CE296E!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-qt/qtdbus/files/qtdbus-4.8.4-qdbusconnection-silence-warning.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdbus/files/qtdbus-4.8.4-qdbusconnection-silence-warning.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdbus/files/qtdbus-4.8.4-qdbusconnection-silence-warning.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: qtdbus-4.8.4-qdbusconnection-silence-warning.patch |
| 17 |
=================================================================== |
| 18 |
diff -up qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug.patch qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp |
| 19 |
--- qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug.patch 2012-09-06 02:33:44.000000000 -0500 |
| 20 |
+++ qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp 2012-09-11 08:55:29.854026815 -0500 |
| 21 |
@@ -1109,8 +1109,10 @@ public: |
| 22 |
// make sure this connection is running on the main thread |
| 23 |
QCoreApplication *instance = QCoreApplication::instance(); |
| 24 |
if (!instance) { |
| 25 |
+#ifndef QT_NO_DEBUG |
| 26 |
qWarning("QDBusConnection: %s D-Bus connection created before QCoreApplication. Application may misbehave.", |
| 27 |
type == SessionBus ? "session" : type == SystemBus ? "system" : "generic"); |
| 28 |
+#endif |
| 29 |
} else if (QDBusConnectionPrivate::d(*this)) { |
| 30 |
QDBusConnectionPrivate::d(*this)->moveToThread(instance->thread()); |
| 31 |
} |
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.1 dev-qt/qtdbus/files/qtdbus-4.7-qdbusintegrator-no-const.patch |
| 36 |
|
| 37 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdbus/files/qtdbus-4.7-qdbusintegrator-no-const.patch?rev=1.1&view=markup |
| 38 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdbus/files/qtdbus-4.7-qdbusintegrator-no-const.patch?rev=1.1&content-type=text/plain |
| 39 |
|
| 40 |
Index: qtdbus-4.7-qdbusintegrator-no-const.patch |
| 41 |
=================================================================== |
| 42 |
--- src/dbus/qdbusintegrator.cpp.orig 2011-03-12 02:11:32.313467991 +0100 |
| 43 |
+++ src/dbus/qdbusintegrator.cpp 2011-03-12 02:11:03.795809176 +0100 |
| 44 |
@@ -71,7 +71,7 @@ |
| 45 |
static bool isDebugging; |
| 46 |
#define qDBusDebug if (!::isDebugging); else qDebug |
| 47 |
|
| 48 |
-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) |
| 49 |
+Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) |
| 50 |
|
| 51 |
static inline QString dbusServiceString() |
| 52 |
{ return *orgFreedesktopDBusString(); } |
Archives