[141255] users/devans/GNOME-3/stable/dports/devel/glib2

13 Oct 2015

Revision: 141255
          https://trac.macports.org/changeset/141255
Author:   devans@macports.org
Date:     2015-10-13 12:43:41 -0700 (Tue, 13 Oct 2015)
Log Message:
-----------
GNOME-3/stable: glib2, merge changes from trunk, realign/restore get-launchd-dbus-session-address patch to avoid startup failures with apps that use glib2 to access the dbus session bus, increment revision.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/devel/glib2/Portfile
    users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-configure.diff
    users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
    users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gi18n.h.diff
    users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff
    users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff
    users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib-gmain.c.diff
    users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib_gunicollate.c.diff

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/devel/glib2/files/remove-gcocoanotificationbackend-unused.patch
    users/devans/GNOME-3/stable/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch

Removed Paths:
-------------
    users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-libtool.patch

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/devel/glib2/


Property changes on: users/devans/GNOME-3/stable/dports/devel/glib2
___________________________________________________________________
Modified: svn:mergeinfo
   - /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,125620-140962
/trunk/dports/devel/glib2-devel:51739-120463
/users/cal/ports/devel/glib2:96570-97031
/users/devans/GNOME-3/unstable/dports/devel/glib2:120511-125619
   + /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:125620-141254
/trunk/dports/devel/glib2-devel:51739-120463
/users/cal/ports/devel/glib2:96570-97031
/users/devans/GNOME-3/unstable/dports/devel/glib2:120511-125619,128305-141254

Modified: users/devans/GNOME-3/stable/dports/devel/glib2/Portfile
===================================================================

--- users/devans/GNOME-3/stable/dports/devel/glib2/Portfile	2015-10-13 17:36:05 UTC (rev 141254)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/Portfile	2015-10-13 19:43:41 UTC (rev 141255)
@@ -10,12 +10,8 @@
 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
+revision                    2
 set branch                  [join [lrange [split ${version} .] 0 1] .]
 categories                  devel
 maintainers                 ryandesign openmaintainer
@@ -35,8 +31,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
@@ -50,8 +46,10 @@
                             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
 
@@ -107,7 +105,7 @@
 test.target                 check
 
 post-destroot {
-    file delete ${destroot}${prefix}/lib/charset.alias
+    delete ${destroot}${prefix}/lib/charset.alias
 
     set docdir ${prefix}/share/doc/${my_name}
     xinstall -d ${destroot}${docdir}

Modified: users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-configure.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-configure.diff	2015-10-13 17:36:05 UTC (rev 141254)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-configure.diff	2015-10-13 19:43:41 UTC (rev 141255)
@@ -1,6 +1,6 @@
---- configure.orig	2015-03-02 10:57:11.000000000 -0600
-+++ configure	2015-03-06 03:15:18.000000000 -0600
-@@ -6086,7 +6086,7 @@
+--- configure.orig	2015-07-20 14:45:59.000000000 -0700
++++ configure	2015-07-20 17:27:32.000000000 -0700
+@@ -6176,7 +6176,7 @@
  fi
  
  GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@@ -9,7 +9,7 @@
  
  
   if test "x$with_runtime_libdir" != "x"; then
-@@ -22240,9 +22240,6 @@
+@@ -22842,9 +22842,6 @@
   presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
   esac
  
@@ -19,7 +19,16 @@
  
  
  # check for header files
-@@ -30464,10 +30461,10 @@
+@@ -29489,7 +29486,7 @@
+ 
+   for flag in \
+    -Wall -Wstrict-prototypes -Werror=declaration-after-statement \
+-   -Werror=missing-prototypes -Werror=implicit-function-declaration \
++    -Werror=implicit-function-declaration \
+    -Werror=pointer-arith -Werror=init-self -Werror=format-security \
+    -Werror=format=2 -Werror=missing-include-dirs; do
+ 
+@@ -31042,10 +31039,10 @@
  *)			glib_vacopy=''
  esac
  
@@ -33,7 +42,7 @@
  
  if test x$glib_cv_hasinline = xyes; then
      glib_inline='#define G_HAVE_INLINE 1'
