rpms/telepathy-gabble/devel telepathy-gabble-0.7.7-assertion.patch, NONE, 1.1 telepathy-gabble.spec, 1.37, 1.38

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv669

Modified Files:
	telepathy-gabble.spec 
Added Files:
	telepathy-gabble-0.7.7-assertion.patch 
Log Message:
* Thu Aug  7 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.7-2
- Add patch to fix assertion. (#457659)


telepathy-gabble-0.7.7-assertion.patch:

--- NEW FILE telepathy-gabble-0.7.7-assertion.patch ---
Mon Aug  4 19:57:46 BST 2008  Simon McVittie <simon.mcvittie at collabora.co.uk>
  * Use pedantically correct marshaller for a GArray, because GObject 2.17 actually checks for this :-(
--- old-telepathy-gabble/src/presence-cache.c	2008-08-07 18:02:13.034234273 +0100
+++ new-telepathy-gabble/src/presence-cache.c	2008-08-07 18:02:13.442259773 +0100
@@ -297,7 +297,7 @@
     G_SIGNAL_RUN_LAST,
     0,
     NULL, NULL,
-    g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, DBUS_TYPE_G_UINT_ARRAY);
+    g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, DBUS_TYPE_G_UINT_ARRAY);
   signals[NICKNAME_UPDATE] = g_signal_new (
     "nickname-update",
     G_TYPE_FROM_CLASS (klass),



Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- telepathy-gabble.spec	31 Jul 2008 23:52:23 -0000	1.37
+++ telepathy-gabble.spec	7 Aug 2008 17:20:04 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           telepathy-gabble
 Version:        0.7.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -8,6 +8,7 @@
 License:        LGPLv2+ and (BSD)
 URL:            http://telepathy.freedesktop.org/wiki/
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
+Patch0:		%{name}-%{version}-assertion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel >= 1.1.0
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .assertion
 
 
 %build
@@ -55,8 +57,10 @@
 %{_mandir}/man8/%{name}.8.gz
 
 
-
 %changelog
+* Thu Aug  7 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.7-2
+- Add patch to fix assertion. (#457659)
+
 * Thu Jul 31 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.7-1
 - Update to 0.7.7.
 - Bump min version of tp-glib needed.