summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authordholland <dholland>2012-05-07 18:54:44 +0000
committerdholland <dholland>2012-05-07 18:54:44 +0000
commit86cd21ed4c70dd1005836e2134b70a6071cdb850 (patch)
tree89e716ad072eb99db6f626166555312b8b883e92 /chat
parent0eb8322e02ac6e69ed0cf92a89b0a4622912c688 (diff)
downloadpkgsrc-86cd21ed4c70dd1005836e2134b70a6071cdb850.tar.gz
g_source_get_current_time is deprecated, and now fails in current glib2.
Diffstat (limited to 'chat')
-rw-r--r--chat/telepathy-gabble/distinfo3
-rw-r--r--chat/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-heartbeat-source_c25
2 files changed, 27 insertions, 1 deletions
diff --git a/chat/telepathy-gabble/distinfo b/chat/telepathy-gabble/distinfo
index f9b016f500a..9778052023e 100644
--- a/chat/telepathy-gabble/distinfo
+++ b/chat/telepathy-gabble/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.13 2012/02/16 15:50:15 hans Exp $
+$NetBSD: distinfo,v 1.14 2012/05/07 18:54:44 dholland Exp $
SHA1 (telepathy-gabble-0.11.10.tar.gz) = 26ca4e8a98b01b78007f88caea56b08ae5070fdd
RMD160 (telepathy-gabble-0.11.10.tar.gz) = b4906a01b8cc6e6630e1707e97250bcdefeac9c4
Size (telepathy-gabble-0.11.10.tar.gz) = 3443486 bytes
SHA1 (patch-lib_ext_wocky_examples_connect.c) = 4f22cadb5e39f68630c3d09671aaef4e6a480394
SHA1 (patch-lib_ext_wocky_tests_wocky-test-sasl-auth-server.c) = f53a0b3247df5a5dcf90809a9495966ff26c6c3f
+SHA1 (patch-lib_ext_wocky_wocky_wocky-heartbeat-source_c) = d8f0192f7f34e6fb98150283f5ff05de6313ee4a
SHA1 (patch-lib_ext_wocky_wocky_wocky-openssl.c) = 21dd4df0c50e766bab0d3d1cbaa9fbe2feef7a17
SHA1 (patch-src_bytestream-socks5.c) = d6f72478bef2b2502f3955e50dc11b51f0e2b502
SHA1 (patch-src_ft-manager.c) = d660079ff74dd6f275ab8022ad0f7f5cd9b37897
diff --git a/chat/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-heartbeat-source_c b/chat/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-heartbeat-source_c
new file mode 100644
index 00000000000..c22f9771300
--- /dev/null
+++ b/chat/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-heartbeat-source_c
@@ -0,0 +1,25 @@
+$NetBSD: patch-lib_ext_wocky_wocky_wocky-heartbeat-source_c,v 1.1 2012/05/07 18:54:44 dholland Exp $
+
+Fix build with latest glib2.
+
+--- lib/ext/wocky/wocky/wocky-heartbeat-source.c~ 2011-02-16 15:40:58.000000000 +0000
++++ lib/ext/wocky/wocky/wocky-heartbeat-source.c
+@@ -30,6 +30,18 @@
+ # include <iphbd/libiphb.h>
+ #endif
+
++/*
++ * While the deprecation warning says "use g_source_get_time instead",
++ * that returns a different type and appears to have different
++ * semantics.
++ *
++ * According to Google and confirmed by checking the glib2 source,
++ * g_source_get_current_time is equivalent to g_get_current_time, so
++ * we'll use that, and hopefully upstream will deal with this
++ * eventually.
++ */
++#define g_source_get_current_time(s, t) g_get_current_time(t)
++
+ typedef struct _WockyHeartbeatSource {
+ GSource parent;
+