-@@ -32224,18 +32221,32 @@
+@@ -32714,18 +32711,32 @@
  	cat >>$outfile <<_______EOF
  #define G_HAVE_GINT64 1          /* deprecated, always true */
  
@@ -73,7 +82,7 @@
  _______EOF
          else
  	  cat >>$outfile <<_______EOF
-@@ -32247,10 +32258,17 @@
+@@ -32737,10 +32748,17 @@
  
          cat >>$outfile <<_______EOF
  
@@ -95,7 +104,7 @@
  
  _______EOF
  
-@@ -32279,18 +32297,33 @@
+@@ -32769,18 +32787,33 @@
  	if test -z "$glib_unknown_void_p"; then
  	  cat >>$outfile <<_______EOF
  
@@ -138,7 +147,7 @@
  _______EOF
  	else
  	  echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
-@@ -32405,7 +32438,9 @@
+@@ -32895,7 +32928,9 @@
  
  	if test x"$g_memory_barrier_needed" != xno; then
  	  echo >>$outfile
@@ -148,7 +157,7 @@
  	fi
  	if test x"$g_atomic_lock_free" = xyes; then
            echo >>$outfile
-@@ -32415,27 +32450,52 @@
+@@ -32905,27 +32940,52 @@
  	g_bit_sizes="16 32 64"
  	for bits in $g_bit_sizes; do
  	  cat >>$outfile <<_______EOF

Modified: users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff	2015-10-13 17:36:05 UTC (rev 141254)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff	2015-10-13 19:43:41 UTC (rev 141255)
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
  
  /* ---------------------------------------------------------------------------------------------------- */
  
@@ -104,16 +104,16 @@
  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 */
+@@ -1503,7 +1600,12 @@
+    * X11 autolaunching; on Windows this means a different autolaunching
+    * mechanism based on shared memory.
+    */
 +
 +#ifdef __APPLE__
-+  ret = get_session_address_macports_specific (error);
++  return get_session_address_macports_specific (error);
 +#else
-   ret = get_session_address_dbus_launch (error);
+   return get_session_address_dbus_launch (error);
 +#endif
-+
- #else
-   /* TODO: implement for OS X */
-   ret = NULL;
+ }
+ 
+ /* ---------------------------------------------------------------------------------------------------- */

Modified: users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gi18n.h.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gi18n.h.diff	2015-10-13 17:36:05 UTC (rev 141254)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gi18n.h.diff	2015-10-13 19:43:41 UTC (rev 141255)
@@ -1,6 +1,6 @@
---- glib/gi18n.h.orig	2008-11-23 23:45:23.000000000 -0600
-+++ glib/gi18n.h	2008-11-25 23:59:29.000000000 -0600
-@@ -27,7 +27,9 @@
+--- glib/gi18n.h.orig	2014-12-19 13:49:48.000000000 -0800
++++ glib/gi18n.h	2015-07-20 17:28:35.000000000 -0700
+@@ -25,7 +25,9 @@
  
  #define  _(String) gettext (String)
  #define Q_(String) g_dpgettext (NULL, String, 0)

