[142851] users/devans/GNOME-3/unstable/dports/devel/glib2

devans at macports.org devans at macports.org
Sat Dec 12 07:30:18 PST 2015 

Revision: 142851
          https://trac.macports.org/changeset/142851
Author:   devans at macports.org
Date:     2015-11-24 15:02:37 -0800 (Tue, 24 Nov 2015)
Log Message:
-----------
GNOME-3/unstable: glib2, blacklist clang < 600 when using gcocoanotificationbackend (#49515).

Modified Paths:
--------------
    users/devans/GNOME-3/unstable/dports/devel/glib2/Portfile
    users/devans/GNOME-3/unstable/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch

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


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

Modified: users/devans/GNOME-3/unstable/dports/devel/glib2/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/devel/glib2/Portfile	2015-11-24 23:00:10 UTC (rev 142850)
+++ users/devans/GNOME-3/unstable/dports/devel/glib2/Portfile	2015-11-24 23:02:37 UTC (rev 142851)
@@ -48,6 +48,9 @@
 if {[vercmp ${macosx_deployment_target} 10.9] < 0} {
     # gcocoanotificationbackend requires OS X 10.9 or later.
     patchfiles-append       remove-gcocoanotificationbackend.patch
+} else {
+    # gcocoanotificationbackend.c:115:52: error: array subscript is not an integer
+    compiler.blacklist-append {clang < 600}
 }
 
 depends_build               bin:xmllint:libxml2

Modified: users/devans/GNOME-3/unstable/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch
===================================================================
--- users/devans/GNOME-3/unstable/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch	2015-11-24 23:00:10 UTC (rev 142850)
+++ users/devans/GNOME-3/unstable/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch	2015-11-24 23:02:37 UTC (rev 142851)
@@ -3,9 +3,9 @@
 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 @@
+--- configure.orig	2015-11-06 22:38:42.000000000 -0600
++++ configure	2015-11-06 22:38:43.000000000 -0600
+@@ -6032,30 +6032,6 @@
    COCOA_LIBS="-Wl,-framework,Foundation"
    LDFLAGS="$LDFLAGS $COCOA_LIBS"
  
@@ -36,9 +36,9 @@
  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 @@
+--- gio/Makefile.in.orig	2015-11-06 16:28:58.000000000 -0600
++++ gio/Makefile.in	2015-11-06 22:38:42.000000000 -0600
+@@ -177,27 +177,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
@@ -72,7 +72,7 @@
  subdir = gio
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \
-@@ -317,17 +316,17 @@
+@@ -313,17 +312,17 @@
  	gunixvolume.c gunixvolume.h gunixvolumemonitor.c \
  	gunixvolumemonitor.h gunixinputstream.c gunixoutputstream.c \
  	gcontenttype.c gcontenttypeprivate.h gfdonotificationbackend.c \
@@ -101,7 +101,7 @@
  	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 @@
+@@ -369,11 +368,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 =
@@ -115,7 +115,7 @@
  @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 @@
+@@ -388,18 +386,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 \
@@ -139,7 +139,7 @@
  	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 @@
+@@ -412,11 +409,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)
@@ -154,7 +154,7 @@
  	libgio_2_0_la-gdelayedsettingsbackend.lo \
  	libgio_2_0_la-gkeyfilesettingsbackend.lo \
  	libgio_2_0_la-gmemorysettingsbackend.lo \
-@@ -428,8 +425,8 @@
+@@ -424,8 +421,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 \
@@ -165,7 +165,7 @@
  	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 @@
+@@ -447,7 +444,7 @@
  	libgio_2_0_la-gdbusobjectmanagerclient.lo \
  	libgio_2_0_la-gdbusobjectmanagerserver.lo \
  	libgio_2_0_la-gtestdbus.lo $(am__objects_4)
@@ -174,7 +174,7 @@
  	libgio_2_0_la-glocalfile.lo \
  	libgio_2_0_la-glocalfileenumerator.lo \
  	libgio_2_0_la-glocalfileinfo.lo \
-@@ -545,9 +542,9 @@
+@@ -541,9 +538,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 \
@@ -187,7 +187,7 @@
  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 @@
+@@ -1411,10 +1408,10 @@
  	$(NULL)
  
  platform_libadd = $(am__append_20) $(am__append_23) $(am__append_26) \
@@ -200,7 +200,7 @@
  @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 @@
+@@ -1424,7 +1421,7 @@
  @OS_UNIX_TRUE@	gunixoutputstream.c gcontenttype.c \
  @OS_UNIX_TRUE@	gcontenttypeprivate.h gfdonotificationbackend.c \
  @OS_UNIX_TRUE@	ggtknotificationbackend.c $(NULL) \
@@ -209,7 +209,7 @@
  @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 @@
+@@ -1645,10 +1642,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) \
@@ -222,7 +222,7 @@
  libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
  gio_headers = \
  	gappinfo.h 		\
-@@ -2206,7 +2203,6 @@
+@@ -2201,7 +2198,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@
@@ -230,7 +230,7 @@
  @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 @@
+@@ -3319,13 +3315,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
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/e8a0ba10/attachment.html>

More information about the macports-changes mailing list