[meego-commits] 10533: Changes to devel:telepathy/telepathy-glib

[Senko Rasic]

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

Thank You,
Senko Rasic

[This message was auto-generated]

---

Request #10533:

  submit:   home:senko:branches:devel:telepathy/telepathy-glib(r3)(cleanup) -> devel:telepathy/telepathy-glib


Message:
    temporarily undeprecate tp_bus_get() so components using it don't break builds

State:   new          2010-12-02T05:46:35 senko
Comment: None



changes files:
--------------

new:
----
  undeprecate-tp-bus-get.patch

spec files:
-----------
--- telepathy-glib.spec
+++ telepathy-glib.spec
@@ -15,6 +15,7 @@
 Source0:    http://telepathy.freedesktop.org/releases/telepathy-glib/%{name}-%{version}.tar.gz
 Source100:  telepathy-glib.yaml
 Patch0:     pkgconfig.patch
+Patch1:     undeprecate-tp-bus-get.patch
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(dbus-glib-1) >= 0.82
@@ -48,6 +49,8 @@
 
 # pkgconfig.patch
 %patch0 -p1
+# undeprecate-tp-bus-get.patch
+%patch1 -p1
 # >> setup
 # << setup
 

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

++++++ pkgconfig.patch
--- pkgconfig.patch
+++ pkgconfig.patch
@@ -6,6 +6,6 @@
  Version: @VERSION@
 -Requires: pkg-config >= 0.21
 -Requires.private: dbus-glib-1 >= 0.82, glib-2.0 >= 2.24, gobject-2.0 >= 2.24, gio-2.0 >= 2.24
-+Requires: dbus-glib-1 >= 0.82, glib-2.0 >= 2.24, gobject-2.0 >= 2.24, gio-2.0 >= 2.24
++Requires: dbus-glib-1 >= 0.82, glib-2.0 >= 2.25.16, gobject-2.0 >= 2.25.16, gio-2.0 >= 2.25.16
  Libs: -L${libdir} -ltelepathy-glib
  Cflags: -I${includedir}/telepathy-1.0

++++++ telepathy-glib.yaml
--- telepathy-glib.yaml
+++ telepathy-glib.yaml
@@ -9,6 +9,8 @@
     - http://telepathy.freedesktop.org/releases/telepathy-glib/%{name}-%{version}.tar.gz
 Patches:
     - pkgconfig.patch
+    - undeprecate-tp-bus-get.patch
+
 Description: |
     Telepathy-glib is the glib bindings for the telepathy unified framework
     for all forms of real time conversations, including instant messaging, IRC,
@@ -21,6 +23,7 @@
 PkgBR:
     - libxslt
     - python
+
 ConfigOptions:
     - --enable-static=no
 SubPackages:

++++++ undeprecate-tp-bus-get.patch (new)
--- undeprecate-tp-bus-get.patch
+++ undeprecate-tp-bus-get.patch
+diff --git a/telepathy-glib/dbus.h b/telepathy-glib/dbus.h
+--- a/telepathy-glib/dbus.h
++++ b/telepathy-glib/dbus.h
+@@ -126,8 +126,10 @@ tp_asv_get_strv (const GHashTable *asv, const gchar *key);
+ void tp_asv_set_strv (GHashTable *asv, const gchar *key, gchar **value);
+ void tp_asv_dump (GHashTable *asv);
+ 
++/* planned for deprecation (fd.o #24114) but not dead yet */
++DBusGConnection * tp_get_bus (void);
++
+ #ifndef TP_DISABLE_DEPRECATED
+-DBusGConnection * tp_get_bus (void) _TP_GNUC_DEPRECATED;
+ DBusGProxy * tp_get_bus_proxy (void) _TP_GNUC_DEPRECATED;
+ #endif
+