[146996] users/devans/GNOME-3/stable/dports/devel/glib2
devans at macports.org
devans at macports.org
Tue Mar 22 14:36:23 PDT 2016
Revision: 146996
https://trac.macports.org/changeset/146996
Author: devans at macports.org
Date: 2016-03-22 14:36:23 -0700 (Tue, 22 Mar 2016)
Log Message:
-----------
GNOME-3/stable: glib2, merge unstable and update to version 2.48.0.
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/remove-gcocoanotificationbackend.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:125620-146378
/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-146378
/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,141706-146994
Modified: users/devans/GNOME-3/stable/dports/devel/glib2/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glib2/Portfile 2016-03-22 21:22:20 UTC (rev 146995)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/Portfile 2016-03-22 21:36:23 UTC (rev 146996)
@@ -9,7 +9,7 @@
name glib2
conflicts glib2-devel
set my_name glib
-version 2.46.2
+version 2.48.0
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign openmaintainer
@@ -29,8 +29,8 @@
master_sites gnome:sources/${my_name}/${branch}/
-checksums rmd160 f15f528a2e5b76b48b9fcbb8c8cbf00b01512cbc \
- sha256 5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db
+checksums rmd160 647bb92c1c6e94042533dda8a3cebc0b3d2693c8 \
+ sha256 744be6931ca914c68af98dc38ff6b0cf8381d65e335060faddfbf04c17147c34
# ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
# See https://trac.macports.org/changeset/27148
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 2016-03-22 21:22:20 UTC (rev 146995)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-configure.diff 2016-03-22 21:36:23 UTC (rev 146996)
@@ -1,15 +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 @@
- fi
-
- GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
--ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
-+ABS_GLIB_RUNTIME_LIBDIR="`readlink $libdir/$with_runtime_libdir`"
-
-
- if test "x$with_runtime_libdir" != "x"; then
-@@ -22240,9 +22240,6 @@
+--- configure.orig 2016-02-16 03:35:30.000000000 -0800
++++ configure 2016-02-16 21:33:03.000000000 -0800
+@@ -22198,9 +22198,6 @@
presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
@@ -19,7 +10,7 @@
# check for header files
-@@ -30464,10 +30461,10 @@
+@@ -30102,10 +30099,10 @@
*) glib_vacopy=''
esac
@@ -31,9 +22,9 @@
+#define G_VA_COPY_AS_ARRAY 1
+#endif"
- if test x$glib_cv_hasinline = xyes; then
- glib_inline='#define G_HAVE_INLINE 1'
-@@ -32224,18 +32221,32 @@
+ g_have_gnuc_varargs=$g_have_gnuc_varargs
+ g_have_iso_c_varargs=$g_have_iso_c_varargs
+@@ -31849,18 +31846,32 @@
cat >>$outfile <<_______EOF
#define G_HAVE_GINT64 1 /* deprecated, always true */
@@ -73,7 +64,7 @@
_______EOF
else
cat >>$outfile <<_______EOF
-@@ -32247,10 +32258,17 @@
+@@ -31872,10 +31883,17 @@
cat >>$outfile <<_______EOF
@@ -95,7 +86,7 @@
_______EOF
-@@ -32279,18 +32297,33 @@
+@@ -31906,18 +31924,33 @@
if test -z "$glib_unknown_void_p"; then
cat >>$outfile <<_______EOF
@@ -138,7 +129,7 @@
_______EOF
else
echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
-@@ -32405,7 +32438,9 @@
+@@ -32012,7 +32045,9 @@
if test x"$g_memory_barrier_needed" != xno; then
echo >>$outfile
@@ -148,7 +139,7 @@
fi
if test x"$g_atomic_lock_free" = xyes; then
echo >>$outfile
-@@ -32415,27 +32450,52 @@
+@@ -32022,27 +32057,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/remove-gcocoanotificationbackend.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch 2016-03-22 21:22:20 UTC (rev 146995)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch 2016-03-22 21:36:23 UTC (rev 146996)
@@ -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-11-06 22:38:42.000000000 -0600
-+++ configure 2015-11-06 22:38:43.000000000 -0600
-@@ -6032,30 +6032,6 @@
+--- 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"
@@ -36,9 +36,9 @@
else
COCOA_LIBS=""
fi
---- 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 @@
+--- 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
@@ -72,7 +72,7 @@
subdir = gio
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \
-@@ -313,17 +312,17 @@
+@@ -317,17 +316,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 \
-@@ -369,11 +368,10 @@
+@@ -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 =
@@ -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 \
-@@ -388,18 +386,17 @@
+@@ -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 \
@@ -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 \
-@@ -412,11 +409,11 @@
+@@ -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)
@@ -154,7 +154,7 @@
libgio_2_0_la-gdelayedsettingsbackend.lo \
libgio_2_0_la-gkeyfilesettingsbackend.lo \
libgio_2_0_la-gmemorysettingsbackend.lo \
-@@ -424,8 +421,8 @@
+@@ -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 \
@@ -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 \
-@@ -447,7 +444,7 @@
+@@ -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)
@@ -174,7 +174,7 @@
libgio_2_0_la-glocalfile.lo \
libgio_2_0_la-glocalfileenumerator.lo \
libgio_2_0_la-glocalfileinfo.lo \
-@@ -541,9 +538,9 @@
+@@ -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 \
@@ -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@)
-@@ -1411,10 +1408,10 @@
+@@ -1416,10 +1413,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 \
-@@ -1424,7 +1421,7 @@
+@@ -1429,7 +1426,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 \
-@@ -1645,10 +1642,10 @@
+@@ -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) \
@@ -222,7 +222,7 @@
libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
gio_headers = \
gappinfo.h \
-@@ -2201,7 +2198,6 @@
+@@ -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@
@@ -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@
-@@ -3319,13 +3315,6 @@
+@@ -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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160322/e754c2c0/attachment.html>
More information about the macports-changes
mailing list