[107003] trunk/dports/devel
devans at macports.org
devans at macports.org
Thu Jun 13 21:29:21 PDT 2013
Revision: 107003
https://trac.macports.org/changeset/107003
Author: devans at macports.org
Date: 2013-06-13 21:29:21 -0700 (Thu, 13 Jun 2013)
Log Message:
-----------
glade: remove obsolete port, replaced by glade3 20110413.
Modified Paths:
--------------
trunk/dports/devel/glib2/Portfile
trunk/dports/devel/glib2-devel/Portfile
Added Paths:
-----------
trunk/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
trunk/dports/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff
Removed Paths:
-------------
trunk/dports/devel/glade/
Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile 2013-06-14 02:17:12 UTC (rev 107002)
+++ trunk/dports/devel/glib2/Portfile 2013-06-14 04:29:21 UTC (rev 107003)
@@ -11,6 +11,7 @@
conflicts glib2-devel
set my_name glib
version 2.36.3
+revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign openmaintainer
@@ -41,7 +42,8 @@
patch-glib_gunicollate.c.diff \
patch-gi18n.h.diff \
patch-gio_xdgmime_xdgmime.c.diff \
- patch-gio_gdbusprivate.c.diff
+ patch-gio_gdbusprivate.c.diff \
+ patch-get-launchd-dbus-session-address.diff
depends_lib port:gettext \
port:libiconv \
Added: trunk/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff (rev 0)
+++ trunk/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff 2013-06-14 04:29:21 UTC (rev 107003)
@@ -0,0 +1,119 @@
+--- gio/gdbusaddress.c.orig 2013-02-24 13:02:01.000000000 -0800
++++ gio/gdbusaddress.c 2013-05-17 08:00:11.000000000 -0700
+@@ -1426,13 +1426,116 @@
+
+ /* ---------------------------------------------------------------------------------------------------- */
+
++/*
++ * MacPorts specific D-Bus implementation
++ *
++ * When building under MacPorts on darwin
++ * plaforms (including Mac OS X), the
++ * symbols G_OS_UNIX and __APPLE__ are
++ * asserted.
++ *
++ * The D-Bus session daemon is controlled
++ * using the Apple launchd facility.
++ *
++ * For launchd command details see
++ * http://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages
++ *
++ * launchd(8)
++ * launchctl(1)
++ * launchd.plist(5)
++ */
++
++#if defined (G_OS_UNIX) && defined (__APPLE__)
++static gchar *
++get_session_address_macports_specific (GError **error)
++{
++ gchar *ret;
++ gchar *command_line;
++ gchar *launchctl_stdout;
++ gchar *launchctl_stderr;
++ gint exit_status;
++
++ ret = NULL;
++ command_line = NULL;
++ launchctl_stdout = NULL;
++ launchctl_stderr = NULL;
++
++ command_line = g_strdup ("launchctl getenv DBUS_LAUNCHD_SESSION_BUS_SOCKET");
++
++ if (G_UNLIKELY (_g_dbus_debug_address ()))
++ {
++ _g_dbus_debug_print_lock ();
++ g_print ("GDBus-debug:Address: launchctl command line: `%s'\n", command_line);
++ _g_dbus_debug_print_unlock ();
++ }
++
++ if (g_spawn_command_line_sync (command_line,
++ &launchctl_stdout,
++ &launchctl_stderr,
++ &exit_status,
++ error))
++ {
++ if (g_spawn_check_exit_status (exit_status, error))
++ {
++ if (launchctl_stdout != NULL)
++ {
++ if (G_UNLIKELY (_g_dbus_debug_address ()))
++ {
++ gchar *s;
++ _g_dbus_debug_print_lock ();
++ g_print ("GDBus-debug:Address: launchctl stdout:");
++ s = _g_dbus_hexdump (launchctl_stdout, strlen (launchctl_stdout) + 1, 2);
++ g_print ("\n%s", s);
++ g_free (s);
++ _g_dbus_debug_print_unlock ();
++ }
++
++ if (*launchctl_stdout != '\0')
++ {
++ gchar *lastchar;
++
++ lastchar = launchctl_stdout + strlen(launchctl_stdout) - 1;
++ if (*lastchar == '\n') *lastchar = '\0';
++ ret = g_strdup_printf ("unix:path=%s", launchctl_stdout);
++ }
++ else
++ {
++ g_set_error (error,
++ G_IO_ERROR,
++ G_IO_ERROR_FAILED,
++ _("Session D-Bus not running. Try running `launchctl load -w /Library/LaunchAgents/org.freedesktop.dbus-session.plist'."));
++ }
++ }
++ }
++ else
++ {
++ g_prefix_error (error, _("Error spawning command line `%s': "), command_line);
++ }
++ }
++
++ g_free (command_line);
++ g_free (launchctl_stdout);
++ g_free (launchctl_stderr);
++
++ return ret;
++}
++#endif
++
++/* ---------------------------------------------------------------------------------------------------- */
++
+ static gchar *
+ get_session_address_platform_specific (GError **error)
+ {
+ gchar *ret;
+ #if defined (G_OS_UNIX) || defined(G_OS_WIN32)
+ /* need to handle OS X in a different way since `dbus-launch --autolaunch' probably won't work there */
++
++#ifdef __APPLE__
++ ret = get_session_address_macports_specific (error);
++#else
+ ret = get_session_address_dbus_launch (error);
++#endif
++
+ #else
+ /* TODO: implement for OS X */
+ ret = NULL;
Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile 2013-06-14 02:17:12 UTC (rev 107002)
+++ trunk/dports/devel/glib2-devel/Portfile 2013-06-14 04:29:21 UTC (rev 107003)
@@ -11,6 +11,7 @@
conflicts glib2
set my_name glib
version 2.37.1
+revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign openmaintainer
@@ -41,7 +42,8 @@
patch-glib_gunicollate.c.diff \
patch-gi18n.h.diff \
patch-gio_xdgmime_xdgmime.c.diff \
- patch-gio_gdbusprivate.c.diff
+ patch-gio_gdbusprivate.c.diff \
+ patch-get-launchd-dbus-session-address.diff
depends_lib port:gettext \
port:libiconv \
Added: trunk/dports/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff (rev 0)
+++ trunk/dports/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff 2013-06-14 04:29:21 UTC (rev 107003)
@@ -0,0 +1,119 @@
+--- gio/gdbusaddress.c.orig 2013-02-24 13:02:01.000000000 -0800
++++ gio/gdbusaddress.c 2013-05-17 08:00:11.000000000 -0700
+@@ -1426,13 +1426,116 @@
+
+ /* ---------------------------------------------------------------------------------------------------- */
+
++/*
++ * MacPorts specific D-Bus implementation
++ *
++ * When building under MacPorts on darwin
++ * plaforms (including Mac OS X), the
++ * symbols G_OS_UNIX and __APPLE__ are
++ * asserted.
++ *
++ * The D-Bus session daemon is controlled
++ * using the Apple launchd facility.
++ *
++ * For launchd command details see
++ * http://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages
++ *
++ * launchd(8)
++ * launchctl(1)
++ * launchd.plist(5)
++ */
++
++#if defined (G_OS_UNIX) && defined (__APPLE__)
++static gchar *
++get_session_address_macports_specific (GError **error)
++{
++ gchar *ret;
++ gchar *command_line;
++ gchar *launchctl_stdout;
++ gchar *launchctl_stderr;
++ gint exit_status;
++
++ ret = NULL;
++ command_line = NULL;
++ launchctl_stdout = NULL;
++ launchctl_stderr = NULL;
++
++ command_line = g_strdup ("launchctl getenv DBUS_LAUNCHD_SESSION_BUS_SOCKET");
++
++ if (G_UNLIKELY (_g_dbus_debug_address ()))
++ {
++ _g_dbus_debug_print_lock ();
++ g_print ("GDBus-debug:Address: launchctl command line: `%s'\n", command_line);
++ _g_dbus_debug_print_unlock ();
++ }
++
++ if (g_spawn_command_line_sync (command_line,
++ &launchctl_stdout,
++ &launchctl_stderr,
++ &exit_status,
++ error))
++ {
++ if (g_spawn_check_exit_status (exit_status, error))
++ {
++ if (launchctl_stdout != NULL)
++ {
++ if (G_UNLIKELY (_g_dbus_debug_address ()))
++ {
++ gchar *s;
++ _g_dbus_debug_print_lock ();
++ g_print ("GDBus-debug:Address: launchctl stdout:");
++ s = _g_dbus_hexdump (launchctl_stdout, strlen (launchctl_stdout) + 1, 2);
++ g_print ("\n%s", s);
++ g_free (s);
++ _g_dbus_debug_print_unlock ();
++ }
++
++ if (*launchctl_stdout != '\0')
++ {
++ gchar *lastchar;
++
++ lastchar = launchctl_stdout + strlen(launchctl_stdout) - 1;
++ if (*lastchar == '\n') *lastchar = '\0';
++ ret = g_strdup_printf ("unix:path=%s", launchctl_stdout);
++ }
++ else
++ {
++ g_set_error (error,
++ G_IO_ERROR,
++ G_IO_ERROR_FAILED,
++ _("Session D-Bus not running. Try running `launchctl load -w /Library/LaunchAgents/org.freedesktop.dbus-session.plist'."));
++ }
++ }
++ }
++ else
++ {
++ g_prefix_error (error, _("Error spawning command line `%s': "), command_line);
++ }
++ }
++
++ g_free (command_line);
++ g_free (launchctl_stdout);
++ g_free (launchctl_stderr);
++
++ return ret;
++}
++#endif
++
++/* ---------------------------------------------------------------------------------------------------- */
++
+ static gchar *
+ get_session_address_platform_specific (GError **error)
+ {
+ gchar *ret;
+ #if defined (G_OS_UNIX) || defined(G_OS_WIN32)
+ /* need to handle OS X in a different way since `dbus-launch --autolaunch' probably won't work there */
++
++#ifdef __APPLE__
++ ret = get_session_address_macports_specific (error);
++#else
+ ret = get_session_address_dbus_launch (error);
++#endif
++
+ #else
+ /* TODO: implement for OS X */
+ ret = NULL;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130613/da5559a9/attachment-0001.html>
More information about the macports-changes
mailing list