[134559] trunk/dports/devel/glib2

[ryandesign at macports.org]

Revision: 134559
          https://trac.macports.org/changeset/134559
Author:   ryandesign at macports.org
Date:     2015-03-29 23:21:07 -0700 (Sun, 29 Mar 2015)
Log Message:
-----------
glib2: update to 2.44.0

Modified Paths:
--------------
    trunk/dports/devel/glib2/Portfile
    trunk/dports/devel/glib2/files/patch-configure.diff

Added Paths:
-----------
    trunk/dports/devel/glib2/files/patch-gio-giotypes.h.diff

Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile	2015-03-30 06:04:24 UTC (rev 134558)
+++ trunk/dports/devel/glib2/Portfile	2015-03-30 06:21:07 UTC (rev 134559)
@@ -10,7 +10,7 @@
 name                        glib2
 conflicts                   glib2-devel
 set my_name                 glib
-version                     2.42.2
+version                     2.44.0
 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  ef5e441ecb6f9e1554ab6dbd4c41b51d033a4628 \
-                            sha256  a3cc1ebd2bd310a9fdf42ae4293ee713cdf1764bd29f552febf3bf44cadae7db
+checksums                   rmd160  7be3e9db7544c331150c9dd94a198376705092ce \
+                            sha256  f2d362b106a08fa801770d41829a06fcfe287a00421018869eebf5efc796f5b9
 
 # ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
 # See https://trac.macports.org/changeset/27148
@@ -60,8 +60,11 @@
 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
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=744473
+patchfiles-append           patch-gio-giotypes.h.diff
+
 # -lresolv is needed at least on Tiger PPC.
 configure.ldflags-append    -lresolv \
                             -bind_at_load

Modified: trunk/dports/devel/glib2/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-configure.diff	2015-03-30 06:04:24 UTC (rev 134558)
+++ trunk/dports/devel/glib2/files/patch-configure.diff	2015-03-30 06:21:07 UTC (rev 134559)
@@ -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

Copied: trunk/dports/devel/glib2/files/patch-gio-giotypes.h.diff (from rev 134558, trunk/dports/devel/glib2-devel/files/patch-gio-giotypes.h.diff)
===================================================================
--- trunk/dports/devel/glib2/files/patch-gio-giotypes.h.diff	                        (rev 0)
+++ trunk/dports/devel/glib2/files/patch-gio-giotypes.h.diff	2015-03-30 06:21:07 UTC (rev 134559)
@@ -0,0 +1,14 @@
+Fix build with older compilers.
+https://bugzilla.gnome.org/show_bug.cgi?id=744473
+https://mail.gnome.org/archives/commits-list/2015-March/msg10288.html
+--- gio/giotypes.h.orig
++++ gio/giotypes.h
+@@ -61,8 +61,6 @@ typedef struct _GPermission                   GPermission;
+ 
+ typedef struct _GMenuModel                    GMenuModel;
+ typedef struct _GNotification                 GNotification;
+-typedef struct _GListModel                    GListModel;
+-typedef struct _GListStore                    GListStore;
+ 
+ /**
+  * GDrive:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150329/e1224444/attachment.html>