[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=05e8753

The following commit has been merged in the master branch:
commit 05e875360093db9de4dc46ad7ff243ccb159fcaf
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Wed Jul 22 18:13:06 2009 +0000

    Remove patches directory since they are all now fixed in upstream Qt, and update INSTALL to reflect this and a couple of other fixes.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1001235
---
 INSTALL                                       |  8 ++------
 patches/fix-custom-type-property-setting.diff | 29 ---------------------------
 2 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/INSTALL b/INSTALL
index 170b201..06e7d2b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,15 +1,11 @@
 This project has a cmake buildsystem which uses the KDE4 cmake macros. It will
 be very familiar to anyone who has built a KDE project before.
 
-A snapshot version of Qt 4.5 is required to compile this app. Also, due to some
-as-yet-unfixed bugs in QtDBus, the patches included in the patches directory
-will need to be applied to your copy of Qt before compiling it. Nb. these
-patches are just hacks to tide us over until the bugs are fixed upstream in Qt,
-so they *may* break other things. You have been warned...
+Qt 4.5 or later is required to compile this app.
 
 This project depends on the following packages:
     kdelibs >= 4.2 (svn://anonsvn.kde.org/home/kde/trunk/KDE/kdelibs)
-    telepathyQt4 (git://git.collabora.co.uk/git/telepathy-qt4.git)
+    telepathyQt4 >= 0.1.8 (http://telepathy.freedesktop.org/releases/telepathy-qt4/)
 
 To build, perform the usual cmake dance:
 
diff --git a/patches/fix-custom-type-property-setting.diff b/patches/fix-custom-type-property-setting.diff
deleted file mode 100644
index 16e7eee..0000000
--- a/patches/fix-custom-type-property-setting.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp
-index be0034c..8965c2d 100644
---- a/src/dbus/qdbusinternalfilters.cpp
-+++ b/src/dbus/qdbusinternalfilters.cpp
-@@ -269,9 +269,23 @@ QDBusMessage qDBusPropertySet(const QDBusConnectionPrivate::ObjectTreeNode &node
-             QDBusAdaptorConnector::AdaptorMap::ConstIterator it;
-             it = qLowerBound(connector->adaptors.constBegin(), connector->adaptors.constEnd(),
-                              interface_name);
--            if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface))
-+            if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface)) {
-+                if (value.userType() == qMetaTypeId<QDBusArgument>()) {
-+                    QDBusArgument valueArg = qvariant_cast<QDBusArgument>(value);
-+                    if (valueArg.currentType() != -1) {
-+                        int mid = it->adaptor->metaObject()->property(it->adaptor->metaObject()->indexOfProperty(property_name)).userType();
-+                        void *null = 0;
-+                        QVariant valueStore(mid, null);
-+                        QDBusMetaType::demarshall(valueArg, mid, valueStore.data());
-+
-+                        if (it->adaptor->setProperty(property_name, valueStore))
-+                            return msg.createReply();
-+                    }
-+                }
-+
-                 if (it->adaptor->setProperty(property_name, value))
-                     return msg.createReply();
-+            }
-         }
-     }
- 

-- 
ktp-accounts-kcm packaging