[141452] trunk/dports/devel/glib2-devel
ryandesign at macports.org
ryandesign at macports.org
Sat Dec 12 01:35:31 PST 2015
Revision: 141452
https://trac.macports.org/changeset/141452
Author: ryandesign at macports.org
Date: 2015-10-18 21:18:59 -0700 (Sun, 18 Oct 2015)
Log Message:
-----------
glib2-devel: merge r141294, r141320, r141451 from glib2
Revision Links:
--------------
https://trac.macports.org/changeset/141294
https://trac.macports.org/changeset/141320
https://trac.macports.org/changeset/141451
Modified Paths:
--------------
trunk/dports/devel/glib2-devel/Portfile
Added Paths:
-----------
trunk/dports/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff
Property Changed:
----------------
trunk/dports/devel/glib2-devel/
Property changes on: trunk/dports/devel/glib2-devel
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/devel/glib2:52045-52046,62644,64476,72697,91791
+ /branches/mld-qt-481/dports/devel/glib2:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/devel/glib2:52045-52046,62644,64476,72697,91791,141294,141320,141451
/users/cal/ports/devel/glib2:96570-97031
/users/devans/GNOME-3/stable/dports/devel/glib2:125662-141304
/users/devans/GNOME-3/unstable/dports/devel/glib2:120511-125619,128305-141254
Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile 2015-10-19 04:09:45 UTC (rev 141451)
+++ trunk/dports/devel/glib2-devel/Portfile 2015-10-19 04:18:59 UTC (rev 141452)
@@ -10,7 +10,7 @@
name glib2-devel
conflicts glib2
set my_name glib
-version 2.46.0
+version 2.46.1
revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
@@ -31,8 +31,8 @@
master_sites gnome:sources/${my_name}/${branch}/
-checksums rmd160 dafbe7195a2171f1201570d20912c6a4ead23201 \
- sha256 b1cee83469ae7d80f17c267c37f090414e93960bd62d2b254a5a96fbc5baacb4
+checksums rmd160 348594880f1795b8a82176513c3d74ae71b0d6d4 \
+ sha256 5a1f03b952ebc3a7e9f612b8724f70898183e31503db329b4f15d07163c8fdfb
# ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
# See https://trac.macports.org/changeset/27148
@@ -43,6 +43,7 @@
patch-gi18n.h.diff \
patch-gio_xdgmime_xdgmime.c.diff \
patch-gio_gdbusprivate.c.diff \
+ patch-get-launchd-dbus-session-address.diff \
patch-gmodule-gmodule-dl.c.diff
if {[vercmp ${macosx_deployment_target} 10.9] < 0} {
@@ -53,9 +54,10 @@
depends_build bin:xmllint:libxml2
depends_lib port:gettext \
+ port:libffi \
port:libiconv \
- port:zlib \
- port:libffi
+ port:pcre \
+ port:zlib
# GLib-CRITICAL **: attempting to free a locked GVariant instance. This should never happen.
compiler.blacklist-append {clang < 318}
@@ -70,11 +72,14 @@
configure.cflags-append -fstrict-aliasing
configure.args --enable-static --disable-libelf \
- --disable-compile-warnings
+ --disable-compile-warnings \
+ --with-pcre=system
configure.perl /usr/bin/perl
configure.python /usr/bin/python
-configure.env-append PERL_PATH=${configure.perl} \
+configure.env-append PCRE_CFLAGS="-I${prefix}/include" \
+ PCRE_LIBS="-L${prefix}/lib -lpcre" \
+ PERL_PATH=${configure.perl} \
PKG_CONFIG=false \
ZLIB_CFLAGS="-I${prefix}/include" \
ZLIB_LIBS="-L${prefix}/lib -lz"
Copied: trunk/dports/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff (from rev 141294, 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 (rev 0)
+++ trunk/dports/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff 2015-10-19 04:18:59 UTC (rev 141452)
@@ -0,0 +1,119 @@
+--- gio/gdbusaddress.c.orig 2015-06-09 16:18:38.000000000 -0700
++++ gio/gdbusaddress.c 2015-06-23 10:54:28.000000000 -0700
+@@ -1475,6 +1475,103 @@
+
+ /* ---------------------------------------------------------------------------------------------------- */
+
++/*
++ * 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)
+ {
+@@ -1503,7 +1600,12 @@
+ * X11 autolaunching; on Windows this means a different autolaunching
+ * mechanism based on shared memory.
+ */
++
++#ifdef __APPLE__
++ return get_session_address_macports_specific (error);
++#else
+ return get_session_address_dbus_launch (error);
++#endif
+ }
+
+ /* ---------------------------------------------------------------------------------------------------- */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/63e65709/attachment-0001.html>
More information about the macports-changes
mailing list