aboutsummaryrefslogtreecommitdiff
path: root/devel/dbus
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2010-05-10 21:19:08 +0000
committerKoop Mast <kwm@FreeBSD.org>2010-05-10 21:19:08 +0000
commit48e62d9a379cd45a15f6ae89d564f81b3c13d16e (patch)
treeb627baa77f19bb1eab2fa4dee08aab1908131cd0 /devel/dbus
parentfbdf96410f8e803568c33397323dd9d8d3af995f (diff)
downloadports-48e62d9a379cd45a15f6ae89d564f81b3c13d16e.tar.gz
ports-48e62d9a379cd45a15f6ae89d564f81b3c13d16e.zip
Notes
Diffstat (limited to 'devel/dbus')
-rw-r--r--devel/dbus/Makefile4
-rw-r--r--devel/dbus/distinfo6
-rw-r--r--devel/dbus/files/patch-bus_dir-watch-kqueue.c11
-rw-r--r--devel/dbus/files/patch-dbus_dbus-connection.c67
4 files changed, 83 insertions, 5 deletions
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index db3447fc0ebb..b10aa5aec70b 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/dbus/Makefile,v 1.34 2009/11/28 06:03:52 mezz Exp $
+# $MCom: ports/devel/dbus/Makefile,v 1.41 2010/04/04 22:03:28 marcus Exp $
#
PORTNAME= dbus
-PORTVERSION?= 1.2.16
+PORTVERSION?= 1.2.24
PORTREVISION?= 1
CATEGORIES= devel gnome
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index 1623b43edf79..09097b134e4b 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbus-1.2.16.tar.gz) = c7a47b851ebe02f6726b65b78d1b730b
-SHA256 (dbus-1.2.16.tar.gz) = 968a31c16a6c4bbbdb603cbaa3d60d6d19bc8ae30c0ed55d7f8c2e254413e4c8
-SIZE (dbus-1.2.16.tar.gz) = 1576209
+MD5 (dbus-1.2.24.tar.gz) = 565346cecd9cfecf1463540c6086cc2c
+SHA256 (dbus-1.2.24.tar.gz) = f12c748f4a703655e3d4c3db94cdf5a752a0cd0b36958c715804373bd3595c48
+SIZE (dbus-1.2.24.tar.gz) = 1673774
diff --git a/devel/dbus/files/patch-bus_dir-watch-kqueue.c b/devel/dbus/files/patch-bus_dir-watch-kqueue.c
new file mode 100644
index 000000000000..b65d9ab84bdf
--- /dev/null
+++ b/devel/dbus/files/patch-bus_dir-watch-kqueue.c
@@ -0,0 +1,11 @@
+--- bus/dir-watch-kqueue.c.orig 2010-04-04 17:59:18.000000000 -0400
++++ bus/dir-watch-kqueue.c 2010-04-04 17:59:55.000000000 -0400
+@@ -169,7 +169,7 @@ bus_set_watched_dirs (BusContext *contex
+ */
+ for (i = 0; new_dirs[i]; i++)
+ {
+- for (j = 0; i < num_fds; j++)
++ for (j = 0; j < num_fds; j++)
+ {
+ if (dirs[j] && strcmp (new_dirs[i], dirs[j]) == 0)
+ {
diff --git a/devel/dbus/files/patch-dbus_dbus-connection.c b/devel/dbus/files/patch-dbus_dbus-connection.c
new file mode 100644
index 000000000000..b992b9e5e83f
--- /dev/null
+++ b/devel/dbus/files/patch-dbus_dbus-connection.c
@@ -0,0 +1,67 @@
+--- dbus/dbus-connection.c.orig 2010-03-13 17:21:40.000000000 -0500
++++ dbus/dbus-connection.c 2010-03-13 17:25:28.000000000 -0500
+@@ -2280,7 +2280,7 @@ _dbus_connection_block_pending_call (DBu
+ DBusConnection *connection;
+ dbus_uint32_t client_serial;
+ DBusTimeout *timeout;
+- int timeout_milliseconds, elapsed_milliseconds;
++ int timeout_milliseconds, elapsed_milliseconds, remain_milliseconds;
+
+ _dbus_assert (pending != NULL);
+
+@@ -2360,6 +2360,10 @@ _dbus_connection_block_pending_call (DBu
+ _dbus_get_current_time (&tv_sec, &tv_usec);
+ elapsed_milliseconds = (tv_sec - start_tv_sec) * 1000 +
+ (tv_usec - start_tv_usec) / 1000;
++ if (timeout_milliseconds != -1)
++ remain_milliseconds = timeout_milliseconds - elapsed_milliseconds;
++ else
++ remain_milliseconds = -1;
+
+ if (!_dbus_connection_get_is_connected_unlocked (connection))
+ {
+@@ -2386,7 +2390,7 @@ _dbus_connection_block_pending_call (DBu
+ */
+ _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
+
+- _dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds);
++ _dbus_memory_pause_based_on_timeout (remain_milliseconds);
+ }
+ else
+ {
+@@ -2394,7 +2398,7 @@ _dbus_connection_block_pending_call (DBu
+ _dbus_connection_do_iteration_unlocked (connection,
+ DBUS_ITERATION_DO_READING |
+ DBUS_ITERATION_BLOCK,
+- timeout_milliseconds - elapsed_milliseconds);
++ remain_milliseconds);
+ }
+
+ goto recheck_status;
+@@ -2403,7 +2407,7 @@ _dbus_connection_block_pending_call (DBu
+ _dbus_verbose ("dbus_connection_send_with_reply_and_block(): clock set backward\n");
+ else if (elapsed_milliseconds < timeout_milliseconds)
+ {
+- _dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", timeout_milliseconds - elapsed_milliseconds);
++ _dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", remain_milliseconds);
+
+ if (status == DBUS_DISPATCH_NEED_MEMORY)
+ {
+@@ -2413,7 +2417,7 @@ _dbus_connection_block_pending_call (DBu
+ */
+ _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
+
+- _dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds);
++ _dbus_memory_pause_based_on_timeout (remain_milliseconds);
+ }
+ else
+ {
+@@ -2421,7 +2425,7 @@ _dbus_connection_block_pending_call (DBu
+ _dbus_connection_do_iteration_unlocked (connection,
+ DBUS_ITERATION_DO_READING |
+ DBUS_ITERATION_BLOCK,
+- timeout_milliseconds - elapsed_milliseconds);
++ remain_milliseconds);
+ }
+
+ goto recheck_status;