[141131] trunk/dports/devel
ryandesign at macports.org
ryandesign at macports.org
Sun Oct 11 09:09:15 PDT 2015
Revision: 141131
https://trac.macports.org/changeset/141131
Author: ryandesign at macports.org
Date: 2015-10-11 09:09:15 -0700 (Sun, 11 Oct 2015)
Log Message:
-----------
glib2, glib2-devel: update to 2.46.0 (#48969)
Modified Paths:
--------------
trunk/dports/devel/glib2/Portfile
trunk/dports/devel/glib2-devel/Portfile
Added Paths:
-----------
trunk/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch
trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend.patch
Removed Paths:
-------------
trunk/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
trunk/dports/devel/glib2/files/yosemite-libtool.patch
trunk/dports/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff
trunk/dports/devel/glib2-devel/files/yosemite-libtool.patch
Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile 2015-10-11 15:45:45 UTC (rev 141130)
+++ trunk/dports/devel/glib2/Portfile 2015-10-11 16:09:15 UTC (rev 141131)
@@ -10,12 +10,7 @@
name glib2
conflicts glib2-devel
set my_name glib
-# Don't upgrade to 2.45.3 or newer because it requires OS X 10.9 or later.
-# Discussing what to do about this:
-# https://mail.gnome.org/archives/gtk-devel-list/2015-September/msg00025.html
-# https://bugzilla.gnome.org/show_bug.cgi?id=747146
-version 2.44.1
-revision 1
+version 2.46.0
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign openmaintainer
@@ -35,8 +30,8 @@
master_sites gnome:sources/${my_name}/${branch}/
-checksums rmd160 40db36e25c4baf5bdcdde34379d4968e9b35557c \
- sha256 8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07
+checksums rmd160 dafbe7195a2171f1201570d20912c6a4ead23201 \
+ sha256 b1cee83469ae7d80f17c267c37f090414e93960bd62d2b254a5a96fbc5baacb4
# ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
# See https://trac.macports.org/changeset/27148
@@ -47,11 +42,12 @@
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
-# Don't link with "-flat_namespace -undefined suppress" on Yosemite and later.
-patchfiles-append yosemite-libtool.patch
+if {[vercmp ${macosx_deployment_target} 10.9] < 0} {
+ # gcocoanotificationbackend requires OS X 10.9 or later.
+ patchfiles-append remove-gcocoanotificationbackend.patch
+}
depends_build bin:xmllint:libxml2
Deleted: trunk/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff 2015-10-11 15:45:45 UTC (rev 141130)
+++ trunk/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff 2015-10-11 16:09:15 UTC (rev 141131)
@@ -1,119 +0,0 @@
---- gio/gdbusaddress.c.orig 2013-05-27 10:01:46.000000000 -0700
-+++ gio/gdbusaddress.c 2013-06-13 22:48:22.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;
Added: trunk/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch
===================================================================
--- trunk/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch (rev 0)
+++ trunk/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch 2015-10-11 16:09:15 UTC (rev 141131)
@@ -0,0 +1,308 @@
+Remove GNotification support added in https://bugzilla.gnome.org/show_bug.cgi?id=747146
+Reverts:
+https://git.gnome.org/browse/glib/commit/?id=89058e8a9b769ab223bc75739f5455dab18f7a3d
+And most of:
+https://git.gnome.org/browse/glib/commit/?id=36e093a31a9eb12021e7780b9e322c29763ffa58
+--- configure.orig 2015-09-21 07:39:10.000000000 -0500
++++ configure 2015-10-10 18:33:12.000000000 -0500
+@@ -6029,30 +5969,6 @@
+ COCOA_LIBS="-Wl,-framework,Foundation"
+ LDFLAGS="$LDFLAGS $COCOA_LIBS"
+
+- osx_version=`sw_vers -productVersion`
+- osx_min_version="10.9.0"
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking OSX version >= $osx_min_version" >&5
+-$as_echo_n "checking OSX version >= $osx_min_version... " >&6; }
+- as_arg_v1=$osx_version
+-as_arg_v2=$osx_min_version
+-awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
+-case $? in #(
+- 1) :
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- as_fn_error $? "OSX version is too old!" "$LINENO" 5
+- ;; #(
+- 0) :
+- ;; #(
+- 2) :
+- ;; #(
+- *) :
+- ;;
+-esac
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+ else
+ COCOA_LIBS=""
+ fi
+--- configure.ac.orig 2015-09-21 07:38:33.000000000 -0500
++++ configure.ac 2015-10-10 18:32:37.000000000 -0500
+@@ -223,15 +223,6 @@
+ AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
+ COCOA_LIBS="-Wl,-framework,Foundation"
+ LDFLAGS="$LDFLAGS $COCOA_LIBS"
+-
+- osx_version=`sw_vers -productVersion`
+- osx_min_version="10.9.0"
+- AC_MSG_CHECKING([OSX version >= $osx_min_version])
+- AS_VERSION_COMPARE([$osx_version], [$osx_min_version], [
+- AC_MSG_RESULT([no])
+- AC_MSG_ERROR([OSX version is too old!])
+- ])
+- AC_MSG_RESULT([yes])
+ ], [COCOA_LIBS=""])
+
+ AC_SUBST([COCOA_LIBS])
+--- gio/Makefile.am.orig 2015-09-04 12:56:56.000000000 -0500
++++ gio/Makefile.am 2015-10-10 18:32:38.000000000 -0500
+@@ -265,9 +265,6 @@
+ ggtknotificationbackend.c \
+ $(NULL)
+
+-if OS_COCOA
+-unix_sources += gcocoanotificationbackend.c
+-endif
+
+ giounixincludedir=$(includedir)/gio-unix-2.0/gio
+ giounixinclude_HEADERS = \
+@@ -527,7 +524,7 @@
+ if OS_COCOA
+ # This is dumb. The ObjC source file should be properly named .m
+ libgio_2_0_la_CFLAGS += -xobjective-c
+-libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation -Wl,-framework,AppKit
++libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation
+ endif
+
+ libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
+--- gio/Makefile.in.orig 2015-09-21 07:39:06.000000000 -0500
++++ gio/Makefile.in 2015-10-10 18:33:18.000000000 -0500
+@@ -181,27 +181,26 @@
+ @OS_UNIX_TRUE at am__append_29 = gdesktopappinfo.c
+ @OS_UNIX_TRUE at am__append_30 = xdgmime/libxdgmime.la
+ @OS_UNIX_TRUE at am__append_31 = xdgmime/libxdgmime.la
+- at OS_COCOA_TRUE@@OS_UNIX_TRUE at am__append_32 = gcocoanotificationbackend.c
+- at HAVE_NETLINK_TRUE@@OS_UNIX_TRUE at am__append_33 = \
++ at HAVE_NETLINK_TRUE@@OS_UNIX_TRUE at am__append_32 = \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.c \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.h \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornm.c \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornm.h \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ $(NULL)
+
+- at OS_WIN32_TRUE@am__append_34 = gwin32appinfo.c gwin32appinfo.h
+- at OS_WIN32_TRUE@am__append_35 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
++ at OS_WIN32_TRUE@am__append_33 = gwin32appinfo.c gwin32appinfo.h
++ at OS_WIN32_TRUE@am__append_34 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
+
+ # This is dumb. The ObjC source file should be properly named .m
+- at OS_COCOA_TRUE@am__append_36 = -xobjective-c
+- at OS_COCOA_TRUE@am__append_37 = -Wl,-framework,Foundation -Wl,-framework,AppKit
++ at OS_COCOA_TRUE@am__append_35 = -xobjective-c
++ at OS_COCOA_TRUE@am__append_36 = -Wl,-framework,Foundation
+ bin_PROGRAMS = gio-querymodules$(EXEEXT) glib-compile-schemas$(EXEEXT) \
+ glib-compile-resources$(EXEEXT) gsettings$(EXEEXT) \
+ gdbus$(EXEEXT) $(am__EXEEXT_1) gresource$(EXEEXT)
+
+ # ------------------------------------------------------------------------
+ # gapplication(1) tool
+- at OS_UNIX_TRUE@am__append_38 = gapplication
++ at OS_UNIX_TRUE@am__append_37 = gapplication
+ subdir = gio
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \
+@@ -317,17 +316,17 @@
+ gunixvolume.c gunixvolume.h gunixvolumemonitor.c \
+ gunixvolumemonitor.h gunixinputstream.c gunixoutputstream.c \
+ gcontenttype.c gcontenttypeprivate.h gfdonotificationbackend.c \
+- ggtknotificationbackend.c gcocoanotificationbackend.c \
+- gnetworkmonitornetlink.c gnetworkmonitornetlink.h \
+- gnetworkmonitornm.c gnetworkmonitornm.h gdbusdaemon.c \
+- gdbusdaemon.h gdbus-daemon-generated.c \
+- gdbus-daemon-generated.h gwin32registrykey.c \
+- gwin32registrykey.h gcontenttype-win32.c gwin32mount.c \
+- gwin32mount.h gwin32volumemonitor.c gwin32volumemonitor.h \
+- gwin32inputstream.c gwin32outputstream.c gwin32outputstream.h \
+- gwin32networking.h gapplication.c gapplicationcommandline.c \
+- gapplicationimpl-dbus.c gapplicationimpl.h gactiongroup.c \
+- gactionmap.c gsimpleactiongroup.c gremoteactiongroup.c \
++ ggtknotificationbackend.c gnetworkmonitornetlink.c \
++ gnetworkmonitornetlink.h gnetworkmonitornm.c \
++ gnetworkmonitornm.h gdbusdaemon.c gdbusdaemon.h \
++ gdbus-daemon-generated.c gdbus-daemon-generated.h \
++ gwin32registrykey.c gwin32registrykey.h gcontenttype-win32.c \
++ gwin32mount.c gwin32mount.h gwin32volumemonitor.c \
++ gwin32volumemonitor.h gwin32inputstream.c gwin32outputstream.c \
++ gwin32outputstream.h gwin32networking.h gapplication.c \
++ gapplicationcommandline.c gapplicationimpl-dbus.c \
++ gapplicationimpl.h gactiongroup.c gactionmap.c \
++ gsimpleactiongroup.c gremoteactiongroup.c \
+ gactiongroupexporter.c gdbusactiongroup-private.h \
+ gdbusactiongroup.c gaction.c gpropertyaction.c gsimpleaction.c \
+ gmenumodel.c gmenu.c gmenuexporter.c gdbusmenumodel.c \
+@@ -373,11 +372,10 @@
+ @OS_WIN32_TRUE at am__objects_2 = libgio_2_0_la-gwin32appinfo.lo
+ am__objects_3 = $(am__objects_1) $(am__objects_2)
+ am__objects_4 =
+- at OS_COCOA_TRUE@@OS_UNIX_TRUE at am__objects_5 = libgio_2_0_la-gcocoanotificationbackend.lo
+- at HAVE_NETLINK_TRUE@@OS_UNIX_TRUE at am__objects_6 = libgio_2_0_la-gnetworkmonitornetlink.lo \
++ at HAVE_NETLINK_TRUE@@OS_UNIX_TRUE at am__objects_5 = libgio_2_0_la-gnetworkmonitornetlink.lo \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ libgio_2_0_la-gnetworkmonitornm.lo \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ $(am__objects_4)
+- at OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gfiledescriptorbased.lo \
++ at OS_UNIX_TRUE@am__objects_6 = libgio_2_0_la-gfiledescriptorbased.lo \
+ @OS_UNIX_TRUE@ libgio_2_0_la-gunixconnection.lo \
+ @OS_UNIX_TRUE@ libgio_2_0_la-gunixcredentialsmessage.lo \
+ @OS_UNIX_TRUE@ libgio_2_0_la-gunixfdlist.lo \
+@@ -392,18 +390,17 @@
+ @OS_UNIX_TRUE@ libgio_2_0_la-gcontenttype.lo \
+ @OS_UNIX_TRUE@ libgio_2_0_la-gfdonotificationbackend.lo \
+ @OS_UNIX_TRUE@ libgio_2_0_la-ggtknotificationbackend.lo \
+- at OS_UNIX_TRUE@ $(am__objects_4) $(am__objects_5) \
+- at OS_UNIX_TRUE@ $(am__objects_6)
+-am__objects_8 = libgio_2_0_la-gdbusdaemon.lo \
++ at OS_UNIX_TRUE@ $(am__objects_4) $(am__objects_5)
++am__objects_7 = libgio_2_0_la-gdbusdaemon.lo \
+ libgio_2_0_la-gdbus-daemon-generated.lo $(am__objects_4)
+-am__objects_9 = $(am__objects_8) libgio_2_0_la-gwin32registrykey.lo \
++am__objects_8 = $(am__objects_7) libgio_2_0_la-gwin32registrykey.lo \
+ libgio_2_0_la-gcontenttype-win32.lo \
+ libgio_2_0_la-gwin32mount.lo \
+ libgio_2_0_la-gwin32volumemonitor.lo \
+ libgio_2_0_la-gwin32inputstream.lo \
+ libgio_2_0_la-gwin32outputstream.lo $(am__objects_4)
+- at OS_WIN32_TRUE@am__objects_10 = $(am__objects_9)
+-am__objects_11 = libgio_2_0_la-gapplication.lo \
++ at OS_WIN32_TRUE@am__objects_9 = $(am__objects_8)
++am__objects_10 = libgio_2_0_la-gapplication.lo \
+ libgio_2_0_la-gapplicationcommandline.lo \
+ libgio_2_0_la-gapplicationimpl-dbus.lo \
+ libgio_2_0_la-gactiongroup.lo libgio_2_0_la-gactionmap.lo \
+@@ -416,11 +413,11 @@
+ libgio_2_0_la-gmenu.lo libgio_2_0_la-gmenuexporter.lo \
+ libgio_2_0_la-gdbusmenumodel.lo libgio_2_0_la-gnotification.lo \
+ libgio_2_0_la-gnotificationbackend.lo $(am__objects_4)
+- at OS_WIN32_TRUE@am__objects_12 = \
++ at OS_WIN32_TRUE@am__objects_11 = \
+ @OS_WIN32_TRUE@ libgio_2_0_la-gregistrysettingsbackend.lo
+- at OS_COCOA_TRUE@am__objects_13 = \
++ at OS_COCOA_TRUE@am__objects_12 = \
+ @OS_COCOA_TRUE@ libgio_2_0_la-gnextstepsettingsbackend.lo
+-am__objects_14 = libgio_2_0_la-gvdb-reader.lo \
++am__objects_13 = libgio_2_0_la-gvdb-reader.lo \
+ libgio_2_0_la-gdelayedsettingsbackend.lo \
+ libgio_2_0_la-gkeyfilesettingsbackend.lo \
+ libgio_2_0_la-gmemorysettingsbackend.lo \
+@@ -428,8 +425,8 @@
+ libgio_2_0_la-gsettingsbackend.lo \
+ libgio_2_0_la-gsettingsschema.lo \
+ libgio_2_0_la-gsettings-mapping.lo libgio_2_0_la-gsettings.lo \
+- $(am__objects_12) $(am__objects_13)
+-am__objects_15 = libgio_2_0_la-gdbusutils.lo \
++ $(am__objects_11) $(am__objects_12)
++am__objects_14 = libgio_2_0_la-gdbusutils.lo \
+ libgio_2_0_la-gdbusaddress.lo \
+ libgio_2_0_la-gdbusauthobserver.lo libgio_2_0_la-gdbusauth.lo \
+ libgio_2_0_la-gdbusauthmechanism.lo \
+@@ -451,7 +448,7 @@
+ libgio_2_0_la-gdbusobjectmanagerclient.lo \
+ libgio_2_0_la-gdbusobjectmanagerserver.lo \
+ libgio_2_0_la-gtestdbus.lo $(am__objects_4)
+-am__objects_16 = libgio_2_0_la-ghttpproxy.lo \
++am__objects_15 = libgio_2_0_la-ghttpproxy.lo \
+ libgio_2_0_la-glocalfile.lo \
+ libgio_2_0_la-glocalfileenumerator.lo \
+ libgio_2_0_la-glocalfileinfo.lo \
+@@ -545,9 +542,9 @@
+ libgio_2_0_la-gzlibcompressor.lo \
+ libgio_2_0_la-gzlibdecompressor.lo \
+ libgio_2_0_la-gioenumtypes.lo libgio_2_0_la-glistmodel.lo \
+- libgio_2_0_la-gliststore.lo $(am__objects_3) $(am__objects_7) \
+- $(am__objects_10) $(am__objects_11) $(am__objects_14) \
+- $(am__objects_15) $(am__objects_16) $(am__objects_4)
++ libgio_2_0_la-gliststore.lo $(am__objects_3) $(am__objects_6) \
++ $(am__objects_9) $(am__objects_10) $(am__objects_13) \
++ $(am__objects_14) $(am__objects_15) $(am__objects_4)
+ libgio_2_0_la_OBJECTS = $(am_libgio_2_0_la_OBJECTS)
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+@@ -1416,10 +1413,10 @@
+ $(NULL)
+
+ platform_libadd = $(am__append_20) $(am__append_23) $(am__append_26) \
+- $(am__append_30) $(am__append_35)
++ $(am__append_30) $(am__append_34)
+ platform_deps = $(am__append_21) $(am__append_24) $(am__append_27) \
+ $(am__append_31)
+-appinfo_sources = $(am__append_29) $(am__append_34)
++appinfo_sources = $(am__append_29) $(am__append_33)
+ @OS_UNIX_TRUE at unix_sources = gfiledescriptorbased.c gunixconnection.c \
+ @OS_UNIX_TRUE@ gunixcredentialsmessage.c gunixfdlist.c \
+ @OS_UNIX_TRUE@ gunixfdmessage.c gunixmount.c gunixmount.h \
+@@ -1429,7 +1426,7 @@
+ @OS_UNIX_TRUE@ gunixoutputstream.c gcontenttype.c \
+ @OS_UNIX_TRUE@ gcontenttypeprivate.h gfdonotificationbackend.c \
+ @OS_UNIX_TRUE@ ggtknotificationbackend.c $(NULL) \
+- at OS_UNIX_TRUE@ $(am__append_32) $(am__append_33)
++ at OS_UNIX_TRUE@ $(am__append_32)
+ @OS_UNIX_TRUE at giounixincludedir = $(includedir)/gio-unix-2.0/gio
+ @OS_UNIX_TRUE at giounixinclude_HEADERS = \
+ @OS_UNIX_TRUE@ gdesktopappinfo.h \
+@@ -1650,10 +1647,10 @@
+ @OS_WIN32_AND_DLL_COMPILATION_TRUE at gio_win32_res = gio-win32-res.o
+ @OS_WIN32_AND_DLL_COMPILATION_TRUE at gio_win32_res_ldflag = -Wl,$(gio_win32_res)
+ libgio_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS) \
+- $(am__append_36)
++ $(am__append_35)
+ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) $(gio_win32_res_ldflag) \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+- -export-dynamic $(no_undefined) $(am__append_37)
++ -export-dynamic $(no_undefined) $(am__append_36)
+ libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
+ gio_headers = \
+ gappinfo.h \
+@@ -2206,7 +2203,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgio_2_0_la-gbytesicon.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgio_2_0_la-gcancellable.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgio_2_0_la-gcharsetconverter.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgio_2_0_la-gcontenttype-win32.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgio_2_0_la-gcontenttype.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgio_2_0_la-gcontextspecificgroup.Plo at am__quote@
+@@ -3324,13 +3320,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_2_0_la-ggtknotificationbackend.lo `test -f 'ggtknotificationbackend.c' || echo '$(srcdir)/'`ggtknotificationbackend.c
+
+-libgio_2_0_la-gcocoanotificationbackend.lo: gcocoanotificationbackend.c
+- at am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_2_0_la-gcocoanotificationbackend.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Tpo -c -o libgio_2_0_la-gcocoanotificationbackend.lo `test -f 'gcocoanotificationbackend.c' || echo '$(srcdir)/'`gcocoanotificationbackend.c
+- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Tpo $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gcocoanotificationbackend.c' object='libgio_2_0_la-gcocoanotificationbackend.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_2_0_la-gcocoanotificationbackend.lo `test -f 'gcocoanotificationbackend.c' || echo '$(srcdir)/'`gcocoanotificationbackend.c
+-
+ libgio_2_0_la-gnetworkmonitornetlink.lo: gnetworkmonitornetlink.c
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_2_0_la-gnetworkmonitornetlink.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gnetworkmonitornetlink.Tpo -c -o libgio_2_0_la-gnetworkmonitornetlink.lo `test -f 'gnetworkmonitornetlink.c' || echo '$(srcdir)/'`gnetworkmonitornetlink.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gnetworkmonitornetlink.Tpo $(DEPDIR)/libgio_2_0_la-gnetworkmonitornetlink.Plo
+--- gio/giomodule.c.orig 2015-08-18 22:35:30.000000000 -0500
++++ gio/giomodule.c 2015-10-10 18:32:39.000000000 -0500
+@@ -911,10 +911,6 @@
+ extern GType g_gtk_notification_backend_get_type (void);
+ #endif
+
+-#ifdef HAVE_COCOA
+-extern GType g_cocoa_notification_backend_get_type (void);
+-#endif
+-
+ #ifdef G_PLATFORM_WIN32
+
+ #include <windows.h>
+@@ -1088,9 +1084,6 @@
+ g_type_ensure (g_fdo_notification_backend_get_type ());
+ g_type_ensure (g_gtk_notification_backend_get_type ());
+ #endif
+-#ifdef HAVE_COCOA
+- g_type_ensure (g_cocoa_notification_backend_get_type ());
+-#endif
+ #ifdef G_OS_WIN32
+ g_type_ensure (_g_winhttp_vfs_get_type ());
+ #endif
Deleted: trunk/dports/devel/glib2/files/yosemite-libtool.patch
===================================================================
--- trunk/dports/devel/glib2/files/yosemite-libtool.patch 2015-10-11 15:45:45 UTC (rev 141130)
+++ trunk/dports/devel/glib2/files/yosemite-libtool.patch 2015-10-11 16:09:15 UTC (rev 141131)
@@ -1,13 +0,0 @@
-Index: configure
-===================================================================
---- configure.orig
-+++ configure
-@@ -11742,7 +11742,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile 2015-10-11 15:45:45 UTC (rev 141130)
+++ trunk/dports/devel/glib2-devel/Portfile 2015-10-11 16:09:15 UTC (rev 141131)
@@ -10,12 +10,7 @@
name glib2-devel
conflicts glib2
set my_name glib
-# Don't upgrade to 2.45.3 or newer because it requires OS X 10.9 or later.
-# Discussing what to do about this:
-# https://mail.gnome.org/archives/gtk-devel-list/2015-September/msg00025.html
-# https://bugzilla.gnome.org/show_bug.cgi?id=747146
-version 2.45.2
-revision 1
+version 2.46.0
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign openmaintainer
@@ -35,8 +30,8 @@
master_sites gnome:sources/${my_name}/${branch}/
-checksums rmd160 ace22e7188863a07b1d73897aa7bffb9f9589525 \
- sha256 3e38eddd6356da3f2ae7a47b4fcfa21d64169e811202c6bb8823474b70766c2b
+checksums rmd160 dafbe7195a2171f1201570d20912c6a4ead23201 \
+ sha256 b1cee83469ae7d80f17c267c37f090414e93960bd62d2b254a5a96fbc5baacb4
# ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
# See https://trac.macports.org/changeset/27148
@@ -47,11 +42,12 @@
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
-# Don't link with "-flat_namespace -undefined suppress" on Yosemite and later.
-patchfiles-append yosemite-libtool.patch
+if {[vercmp ${macosx_deployment_target} 10.9] < 0} {
+ # gcocoanotificationbackend requires OS X 10.9 or later.
+ patchfiles-append remove-gcocoanotificationbackend.patch
+}
depends_build bin:xmllint:libxml2
Deleted: 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 2015-10-11 15:45:45 UTC (rev 141130)
+++ trunk/dports/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff 2015-10-11 16:09:15 UTC (rev 141131)
@@ -1,119 +0,0 @@
---- gio/gdbusaddress.c.orig 2013-05-27 10:01:46.000000000 -0700
-+++ gio/gdbusaddress.c 2013-06-13 22:48:22.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;
Added: trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend.patch
===================================================================
--- trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend.patch (rev 0)
+++ trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend.patch 2015-10-11 16:09:15 UTC (rev 141131)
@@ -0,0 +1,308 @@
+Remove GNotification support added in https://bugzilla.gnome.org/show_bug.cgi?id=747146
+Reverts:
+https://git.gnome.org/browse/glib/commit/?id=89058e8a9b769ab223bc75739f5455dab18f7a3d
+And most of:
+https://git.gnome.org/browse/glib/commit/?id=36e093a31a9eb12021e7780b9e322c29763ffa58
+--- configure.orig 2015-09-21 07:39:10.000000000 -0500
++++ configure 2015-10-10 18:33:12.000000000 -0500
+@@ -6029,30 +5969,6 @@
+ COCOA_LIBS="-Wl,-framework,Foundation"
+ LDFLAGS="$LDFLAGS $COCOA_LIBS"
+
+- osx_version=`sw_vers -productVersion`
+- osx_min_version="10.9.0"
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking OSX version >= $osx_min_version" >&5
+-$as_echo_n "checking OSX version >= $osx_min_version... " >&6; }
+- as_arg_v1=$osx_version
+-as_arg_v2=$osx_min_version
+-awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
+-case $? in #(
+- 1) :
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- as_fn_error $? "OSX version is too old!" "$LINENO" 5
+- ;; #(
+- 0) :
+- ;; #(
+- 2) :
+- ;; #(
+- *) :
+- ;;
+-esac
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+ else
+ COCOA_LIBS=""
+ fi
+--- configure.ac.orig 2015-09-21 07:38:33.000000000 -0500
++++ configure.ac 2015-10-10 18:32:37.000000000 -0500
+@@ -223,15 +223,6 @@
+ AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
+ COCOA_LIBS="-Wl,-framework,Foundation"
+ LDFLAGS="$LDFLAGS $COCOA_LIBS"
+-
+- osx_version=`sw_vers -productVersion`
+- osx_min_version="10.9.0"
+- AC_MSG_CHECKING([OSX version >= $osx_min_version])
+- AS_VERSION_COMPARE([$osx_version], [$osx_min_version], [
+- AC_MSG_RESULT([no])
+- AC_MSG_ERROR([OSX version is too old!])
+- ])
+- AC_MSG_RESULT([yes])
+ ], [COCOA_LIBS=""])
+
+ AC_SUBST([COCOA_LIBS])
+--- gio/Makefile.am.orig 2015-09-04 12:56:56.000000000 -0500
++++ gio/Makefile.am 2015-10-10 18:32:38.000000000 -0500
+@@ -265,9 +265,6 @@
+ ggtknotificationbackend.c \
+ $(NULL)
+
+-if OS_COCOA
+-unix_sources += gcocoanotificationbackend.c
+-endif
+
+ giounixincludedir=$(includedir)/gio-unix-2.0/gio
+ giounixinclude_HEADERS = \
+@@ -527,7 +524,7 @@
+ if OS_COCOA
+ # This is dumb. The ObjC source file should be properly named .m
+ libgio_2_0_la_CFLAGS += -xobjective-c
+-libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation -Wl,-framework,AppKit
++libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation
+ endif
+
+ libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
+--- gio/Makefile.in.orig 2015-09-21 07:39:06.000000000 -0500
++++ gio/Makefile.in 2015-10-10 18:33:18.000000000 -0500
+@@ -181,27 +181,26 @@
+ @OS_UNIX_TRUE at am__append_29 = gdesktopappinfo.c
+ @OS_UNIX_TRUE at am__append_30 = xdgmime/libxdgmime.la
+ @OS_UNIX_TRUE at am__append_31 = xdgmime/libxdgmime.la
+- at OS_COCOA_TRUE@@OS_UNIX_TRUE at am__append_32 = gcocoanotificationbackend.c
+- at HAVE_NETLINK_TRUE@@OS_UNIX_TRUE at am__append_33 = \
++ at HAVE_NETLINK_TRUE@@OS_UNIX_TRUE at am__append_32 = \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.c \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.h \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornm.c \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornm.h \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ $(NULL)
+
+- at OS_WIN32_TRUE@am__append_34 = gwin32appinfo.c gwin32appinfo.h
+- at OS_WIN32_TRUE@am__append_35 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
++ at OS_WIN32_TRUE@am__append_33 = gwin32appinfo.c gwin32appinfo.h
++ at OS_WIN32_TRUE@am__append_34 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
+
+ # This is dumb. The ObjC source file should be properly named .m
+- at OS_COCOA_TRUE@am__append_36 = -xobjective-c
+- at OS_COCOA_TRUE@am__append_37 = -Wl,-framework,Foundation -Wl,-framework,AppKit
++ at OS_COCOA_TRUE@am__append_35 = -xobjective-c
++ at OS_COCOA_TRUE@am__append_36 = -Wl,-framework,Foundation
+ bin_PROGRAMS = gio-querymodules$(EXEEXT) glib-compile-schemas$(EXEEXT) \
+ glib-compile-resources$(EXEEXT) gsettings$(EXEEXT) \
+ gdbus$(EXEEXT) $(am__EXEEXT_1) gresource$(EXEEXT)
+
+ # ------------------------------------------------------------------------
+ # gapplication(1) tool
+- at OS_UNIX_TRUE@am__append_38 = gapplication
++ at OS_UNIX_TRUE@am__append_37 = gapplication
+ subdir = gio
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \
+@@ -317,17 +316,17 @@
+ gunixvolume.c gunixvolume.h gunixvolumemonitor.c \
+ gunixvolumemonitor.h gunixinputstream.c gunixoutputstream.c \
+ gcontenttype.c gcontenttypeprivate.h gfdonotificationbackend.c \
+- ggtknotificationbackend.c gcocoanotificationbackend.c \
+- gnetworkmonitornetlink.c gnetworkmonitornetlink.h \
+- gnetworkmonitornm.c gnetworkmonitornm.h gdbusdaemon.c \
+- gdbusdaemon.h gdbus-daemon-generated.c \
+- gdbus-daemon-generated.h gwin32registrykey.c \
+- gwin32registrykey.h gcontenttype-win32.c gwin32mount.c \
+- gwin32mount.h gwin32volumemonitor.c gwin32volumemonitor.h \
+- gwin32inputstream.c gwin32outputstream.c gwin32outputstream.h \
+- gwin32networking.h gapplication.c gapplicationcommandline.c \
+- gapplicationimpl-dbus.c gapplicationimpl.h gactiongroup.c \
+- gactionmap.c gsimpleactiongroup.c gremoteactiongroup.c \
++ ggtknotificationbackend.c gnetworkmonitornetlink.c \
++ gnetworkmonitornetlink.h gnetworkmonitornm.c \
++ gnetworkmonitornm.h gdbusdaemon.c gdbusdaemon.h \
++ gdbus-daemon-generated.c gdbus-daemon-generated.h \
++ gwin32registrykey.c gwin32registrykey.h gcontenttype-win32.c \
++ gwin32mount.c gwin32mount.h gwin32volumemonitor.c \
++ gwin32volumemonitor.h gwin32inputstream.c gwin32outputstream.c \
++ gwin32outputstream.h gwin32networking.h gapplication.c \
++ gapplicationcommandline.c gapplicationimpl-dbus.c \
++ gapplicationimpl.h gactiongroup.c gactionmap.c \
++ gsimpleactiongroup.c gremoteactiongroup.c \
+ gactiongroupexporter.c gdbusactiongroup-private.h \
+ gdbusactiongroup.c gaction.c gpropertyaction.c gsimpleaction.c \
+ gmenumodel.c gmenu.c gmenuexporter.c gdbusmenumodel.c \
+@@ -373,11 +372,10 @@
+ @OS_WIN32_TRUE at am__objects_2 = libgio_2_0_la-gwin32appinfo.lo
+ am__objects_3 = $(am__objects_1) $(am__objects_2)
+ am__objects_4 =
+- at OS_COCOA_TRUE@@OS_UNIX_TRUE at am__objects_5 = libgio_2_0_la-gcocoanotificationbackend.lo
+- at HAVE_NETLINK_TRUE@@OS_UNIX_TRUE at am__objects_6 = libgio_2_0_la-gnetworkmonitornetlink.lo \
++ at HAVE_NETLINK_TRUE@@OS_UNIX_TRUE at am__objects_5 = libgio_2_0_la-gnetworkmonitornetlink.lo \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ libgio_2_0_la-gnetworkmonitornm.lo \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ $(am__objects_4)
+- at OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gfiledescriptorbased.lo \
++ at OS_UNIX_TRUE@am__objects_6 = libgio_2_0_la-gfiledescriptorbased.lo \
+ @OS_UNIX_TRUE@ libgio_2_0_la-gunixconnection.lo \
+ @OS_UNIX_TRUE@ libgio_2_0_la-gunixcredentialsmessage.lo \
+ @OS_UNIX_TRUE@ libgio_2_0_la-gunixfdlist.lo \
+@@ -392,18 +390,17 @@
+ @OS_UNIX_TRUE@ libgio_2_0_la-gcontenttype.lo \
+ @OS_UNIX_TRUE@ libgio_2_0_la-gfdonotificationbackend.lo \
+ @OS_UNIX_TRUE@ libgio_2_0_la-ggtknotificationbackend.lo \
+- at OS_UNIX_TRUE@ $(am__objects_4) $(am__objects_5) \
+- at OS_UNIX_TRUE@ $(am__objects_6)
+-am__objects_8 = libgio_2_0_la-gdbusdaemon.lo \
++ at OS_UNIX_TRUE@ $(am__objects_4) $(am__objects_5)
++am__objects_7 = libgio_2_0_la-gdbusdaemon.lo \
+ libgio_2_0_la-gdbus-daemon-generated.lo $(am__objects_4)
+-am__objects_9 = $(am__objects_8) libgio_2_0_la-gwin32registrykey.lo \
++am__objects_8 = $(am__objects_7) libgio_2_0_la-gwin32registrykey.lo \
+ libgio_2_0_la-gcontenttype-win32.lo \
+ libgio_2_0_la-gwin32mount.lo \
+ libgio_2_0_la-gwin32volumemonitor.lo \
+ libgio_2_0_la-gwin32inputstream.lo \
+ libgio_2_0_la-gwin32outputstream.lo $(am__objects_4)
+- at OS_WIN32_TRUE@am__objects_10 = $(am__objects_9)
+-am__objects_11 = libgio_2_0_la-gapplication.lo \
++ at OS_WIN32_TRUE@am__objects_9 = $(am__objects_8)
++am__objects_10 = libgio_2_0_la-gapplication.lo \
+ libgio_2_0_la-gapplicationcommandline.lo \
+ libgio_2_0_la-gapplicationimpl-dbus.lo \
+ libgio_2_0_la-gactiongroup.lo libgio_2_0_la-gactionmap.lo \
+@@ -416,11 +413,11 @@
+ libgio_2_0_la-gmenu.lo libgio_2_0_la-gmenuexporter.lo \
+ libgio_2_0_la-gdbusmenumodel.lo libgio_2_0_la-gnotification.lo \
+ libgio_2_0_la-gnotificationbackend.lo $(am__objects_4)
+- at OS_WIN32_TRUE@am__objects_12 = \
++ at OS_WIN32_TRUE@am__objects_11 = \
+ @OS_WIN32_TRUE@ libgio_2_0_la-gregistrysettingsbackend.lo
+- at OS_COCOA_TRUE@am__objects_13 = \
++ at OS_COCOA_TRUE@am__objects_12 = \
+ @OS_COCOA_TRUE@ libgio_2_0_la-gnextstepsettingsbackend.lo
+-am__objects_14 = libgio_2_0_la-gvdb-reader.lo \
++am__objects_13 = libgio_2_0_la-gvdb-reader.lo \
+ libgio_2_0_la-gdelayedsettingsbackend.lo \
+ libgio_2_0_la-gkeyfilesettingsbackend.lo \
+ libgio_2_0_la-gmemorysettingsbackend.lo \
+@@ -428,8 +425,8 @@
+ libgio_2_0_la-gsettingsbackend.lo \
+ libgio_2_0_la-gsettingsschema.lo \
+ libgio_2_0_la-gsettings-mapping.lo libgio_2_0_la-gsettings.lo \
+- $(am__objects_12) $(am__objects_13)
+-am__objects_15 = libgio_2_0_la-gdbusutils.lo \
++ $(am__objects_11) $(am__objects_12)
++am__objects_14 = libgio_2_0_la-gdbusutils.lo \
+ libgio_2_0_la-gdbusaddress.lo \
+ libgio_2_0_la-gdbusauthobserver.lo libgio_2_0_la-gdbusauth.lo \
+ libgio_2_0_la-gdbusauthmechanism.lo \
+@@ -451,7 +448,7 @@
+ libgio_2_0_la-gdbusobjectmanagerclient.lo \
+ libgio_2_0_la-gdbusobjectmanagerserver.lo \
+ libgio_2_0_la-gtestdbus.lo $(am__objects_4)
+-am__objects_16 = libgio_2_0_la-ghttpproxy.lo \
++am__objects_15 = libgio_2_0_la-ghttpproxy.lo \
+ libgio_2_0_la-glocalfile.lo \
+ libgio_2_0_la-glocalfileenumerator.lo \
+ libgio_2_0_la-glocalfileinfo.lo \
+@@ -545,9 +542,9 @@
+ libgio_2_0_la-gzlibcompressor.lo \
+ libgio_2_0_la-gzlibdecompressor.lo \
+ libgio_2_0_la-gioenumtypes.lo libgio_2_0_la-glistmodel.lo \
+- libgio_2_0_la-gliststore.lo $(am__objects_3) $(am__objects_7) \
+- $(am__objects_10) $(am__objects_11) $(am__objects_14) \
+- $(am__objects_15) $(am__objects_16) $(am__objects_4)
++ libgio_2_0_la-gliststore.lo $(am__objects_3) $(am__objects_6) \
++ $(am__objects_9) $(am__objects_10) $(am__objects_13) \
++ $(am__objects_14) $(am__objects_15) $(am__objects_4)
+ libgio_2_0_la_OBJECTS = $(am_libgio_2_0_la_OBJECTS)
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+@@ -1416,10 +1413,10 @@
+ $(NULL)
+
+ platform_libadd = $(am__append_20) $(am__append_23) $(am__append_26) \
+- $(am__append_30) $(am__append_35)
++ $(am__append_30) $(am__append_34)
+ platform_deps = $(am__append_21) $(am__append_24) $(am__append_27) \
+ $(am__append_31)
+-appinfo_sources = $(am__append_29) $(am__append_34)
++appinfo_sources = $(am__append_29) $(am__append_33)
+ @OS_UNIX_TRUE at unix_sources = gfiledescriptorbased.c gunixconnection.c \
+ @OS_UNIX_TRUE@ gunixcredentialsmessage.c gunixfdlist.c \
+ @OS_UNIX_TRUE@ gunixfdmessage.c gunixmount.c gunixmount.h \
+@@ -1429,7 +1426,7 @@
+ @OS_UNIX_TRUE@ gunixoutputstream.c gcontenttype.c \
+ @OS_UNIX_TRUE@ gcontenttypeprivate.h gfdonotificationbackend.c \
+ @OS_UNIX_TRUE@ ggtknotificationbackend.c $(NULL) \
+- at OS_UNIX_TRUE@ $(am__append_32) $(am__append_33)
++ at OS_UNIX_TRUE@ $(am__append_32)
+ @OS_UNIX_TRUE at giounixincludedir = $(includedir)/gio-unix-2.0/gio
+ @OS_UNIX_TRUE at giounixinclude_HEADERS = \
+ @OS_UNIX_TRUE@ gdesktopappinfo.h \
+@@ -1650,10 +1647,10 @@
+ @OS_WIN32_AND_DLL_COMPILATION_TRUE at gio_win32_res = gio-win32-res.o
+ @OS_WIN32_AND_DLL_COMPILATION_TRUE at gio_win32_res_ldflag = -Wl,$(gio_win32_res)
+ libgio_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS) \
+- $(am__append_36)
++ $(am__append_35)
+ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) $(gio_win32_res_ldflag) \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+- -export-dynamic $(no_undefined) $(am__append_37)
++ -export-dynamic $(no_undefined) $(am__append_36)
+ libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
+ gio_headers = \
+ gappinfo.h \
+@@ -2206,7 +2203,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgio_2_0_la-gbytesicon.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgio_2_0_la-gcancellable.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgio_2_0_la-gcharsetconverter.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgio_2_0_la-gcontenttype-win32.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgio_2_0_la-gcontenttype.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgio_2_0_la-gcontextspecificgroup.Plo at am__quote@
+@@ -3324,13 +3320,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_2_0_la-ggtknotificationbackend.lo `test -f 'ggtknotificationbackend.c' || echo '$(srcdir)/'`ggtknotificationbackend.c
+
+-libgio_2_0_la-gcocoanotificationbackend.lo: gcocoanotificationbackend.c
+- at am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_2_0_la-gcocoanotificationbackend.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Tpo -c -o libgio_2_0_la-gcocoanotificationbackend.lo `test -f 'gcocoanotificationbackend.c' || echo '$(srcdir)/'`gcocoanotificationbackend.c
+- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Tpo $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gcocoanotificationbackend.c' object='libgio_2_0_la-gcocoanotificationbackend.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_2_0_la-gcocoanotificationbackend.lo `test -f 'gcocoanotificationbackend.c' || echo '$(srcdir)/'`gcocoanotificationbackend.c
+-
+ libgio_2_0_la-gnetworkmonitornetlink.lo: gnetworkmonitornetlink.c
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_2_0_la-gnetworkmonitornetlink.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gnetworkmonitornetlink.Tpo -c -o libgio_2_0_la-gnetworkmonitornetlink.lo `test -f 'gnetworkmonitornetlink.c' || echo '$(srcdir)/'`gnetworkmonitornetlink.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gnetworkmonitornetlink.Tpo $(DEPDIR)/libgio_2_0_la-gnetworkmonitornetlink.Plo
+--- gio/giomodule.c.orig 2015-08-18 22:35:30.000000000 -0500
++++ gio/giomodule.c 2015-10-10 18:32:39.000000000 -0500
+@@ -911,10 +911,6 @@
+ extern GType g_gtk_notification_backend_get_type (void);
+ #endif
+
+-#ifdef HAVE_COCOA
+-extern GType g_cocoa_notification_backend_get_type (void);
+-#endif
+-
+ #ifdef G_PLATFORM_WIN32
+
+ #include <windows.h>
+@@ -1088,9 +1084,6 @@
+ g_type_ensure (g_fdo_notification_backend_get_type ());
+ g_type_ensure (g_gtk_notification_backend_get_type ());
+ #endif
+-#ifdef HAVE_COCOA
+- g_type_ensure (g_cocoa_notification_backend_get_type ());
+-#endif
+ #ifdef G_OS_WIN32
+ g_type_ensure (_g_winhttp_vfs_get_type ());
+ #endif
Deleted: trunk/dports/devel/glib2-devel/files/yosemite-libtool.patch
===================================================================
--- trunk/dports/devel/glib2-devel/files/yosemite-libtool.patch 2015-10-11 15:45:45 UTC (rev 141130)
+++ trunk/dports/devel/glib2-devel/files/yosemite-libtool.patch 2015-10-11 16:09:15 UTC (rev 141131)
@@ -1,13 +0,0 @@
-Index: configure
-===================================================================
---- configure.orig
-+++ configure
-@@ -11742,7 +11742,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151011/25390d78/attachment-0001.html>
More information about the macports-changes
mailing list