rpms/qt/devel qt-everywhere-opensource-src-4.6.0-QTBUG-5972.patch, NONE, 1.1 qt.spec, 1.357, 1.358

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19739

Modified Files:
	qt.spec 
Added Files:
	qt-everywhere-opensource-src-4.6.0-QTBUG-5972.patch 
Log Message:
Stop using the NameOwnerChanged signal without arg0 in QtDBus itself



qt-everywhere-opensource-src-4.6.0-QTBUG-5972.patch:
 qdbusconnection.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE qt-everywhere-opensource-src-4.6.0-QTBUG-5972.patch ---
>From a06da644f9293424f0f537c1d9288796403cd979 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira at nokia.com>
Date: Thu, 19 Nov 2009 10:01:47 +0100
Subject: [PATCH] Revert "Stop using the NameOwnerChanged signal without arg0 in QtDBus itself"

This partially reverts commit 1176ecf0b533279e5a1c97f183e5c5f1c57fb188.

Task-number: QTBUG-5972
(cherry picked from commit db1cff73726ff12d50139769dc8071f9e9173261)
---
 src/dbus/qdbusconnection.cpp |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index b2a88ef..79ac8de 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -1005,6 +1005,9 @@ void QDBusConnectionPrivate::setBusService(const QDBusConnection &connection)
     busService = new QDBusConnectionInterface(connection, this);
     ref.deref(); // busService has increased the refcounting to us
                  // avoid cyclic refcounting
+//    if (mode != PeerMode)
+    QObject::connect(busService, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
+                     this, SIGNAL(serviceOwnerChanged(QString,QString,QString)));
 
     QObject::connect(this, SIGNAL(callWithCallbackFailed(QDBusError,QDBusMessage)),
                      busService, SIGNAL(callWithCallbackFailed(QDBusError,QDBusMessage)),
-- 
1.6.1



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -p -r1.357 -r1.358
--- qt.spec	1 Dec 2009 12:31:32 -0000	1.357
+++ qt.spec	4 Dec 2009 12:37:55 -0000	1.358
@@ -13,7 +13,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -79,6 +79,7 @@ Patch210: 0010-Fix-error-line-not-to-hav
 Patch211: 0011-Fill-gap-of-X.org-XFree-multimedia-special-launcher-.patch
 Patch212: 0012-Add-context-to-tr-calls-in-QShortcut.patch
 Patch213: 0013-Fix-QNativeImage-constructor.patch
+Patch214: qt-everywhere-opensource-src-4.6.0-QTBUG-5972.patch
 
 Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
 Source11: hi16-phonon-gstreamer.png
@@ -433,6 +434,7 @@ Qt libraries used for drawing widgets an
 #patch211 -p1 -b .kde-qt-0011
 %patch212 -p1 -b .kde-qt-0012
 #patch213 -p1 -b .kde-qt-0013
+%patch214 -p1 -b .QTBUG-5972
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -1017,6 +1019,9 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.6.0-2
+- Stop using the NameOwnerChanged signal without arg0 in QtDBus itself
+
 * Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.6.0-1
 - 4.6.0