Modified: users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff	2015-10-13 17:36:05 UTC (rev 141254)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff	2015-10-13 19:43:41 UTC (rev 141255)
@@ -1,20 +1,20 @@
---- gio/gdbusprivate.c.orig	2012-11-16 17:01:40.000000000 -0600
-+++ gio/gdbusprivate.c	2013-01-15 23:21:22.000000000 -0600
-@@ -2100,7 +2100,7 @@
+--- gio/gdbusprivate.c.orig	2015-05-22 14:01:27.000000000 -0700
++++ gio/gdbusprivate.c	2015-07-20 17:28:35.000000000 -0700
+@@ -2068,7 +2068,7 @@
    /* TODO: use PACKAGE_LOCALSTATEDIR ? */
    ret = NULL;
    first_error = NULL;
 -  if (!g_file_get_contents ("/var/lib/dbus/machine-id",
-+  if (!g_file_get_contents ("@@PREFIX@@/var/lib/dbus/machine-id",
++  if (!g_file_get_contents ("/opt/local/var/lib/dbus/machine-id",
                              &ret,
                              NULL,
                              &first_error) &&
-@@ -2110,7 +2110,7 @@
+@@ -2078,7 +2078,7 @@
                              NULL))
      {
        g_propagate_prefixed_error (error, first_error,
 -                                  _("Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "));
-+                                  _("Unable to load @@PREFIX@@/var/lib/dbus/machine-id or /etc/machine-id: "));
++                                  _("Unable to load /opt/local/var/lib/dbus/machine-id or /etc/machine-id: "));
      }
    else
      {

Modified: users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff	2015-10-13 17:36:05 UTC (rev 141254)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff	2015-10-13 19:43:41 UTC (rev 141255)
@@ -1,11 +1,11 @@
---- gio/xdgmime/xdgmime.c.orig	2009-03-12 22:09:52.000000000 -0600
-+++ gio/xdgmime/xdgmime.c	2009-04-09 23:41:01.000000000 -0600
-@@ -257,7 +257,7 @@
+--- gio/xdgmime/xdgmime.c.orig	2014-12-19 13:49:48.000000000 -0800
++++ gio/xdgmime/xdgmime.c	2015-07-20 17:28:35.000000000 -0700
+@@ -255,7 +255,7 @@
  
    xdg_data_dirs = getenv ("XDG_DATA_DIRS");
    if (xdg_data_dirs == NULL)
 -    xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+    xdg_data_dirs = "@@PREFIX@@/share/:/usr/share/";
++    xdg_data_dirs = "/opt/local/share/:/usr/share/";
  
    ptr = xdg_data_dirs;
  

Modified: users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib-gmain.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib-gmain.c.diff	2015-10-13 17:36:05 UTC (rev 141254)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib-gmain.c.diff	2015-10-13 19:43:41 UTC (rev 141255)
@@ -1,9 +1,6 @@
-Fix g_get_monotonic_time on non-Intel processors
-https://bugzilla.gnome.org/show_bug.cgi?id=728123
-https://bug728123.bugzilla-attachments.gnome.org/attachment.cgi?id=275596
---- glib/gmain.c.orig
-+++ glib/gmain.c
-@@ -2648,46 +2648,34 @@ gint64
+--- glib/gmain.c.orig	2015-05-22 14:01:27.000000000 -0700
++++ glib/gmain.c	2015-07-20 17:28:35.000000000 -0700
+@@ -2706,46 +2706,34 @@
  g_get_monotonic_time (void)
  {
    static mach_timebase_info_data_t timebase_info;

Modified: users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib_gunicollate.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib_gunicollate.c.diff	2015-10-13 17:36:05 UTC (rev 141254)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib_gunicollate.c.diff	2015-10-13 19:43:41 UTC (rev 141255)
@@ -1,6 +1,6 @@
---- glib/gunicollate.c.orig	2009-03-31 18:04:20.000000000 -0500
-+++ glib/gunicollate.c	2010-03-06 17:59:08.000000000 -0600
-@@ -26,6 +26,9 @@
+--- glib/gunicollate.c.orig	2014-12-19 13:49:48.000000000 -0800
++++ glib/gunicollate.c	2015-07-20 17:28:35.000000000 -0700
+@@ -25,6 +25,9 @@
  #include <wchar.h>
  #endif
  

Copied: users/devans/GNOME-3/stable/dports/devel/glib2/files/remove-gcocoanotificationbackend-unused.patch (from rev 141254, trunk/dports/devel/glib2/files/remove-gcocoanotificationbackend-unused.patch)
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glib2/files/remove-gcocoanotificationbackend-unused.patch	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/remove-gcocoanotificationbackend-unused.patch	2015-10-13 19:43:41 UTC (rev 141255)
@@ -0,0 +1,47 @@
+Remove GNotification support added in https://bugzilla.gnome.org/show_bug.cgi?id=747146
+Reverts:
+https://git.gnome.org/browse/glib/commit/?id=89058e8a9b769ab223bc75739f5455d...
+And most of:
+https://git.gnome.org/browse/glib/commit/?id=36e093a31a9eb12021e7780b9e322c2...
+These patches to configure.ac and gio/Makefile.am are not used by the port but are
+used by the maintainer to regenerate the patches to configure and gio/Makefile.in
+that are used by the port.
+--- 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)

Copied: users/devans/GNOME-3/stable/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch (from rev 141254, trunk/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch)
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch	2015-10-13 19:43:41 UTC (rev 141255)
@@ -0,0 +1,269 @@
+Remove GNotification support added in https://bugzilla.gnome.org/show_bug.cgi?id=747146
+Reverts:
+https://git.gnome.org/browse/glib/commit/?id=89058e8a9b769ab223bc75739f5455d...
+And most of:
+https://git.gnome.org/browse/glib/commit/?id=36e093a31a9eb12021e7780b9e322c2...
+--- 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
+--- 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@am__append_29 = gdesktopappinfo.c
+ @OS_UNIX_TRUE@am__append_30 = xdgmime/libxdgmime.la
+ @OS_UNIX_TRUE@am__append_31 = xdgmime/libxdgmime.la
+-@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_32 = gcocoanotificationbackend.c
+-@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_33 = \
++@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@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)
+ 
+-@OS_WIN32_TRUE@am__append_34 = gwin32appinfo.c gwin32appinfo.h
+-@OS_WIN32_TRUE@am__append_35 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
++@OS_WIN32_TRUE@am__append_33 = gwin32appinfo.c gwin32appinfo.h
++@OS_WIN32_TRUE@am__append_34 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
+ 
+ # This is dumb.  The ObjC source file should be properly named .m
+-@OS_COCOA_TRUE@am__append_36 = -xobjective-c
+-@OS_COCOA_TRUE@am__append_37 = -Wl,-framework,Foundation -Wl,-framework,AppKit
++@OS_COCOA_TRUE@am__append_35 = -xobjective-c
++@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
+-@OS_UNIX_TRUE@am__append_38 = gapplication
++@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@am__objects_2 = libgio_2_0_la-gwin32appinfo.lo
+ am__objects_3 = $(am__objects_1) $(am__objects_2)
+ am__objects_4 =
+-@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__objects_5 = libgio_2_0_la-gcocoanotificationbackend.lo
+-@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__objects_6 = libgio_2_0_la-gnetworkmonitornetlink.lo \
++@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@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)
+-@OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gfiledescriptorbased.lo \
++@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 \
+-@OS_UNIX_TRUE@	$(am__objects_4) $(am__objects_5) \
+-@OS_UNIX_TRUE@	$(am__objects_6)
+-am__objects_8 = libgio_2_0_la-gdbusdaemon.lo \
++@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)
+-@OS_WIN32_TRUE@am__objects_10 = $(am__objects_9)
+-am__objects_11 = libgio_2_0_la-gapplication.lo \
++@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)
+-@OS_WIN32_TRUE@am__objects_12 =  \
++@OS_WIN32_TRUE@am__objects_11 =  \
+ @OS_WIN32_TRUE@	libgio_2_0_la-gregistrysettingsbackend.lo
+-@OS_COCOA_TRUE@am__objects_13 =  \
++@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_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@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@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) \
+-@OS_UNIX_TRUE@	$(am__append_32) $(am__append_33)
++@OS_UNIX_TRUE@	$(am__append_32)
+ @OS_UNIX_TRUE@giounixincludedir = $(includedir)/gio-unix-2.0/gio
+ @OS_UNIX_TRUE@giounixinclude_HEADERS = \
+ @OS_UNIX_TRUE@	gdesktopappinfo.h	\
+@@ -1650,10 +1647,10 @@
+ @OS_WIN32_AND_DLL_COMPILATION_TRUE@gio_win32_res = gio-win32-res.o
+ @OS_WIN32_AND_DLL_COMPILATION_TRUE@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@./$(DEPDIR)/libgio_2_0_la-gbytesicon.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcancellable.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcharsetconverter.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcontenttype-win32.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcontenttype.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcontextspecificgroup.Plo@am__quote@
+@@ -3324,13 +3320,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(AM_V_CC@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
+-@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
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Tpo $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gcocoanotificationbackend.c' object='libgio_2_0_la-gcocoanotificationbackend.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@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: users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-libtool.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-libtool.patch	2015-10-13 17:36:05 UTC (rev 141254)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-libtool.patch	2015-10-13 19:43:41 UTC (rev 141255)
@@ -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' ;;

    

devans＠macports.org

tags

participants (1)