[meego-commits] 9449: Changes to Trunk:Testing/telepathy-qt4

[Senko Rasic]

Hi,
I have made the following changes to telepathy-qt4 in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Senko Rasic

[This message was auto-generated]

---

Request #9449:

  submit:   devel:telepathy/telepathy-qt4(r2)(update) -> Trunk:Testing/telepathy-qt4


Message:
    Update to upstream 0.3.14 (up to date components needed for FEA#7636)

State:   new          2010-11-12T04:27:49 senko
Comment: None



changes files:
--------------
--- telepathy-qt4.changes
+++ telepathy-qt4.changes
@@ -0,0 +1,10 @@
+* Fri Nov 12 2010 Senko Rasic <senko.rasic at collabora.co.uk> - 0.3.14
+- Update to upstream 0.3.14
+  + port build system from autotools to cmake
+  + update to telepathy spec 0.19.8
+  + support several new Telepathy interfaces
+  + a lot of enhancements and bug fixes
+- Deprecate fix_glib_ftbfs.patch
+- Add telepathy-qt4-remove-qtdbusvariant-hack.patch
+- Removed unneccessary Makefile
+

old:
----
  Makefile
  fix_glib_ftbfs.patch
  telepathy-qt4-0.2.2.tar.gz

new:
----
  telepathy-qt4-0.3.14.tar.gz
  telepathy-qt4-remove-qtdbusvariant-hack.patch

spec files:
-----------
--- telepathy-qt4.spec
+++ telepathy-qt4.spec
@@ -1,31 +1,34 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.18
+# Generated by: spectacle version 0.20
 # 
 # >> macros
 # << macros
 
 Name:       telepathy-qt4
 Summary:    Qt 4 Telepathy library
-Version:    0.2.2
+Version:    0.3.14
 Release:    1
 Group:      System/Libraries
 License:    GPLv2
 URL:        http://telepathy.freedesktop.org/wiki/
 Source0:    http://telepathy.freedesktop.org/releases/telepathy-qt4/%{name}-%{version}.tar.gz
 Source100:  telepathy-qt4.yaml
-Patch0:     fix_glib_ftbfs.patch
+Patch0:     telepathy-qt4-remove-qtdbusvariant-hack.patch
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(QtCore) >= 4.6.0
 BuildRequires:  pkgconfig(QtDBus)
 BuildRequires:  pkgconfig(farsight2-0.10)
 BuildRequires:  pkgconfig(telepathy-farsight)
-BuildRequires:  pkgconfig(telepathy-glib)
+BuildRequires:  pkgconfig(telepathy-glib) >= 0.11.16
 BuildRequires:  pkgconfig(gstreamer-0.10)
 BuildRequires:  pkgconfig(gstreamer-interfaces-0.10)
+BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  python
+BuildRequires:  dbus-python
 BuildRequires:  doxygen
+BuildRequires:  cmake
 
 
 %description
@@ -74,7 +77,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 
-# fix_glib_ftbfs.patch
+# telepathy-qt4-remove-qtdbusvariant-hack.patch
 %patch0 -p1
 # >> setup
 # << setup
@@ -82,9 +85,7 @@
 %build
 # >> build pre
 # << build pre
-
-%autogen --disable-static
-make %{?jobs:-j%jobs}
+%cmake
 
 # >> build post
 # << build post

other changes:
--------------

++++++ telepathy-qt4-0.2.2.tar.gz -> telepathy-qt4-0.3.14.tar.gz
360501 lines of diff (skipped)

++++++ telepathy-qt4-remove-qtdbusvariant-hack.patch (new)
--- telepathy-qt4-remove-qtdbusvariant-hack.patch
+++ telepathy-qt4-remove-qtdbusvariant-hack.patch
+diff --git a/TelepathyQt4/types.cpp b/TelepathyQt4/types.cpp
+index ac50c87..2097dd4 100644
+--- a/TelepathyQt4/types.cpp
++++ b/TelepathyQt4/types.cpp
+@@ -24,18 +24,6 @@
+ 
+ #include <TelepathyQt4/types-internal.h>
+ 
+-#ifndef HAVE_QDBUSVARIANT_OPERATOR_EQUAL
+-
+-/* FIXME This is a workaround that should be removed when Qt has support for
+- *       this. There is already a merge request
+- *       (http://qt.gitorious.org/qt/qt/merge_requests/1657) in place and the
+- *       fix should be in next Qt versions.
+- */
+-inline bool operator==(const QDBusVariant &v1, const QDBusVariant &v2)
+-{ return v1.variant() == v2.variant(); }
+-
+-#endif
+-
+ #include "TelepathyQt4/_gen/types-body.hpp"
+ 
+ #include "TelepathyQt4/future-internal.h"

++++++ telepathy-qt4.yaml
--- telepathy-qt4.yaml
+++ telepathy-qt4.yaml
@@ -1,6 +1,6 @@
 Name: telepathy-qt4
 Summary: Qt 4 Telepathy library
-Version: 0.2.2
+Version: 0.3.14
 Release: 1
 Group: System/Libraries
 License: GPLv2
@@ -10,18 +10,21 @@
 Description: |
     Qt-based library for Telepathy components.
 Patches:
-    - fix_glib_ftbfs.patch
+    - telepathy-qt4-remove-qtdbusvariant-hack.patch
 PkgConfigBR:
     - QtCore >= 4.6.0
     - QtDBus
     - farsight2-0.10
     - telepathy-farsight
-    - telepathy-glib
+    - telepathy-glib >= 0.11.16
     - gstreamer-0.10
     - gstreamer-interfaces-0.10
+    - libxml-2.0
 PkgBR:
     - python
+    - dbus-python
     - doxygen
+    - cmake
 Configure: autogen
 SubPackages:
     - Name: devel

++++++ deleted files:
--- Makefile
--- fix_glib_ftbfs.patch