Author: ranger
Date: Tue Jul 21 18:15:50 2009
New Revision: 1590
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1590&repname=user%3a+ranger>
Log:
new dbus, now with no crashing!
Modified:
trunk/experimental/10.4/main/finkinfo/libs/dbus.info
trunk/experimental/10.4/main/finkinfo/libs/dbus.patch
trunk/experimental/common/main/finkinfo/libs/dbus.info
trunk/experimental/common/main/finkinfo/libs/dbus.patch
Modified: trunk/experimental/10.4/main/finkinfo/libs/dbus.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/dbus.info&rev=1590&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/dbus.info (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/dbus.info Tue Jul 21 18:15:50
2009
@@ -39,7 +39,7 @@
autoreconf -fvi
<<
PatchFile: %n.patch
-PatchFile-MD5: 171472fa74765abcd7853da33b4c0bcd
+PatchFile-MD5: 6de79bebfd4e03835bd098fd20a8352c
SetCFLAGS: -Os -g
ConfigureParams: <<
Modified: trunk/experimental/10.4/main/finkinfo/libs/dbus.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/dbus.patch&rev=1590&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/dbus.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/dbus.patch Tue Jul 21 18:15:50
2009
@@ -258,10 +258,10 @@
dbus-server-socket.h \
diff --git a/dbus/dbus-server-launchd.c b/dbus/dbus-server-launchd.c
new file mode 100644
-index 0000000..301d11b
+index 0000000..3dc9992
--- /dev/null
+++ b/dbus/dbus-server-launchd.c
-@@ -0,0 +1,205 @@
+@@ -0,0 +1,207 @@
+/* dbus-server-launchd.c Server methods for interacting with launchd.
+ * Copyright (C) 2007, Tanner Lovelace <lovel...@wayfarer.org>
+ * Copyright (C) 2008, Benjamin Reed <rangerr...@befunk.com>
@@ -333,15 +333,17 @@
+ launch_data_t checkin_request;
+ launch_data_t listening_fd_array, listening_fd;
+ launch_data_t environment_dict, environment_param;
-+ const char *launchd_socket_path = _dbus_getenv (launchd_env_var);
-+ const char *display = _dbus_getenv ("DISPLAY");
++ const char *launchd_socket_path, *display;
++
++ launchd_socket_path = _dbus_getenv (launchd_env_var);
++ display = _dbus_getenv ("DISPLAY");
+
+ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
+
-+ if (*launchd_socket_path == '\0')
++ if (launchd_socket_path == NULL || *launchd_socket_path == '\0')
+ {
+ dbus_set_error (error, DBUS_ERROR_BAD_ADDRESS,
-+ "launchd's environment variable %s is empty, but should
contain a socket path");
++ "launchd's environment variable %s is empty, but should
contain a socket path.\n", launchd_env_var);
+ return NULL;
+ }
+
@@ -421,7 +423,7 @@
+ goto l_failed_0;
+ }
+
-+ if (*display == '\0')
++ if (display == NULL || *display == '\0')
+ {
+ environment_dict = launch_data_dict_lookup (checkin_response,
LAUNCH_JOBKEY_USERENVIRONMENTVARIABLES);
+ if (NULL == environment_dict)
Modified: trunk/experimental/common/main/finkinfo/libs/dbus.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/dbus.info&rev=1590&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/dbus.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/dbus.info Tue Jul 21 18:15:50
2009
@@ -36,7 +36,7 @@
Source3ExtractDir: %n-%v
PatchFile: %n.patch
-PatchFile-MD5: 171472fa74765abcd7853da33b4c0bcd
+PatchFile-MD5: 6de79bebfd4e03835bd098fd20a8352c
PatchScript: <<
/usr/bin/sed -e
's,DBUS_LAUNCHD_SESSION_BUS_SOCKET,DBUS_FINK_SESSION_BUS_SOCKET,g' -e
's,org.freedesktop.dbus-session,org.finkproject.dbus-session,g' -e
's,@FINKPREFIX@,%p,g' %{PatchFile} | /usr/bin/patch -p1
Modified: trunk/experimental/common/main/finkinfo/libs/dbus.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/dbus.patch&rev=1590&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/dbus.patch (original)
+++ trunk/experimental/common/main/finkinfo/libs/dbus.patch Tue Jul 21 18:15:50
2009
@@ -258,10 +258,10 @@
dbus-server-socket.h \
diff --git a/dbus/dbus-server-launchd.c b/dbus/dbus-server-launchd.c
new file mode 100644
-index 0000000..301d11b
+index 0000000..3dc9992
--- /dev/null
+++ b/dbus/dbus-server-launchd.c
-@@ -0,0 +1,205 @@
+@@ -0,0 +1,207 @@
+/* dbus-server-launchd.c Server methods for interacting with launchd.
+ * Copyright (C) 2007, Tanner Lovelace <lovel...@wayfarer.org>
+ * Copyright (C) 2008, Benjamin Reed <rangerr...@befunk.com>
@@ -333,15 +333,17 @@
+ launch_data_t checkin_request;
+ launch_data_t listening_fd_array, listening_fd;
+ launch_data_t environment_dict, environment_param;
-+ const char *launchd_socket_path = _dbus_getenv (launchd_env_var);
-+ const char *display = _dbus_getenv ("DISPLAY");
++ const char *launchd_socket_path, *display;
++
++ launchd_socket_path = _dbus_getenv (launchd_env_var);
++ display = _dbus_getenv ("DISPLAY");
+
+ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
+
-+ if (*launchd_socket_path == '\0')
++ if (launchd_socket_path == NULL || *launchd_socket_path == '\0')
+ {
+ dbus_set_error (error, DBUS_ERROR_BAD_ADDRESS,
-+ "launchd's environment variable %s is empty, but should
contain a socket path");
++ "launchd's environment variable %s is empty, but should
contain a socket path.\n", launchd_env_var);
+ return NULL;
+ }
+
@@ -421,7 +423,7 @@
+ goto l_failed_0;
+ }
+
-+ if (*display == '\0')
++ if (display == NULL || *display == '\0')
+ {
+ environment_dict = launch_data_dict_lookup (checkin_response,
LAUNCH_JOBKEY_USERENVIRONMENTVARIABLES);
+ if (NULL == environment_dict)
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
