[151585] trunk/dports/devel/glib2-devel
ryandesign at macports.org
ryandesign at macports.org
Thu Aug 18 01:41:20 PDT 2016
Revision: 151585
https://trac.macports.org/changeset/151585
Author: ryandesign at macports.org
Date: 2016-08-18 01:41:19 -0700 (Thu, 18 Aug 2016)
Log Message:
-----------
glib2-devel: refresh patchfiles
Modified Paths:
--------------
trunk/dports/devel/glib2-devel/Portfile
trunk/dports/devel/glib2-devel/files/patch-configure.diff
trunk/dports/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff
trunk/dports/devel/glib2-devel/files/patch-gi18n.h.diff
trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff
trunk/dports/devel/glib2-devel/files/patch-gio_xdgmime_xdgmime.c.diff
trunk/dports/devel/glib2-devel/files/patch-glib-gmain.c.diff
trunk/dports/devel/glib2-devel/files/patch-glib_gunicollate.c.diff
trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend.patch
Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile 2016-08-18 08:35:53 UTC (rev 151584)
+++ trunk/dports/devel/glib2-devel/Portfile 2016-08-18 08:41:19 UTC (rev 151585)
@@ -9,7 +9,7 @@
name glib2-devel
conflicts glib2
set my_name glib
-version 2.49.5
+version 2.49.5
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign openmaintainer
Modified: trunk/dports/devel/glib2-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-configure.diff 2016-08-18 08:35:53 UTC (rev 151584)
+++ trunk/dports/devel/glib2-devel/files/patch-configure.diff 2016-08-18 08:41:19 UTC (rev 151585)
@@ -1,6 +1,6 @@
---- configure.orig 2016-02-16 03:35:30.000000000 -0800
-+++ configure 2016-02-16 21:33:03.000000000 -0800
-@@ -22198,9 +22198,6 @@
+--- configure.orig 2016-08-17 11:22:06.000000000 -0500
++++ configure 2016-08-18 03:30:23.000000000 -0500
+@@ -22720,9 +22720,6 @@
presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
@@ -10,7 +10,7 @@
# check for header files
-@@ -30102,10 +30099,10 @@
+@@ -30775,10 +30772,10 @@
*) glib_vacopy=''
esac
@@ -24,7 +24,7 @@
g_have_gnuc_varargs=$g_have_gnuc_varargs
g_have_iso_c_varargs=$g_have_iso_c_varargs
-@@ -31849,18 +31846,32 @@
+@@ -32436,18 +32433,32 @@
cat >>$outfile <<_______EOF
#define G_HAVE_GINT64 1 /* deprecated, always true */
@@ -64,7 +64,7 @@
_______EOF
else
cat >>$outfile <<_______EOF
-@@ -31872,10 +31883,17 @@
+@@ -32459,10 +32470,17 @@
cat >>$outfile <<_______EOF
@@ -86,7 +86,7 @@
_______EOF
-@@ -31906,18 +31924,33 @@
+@@ -32493,18 +32511,33 @@
if test -z "$glib_unknown_void_p"; then
cat >>$outfile <<_______EOF
@@ -129,7 +129,7 @@
_______EOF
else
echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
-@@ -32012,7 +32045,9 @@
+@@ -32599,7 +32632,9 @@
if test x"$g_memory_barrier_needed" != xno; then
echo >>$outfile
@@ -139,7 +139,7 @@
fi
if test x"$g_atomic_lock_free" = xyes; then
echo >>$outfile
-@@ -32022,27 +32057,52 @@
+@@ -32609,27 +32644,52 @@
g_bit_sizes="16 32 64"
for bits in $g_bit_sizes; do
cat >>$outfile <<_______EOF
Modified: 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 2016-08-18 08:35:53 UTC (rev 151584)
+++ trunk/dports/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff 2016-08-18 08:41:19 UTC (rev 151585)
@@ -1,6 +1,6 @@
---- 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 @@
+--- gio/gdbusaddress.c.orig 2016-07-16 19:33:34.000000000 -0500
++++ gio/gdbusaddress.c 2016-08-18 03:24:10.000000000 -0500
+@@ -1504,6 +1504,103 @@
/* ---------------------------------------------------------------------------------------------------- */
@@ -104,7 +104,7 @@
static gchar *
get_session_address_platform_specific (GError **error)
{
-@@ -1503,7 +1600,12 @@
+@@ -1532,7 +1629,12 @@
* X11 autolaunching; on Windows this means a different autolaunching
* mechanism based on shared memory.
*/
Modified: trunk/dports/devel/glib2-devel/files/patch-gi18n.h.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-gi18n.h.diff 2016-08-18 08:35:53 UTC (rev 151584)
+++ trunk/dports/devel/glib2-devel/files/patch-gi18n.h.diff 2016-08-18 08:41:19 UTC (rev 151585)
@@ -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 15:49:48.000000000 -0600
++++ glib/gi18n.h 2016-08-18 03:30:23.000000000 -0500
+@@ -25,7 +25,9 @@
#define _(String) gettext (String)
#define Q_(String) g_dpgettext (NULL, String, 0)
Modified: trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff 2016-08-18 08:35:53 UTC (rev 151584)
+++ trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff 2016-08-18 08:41:19 UTC (rev 151585)
@@ -1,6 +1,6 @@
---- 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 2016-07-01 14:54:29.000000000 -0500
++++ gio/gdbusprivate.c 2016-08-18 03:24:11.000000000 -0500
+@@ -2070,7 +2070,7 @@
/* TODO: use PACKAGE_LOCALSTATEDIR ? */
ret = NULL;
first_error = NULL;
@@ -9,7 +9,7 @@
&ret,
NULL,
&first_error) &&
-@@ -2110,7 +2110,7 @@
+@@ -2080,7 +2080,7 @@
NULL))
{
g_propagate_prefixed_error (error, first_error,
Modified: trunk/dports/devel/glib2-devel/files/patch-gio_xdgmime_xdgmime.c.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-gio_xdgmime_xdgmime.c.diff 2016-08-18 08:35:53 UTC (rev 151584)
+++ trunk/dports/devel/glib2-devel/files/patch-gio_xdgmime_xdgmime.c.diff 2016-08-18 08:41:19 UTC (rev 151585)
@@ -1,6 +1,6 @@
---- 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 15:49:48.000000000 -0600
++++ gio/xdgmime/xdgmime.c 2016-08-18 03:30:23.000000000 -0500
+@@ -255,7 +255,7 @@
xdg_data_dirs = getenv ("XDG_DATA_DIRS");
if (xdg_data_dirs == NULL)
Modified: trunk/dports/devel/glib2-devel/files/patch-glib-gmain.c.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-glib-gmain.c.diff 2016-08-18 08:35:53 UTC (rev 151584)
+++ trunk/dports/devel/glib2-devel/files/patch-glib-gmain.c.diff 2016-08-18 08:41:19 UTC (rev 151585)
@@ -1,9 +1,9 @@
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 2016-07-16 20:09:26.000000000 -0500
++++ glib/gmain.c 2016-08-18 03:30:22.000000000 -0500
+@@ -2784,46 +2784,34 @@
g_get_monotonic_time (void)
{
static mach_timebase_info_data_t timebase_info;
Modified: trunk/dports/devel/glib2-devel/files/patch-glib_gunicollate.c.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-glib_gunicollate.c.diff 2016-08-18 08:35:53 UTC (rev 151584)
+++ trunk/dports/devel/glib2-devel/files/patch-glib_gunicollate.c.diff 2016-08-18 08:41:19 UTC (rev 151585)
@@ -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 15:49:48.000000000 -0600
++++ glib/gunicollate.c 2016-08-18 03:30:22.000000000 -0500
+@@ -25,6 +25,9 @@
#include <wchar.h>
#endif
Modified: trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend.patch
===================================================================
--- trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend.patch 2016-08-18 08:35:53 UTC (rev 151584)
+++ trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend.patch 2016-08-18 08:41:19 UTC (rev 151585)
@@ -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 2016-07-21 09:50:51.000000000 -0500
-+++ configure 2016-07-21 09:50:52.000000000 -0500
-@@ -6042,30 +6042,6 @@
+--- configure.orig 2016-08-18 03:19:15.000000000 -0500
++++ configure 2016-08-18 03:19:15.000000000 -0500
+@@ -6044,30 +6044,6 @@
COCOA_LIBS="-Wl,-framework,Foundation"
LDFLAGS="$LDFLAGS $COCOA_LIBS"
@@ -36,8 +36,8 @@
else
COCOA_LIBS=""
fi
---- gio/Makefile.in.orig 2016-07-20 19:54:01.000000000 -0500
-+++ gio/Makefile.in 2016-07-21 10:03:11.000000000 -0500
+--- gio/Makefile.in.orig 2016-08-17 11:22:10.000000000 -0500
++++ gio/Makefile.in 2016-08-18 03:22:40.000000000 -0500
@@ -172,7 +172,6 @@
@OS_UNIX_TRUE at am__append_29 = xdgmime/libxdgmime.la
@OS_UNIX_TRUE at am__append_30 = xdgmime/libxdgmime.la
@@ -52,10 +52,10 @@
@OS_COCOA_TRUE at am__append_36 = -xobjective-c
- at OS_COCOA_TRUE@am__append_37 = -Wl,-framework,Foundation -Wl,-framework,AppKit
+ at OS_COCOA_TRUE@am__append_37 = -Wl,-framework,Foundation
+ @HAVE_LIBMOUNT_TRUE at am__append_38 = $(LIBMOUNT_CFLAGS)
+ @HAVE_LIBMOUNT_TRUE at am__append_39 = $(LIBMOUNT_LIBS)
bin_PROGRAMS = gio-querymodules$(EXEEXT) glib-compile-schemas$(EXEEXT) \
- glib-compile-resources$(EXEEXT) gsettings$(EXEEXT) \
- gdbus$(EXEEXT) $(am__EXEEXT_1) gresource$(EXEEXT) gio$(EXEEXT)
-@@ -357,7 +356,7 @@
+@@ -360,7 +359,7 @@
gportalsupport.h gnetworkmonitorportal.c \
gnetworkmonitorportal.h gproxyresolverportal.c \
gproxyresolverportal.h xdp-dbus.c xdp-dbus.h \
@@ -64,7 +64,7 @@
gnetworkmonitornetlink.h gnetworkmonitornm.c \
gnetworkmonitornm.h gdbusdaemon.c gdbusdaemon.h \
gdbus-daemon-generated.c gdbus-daemon-generated.h \
-@@ -518,7 +517,6 @@
+@@ -521,7 +520,6 @@
am__objects_12 = libgio_2_0_la-gnetworkmonitorportal.lo \
libgio_2_0_la-gproxyresolverportal.lo $(am__objects_11) \
$(am__objects_1)
@@ -72,7 +72,7 @@
@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE at am__objects_14 = 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_1)
-@@ -541,7 +539,7 @@
+@@ -544,7 +542,7 @@
@OS_UNIX_TRUE@ libgio_2_0_la-gdocumentportal.lo \
@OS_UNIX_TRUE@ libgio_2_0_la-gportalsupport.lo \
@OS_UNIX_TRUE@ $(am__objects_12) $(am__objects_1) \
@@ -81,7 +81,7 @@
am__objects_16 = libgio_2_0_la-gdbusdaemon.lo \
libgio_2_0_la-gdbus-daemon-generated.lo $(am__objects_1)
am__objects_17 = $(am__objects_16) libgio_2_0_la-gwin32registrykey.lo \
-@@ -2353,7 +2351,6 @@
+@@ -2356,7 +2354,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@
@@ -89,7 +89,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@
-@@ -3957,13 +3954,6 @@
+@@ -3960,13 +3957,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-xdp-dbus.lo `test -f 'xdp-dbus.c' || echo '$(srcdir)/'`xdp-dbus.c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160818/07351ad7/attachment.html>
More information about the macports-changes
mailing list