Revision: 134567 https://trac.macports.org/changeset/134567 Author: devans@macports.org Date: 2015-03-30 06:39:25 -0700 (Mon, 30 Mar 2015) Log Message: ----------- GNOME-3/stable: glib2, sync with trunk. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-configure.diff 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-134372 /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:52045-52046,62644,64476,72697,91791,125620-134566 /trunk/dports/devel/glib2-devel:51739-120463 /users/cal/ports/devel/glib2:96570-97031 /users/devans/GNOME-3/unstable/dports/devel/glib2:120511-125619 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-03-30 13:16:44 UTC (rev 134566) +++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-configure.diff 2015-03-30 13:39:25 UTC (rev 134567) @@ -1,6 +1,6 @@ ---- configure.orig 2013-04-30 23:17:08.000000000 -0500 -+++ configure 2013-05-05 00:59:06.000000000 -0500 -@@ -5757,7 +5757,7 @@ +--- 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" @@ -9,7 +9,17 @@ if test "x$with_runtime_libdir" != "x"; then -@@ -30613,10 +30613,10 @@ +@@ -22240,9 +22240,6 @@ + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + esac + +-if test x$ac_cv_c_bigendian = xuniversal ; then +- as_fn_error $? "Universal builds not supported: see https://bugs.gnome.org/742548" "$LINENO" 5 +-fi + + + # check for header files +@@ -30464,10 +30461,10 @@ *) glib_vacopy='' esac @@ -23,7 +33,7 @@ if test x$glib_cv_hasinline = xyes; then glib_inline='#define G_HAVE_INLINE 1' -@@ -32380,18 +32380,32 @@ +@@ -32224,18 +32221,32 @@ cat >>$outfile <<_______EOF #define G_HAVE_GINT64 1 /* deprecated, always true */ @@ -63,7 +73,7 @@ _______EOF else cat >>$outfile <<_______EOF -@@ -32403,10 +32417,17 @@ +@@ -32247,10 +32258,17 @@ cat >>$outfile <<_______EOF @@ -85,7 +95,7 @@ _______EOF -@@ -32435,18 +32456,33 @@ +@@ -32279,18 +32297,33 @@ if test -z "$glib_unknown_void_p"; then cat >>$outfile <<_______EOF @@ -128,7 +138,7 @@ _______EOF else echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile -@@ -32559,7 +32595,9 @@ +@@ -32405,7 +32438,9 @@ if test x"$g_memory_barrier_needed" != xno; then echo >>$outfile @@ -138,7 +148,7 @@ fi if test x"$g_atomic_lock_free" = xyes; then echo >>$outfile -@@ -32569,27 +32607,52 @@ +@@ -32415,27 +32450,52 @@ g_bit_sizes="16 32 64" for bits in $g_bit_sizes; do cat >>$outfile <<_______EOF