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

[devans at macports.org]

Revision: 136282
          https://trac.macports.org/changeset/136282
Author:   devans at macports.org
Date:     2015-05-13 18:41:11 -0700 (Wed, 13 May 2015)
Log Message:
-----------
GNOME-3/unstable: glib2, merge stable to unstable and upgrade to unstable version 2.45.1.

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

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:52045-52046,62644,64476,72697,91791,125620-128290
/trunk/dports/devel/glib2-devel:51739-120463
/users/cal/ports/devel/glib2:96570-97031
/users/devans/GNOME-3/stable/dports/devel/glib2:127776-128298
/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-136264
/trunk/dports/devel/glib2-devel:51739-120463
/users/cal/ports/devel/glib2:96570-97031
/users/devans/GNOME-3/stable/dports/devel/glib2:127776-136281
/users/devans/GNOME-3/unstable/dports/devel/glib2:120511-125619

Modified: users/devans/GNOME-3/unstable/dports/devel/glib2/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/devel/glib2/Portfile	2015-05-14 01:20:02 UTC (rev 136281)
+++ users/devans/GNOME-3/unstable/dports/devel/glib2/Portfile	2015-05-14 01:41:11 UTC (rev 136282)
@@ -10,7 +10,7 @@
 name                        glib2
 conflicts                   glib2-devel
 set my_name                 glib
-version                     2.43.92
+version                     2.45.1
 set branch                  [join [lrange [split ${version} .] 0 1] .]
 categories                  devel
 maintainers                 ryandesign openmaintainer
@@ -30,8 +30,8 @@
 
 master_sites                gnome:sources/${my_name}/${branch}/
 
-checksums                   rmd160  6f0aaf0647798dfc78ab06a3b2b38bff55e81ff6 \
-                            sha256  fec93e24b2c317db3a92ef7aba4ca800b9a2b83c64b6d10fc256a0af4913ceb4
+checksums                   rmd160  793054f5ebfa18dd647c964f42a272a8872a9c9b \
+                            sha256  6dcf2e15c6d08b21f48d9a3722dd9367a7c28a288ba8edfd0bbbde77a11e5d2f
 
 # ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
 # See https://trac.macports.org/changeset/27148
@@ -60,7 +60,7 @@
 compiler.blacklist-append   {clang < 318}
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=697017
-compiler.blacklist-append   gcc-3.3 gcc-4.0 apple-gcc-4.0
+compiler.blacklist-append   gcc-3.3 *gcc-4.0
 
 # -lresolv is needed at least on Tiger PPC.
 configure.ldflags-append    -lresolv \

Modified: users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-configure.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-configure.diff	2015-05-14 01:20:02 UTC (rev 136281)
+++ users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-configure.diff	2015-05-14 01:41:11 UTC (rev 136282)
@@ -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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150513/f83e1cc2/attachment.html>