[67622] trunk/dports/devel/glib2

[ryandesign at macports.org]

Revision: 67622
          http://trac.macports.org/changeset/67622
Author:   ryandesign at macports.org
Date:     2010-05-15 01:08:39 -0700 (Sat, 15 May 2010)
Log Message:
-----------
glib2: update to 2.24.1

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

Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile	2010-05-15 07:50:57 UTC (rev 67621)
+++ trunk/dports/devel/glib2/Portfile	2010-05-15 08:08:39 UTC (rev 67622)
@@ -5,7 +5,7 @@
 name                    glib2
 conflicts               glib2-devel
 set my_name             glib
-version                 2.22.5
+version                 2.24.1
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              devel
 maintainers             ryandesign
@@ -29,9 +29,9 @@
     gnome:sources/${my_name}/${branch}/ \
     ftp://ftp.gtk.org/pub/${my_name}/${branch}/
 
-checksums               md5     63413f704c2b07d6e81469b25cff5e60 \
-                        sha1    a35acb06c3155937651aaffc1f1895c6e19a91a4 \
-                        rmd160  2e2f06f956f63a75121b335e4150edc44f5e04f2
+checksums               md5     6a7db81c9a2cffe6a34dadb57d7ba2d2 \
+                        sha1    d4835bb1618fc1e1dfe88ef8443c12fcae69f90e \
+                        rmd160  c6ce09654c1bd28b8844435d150fcb51e6f4e872
 
 # ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
 # See http://trac.macports.org/changeset/27148

Modified: trunk/dports/devel/glib2/files/patch-configure.in.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-configure.in.diff	2010-05-15 07:50:57 UTC (rev 67621)
+++ trunk/dports/devel/glib2/files/patch-configure.in.diff	2010-05-15 08:08:39 UTC (rev 67622)
@@ -1,6 +1,6 @@
---- configure.in.orig	2010-03-15 21:38:46.000000000 -0500
-+++ configure.in	2010-03-18 07:26:06.000000000 -0500
-@@ -2805,18 +2805,32 @@
+--- configure.in.orig	2010-05-02 18:58:58.000000000 -0500
++++ configure.in	2010-05-15 02:31:32.000000000 -0500
+@@ -2871,18 +2871,32 @@
  	cat >>$outfile <<_______EOF
  #define G_HAVE_GINT64 1          /* deprecated, always true */
  
@@ -40,7 +40,7 @@
  _______EOF
          else
  	  cat >>$outfile <<_______EOF
-@@ -2828,9 +2842,15 @@
+@@ -2894,9 +2908,15 @@
  
          cat >>$outfile <<_______EOF
  
@@ -59,7 +59,7 @@
  
  _______EOF
  
-@@ -2858,18 +2878,33 @@
+@@ -2924,18 +2944,33 @@
  	if test -z "$glib_unknown_void_p"; then
  	  cat >>$outfile <<_______EOF
  
@@ -102,7 +102,7 @@
  _______EOF
  	else
  	  echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
-@@ -2985,13 +3020,29 @@
+@@ -3051,13 +3086,29 @@
  {
    struct _GMutex *runtime_mutex;
    union {
@@ -134,7 +134,7 @@
  #define	g_static_mutex_get_mutex(mutex) \\
    (g_thread_use_default_impl ? ((GMutex*)(gpointer) ((mutex)->static_mutex.pad)) : \\
     g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex)))
-@@ -3015,7 +3066,11 @@
+@@ -3081,7 +3132,11 @@
  typedef union _GSystemThread GSystemThread;
  union _GSystemThread
  {
@@ -147,7 +147,7 @@
    double dummy_double;
    void  *dummy_pointer;
    long   dummy_long;
-@@ -3023,30 +3078,50 @@
+@@ -3089,34 +3144,61 @@
  _______EOF
  	if test x"$g_memory_barrier_needed" != xno; then
  	  echo >>$outfile
@@ -198,7 +198,22 @@
  #define GUINT_TO_LE(val)	((guint) GUINT${gintbits}_TO_LE (val))
  #define GINT_TO_BE(val)		((gint) GINT${gintbits}_TO_BE (val))
  #define GUINT_TO_BE(val)	((guint) GUINT${gintbits}_TO_BE (val))
+-#define GSIZE_TO_LE(val)	((gsize) GUINT${gsizebits}_TO_LE (val))
+-#define GSSIZE_TO_LE(val)	((gssize) GINT${gsizebits}_TO_LE (val))
+-#define GSIZE_TO_BE(val)	((gsize) GUINT${gsizebits}_TO_BE (val))
+-#define GSSIZE_TO_BE(val)	((gssize) GINT${gsizebits}_TO_BE (val))
 -#define G_BYTE_ORDER $g_byte_order
++#ifdef __LP64__
++#define GSIZE_TO_LE(val)	((gsize) GUINT64_TO_LE (val))
++#define GSSIZE_TO_LE(val)	((gssize) GINT64_TO_LE (val))
++#define GSIZE_TO_BE(val)	((gsize) GUINT64_TO_BE (val))
++#define GSSIZE_TO_BE(val)	((gssize) GINT64_TO_BE (val))
++#else
++#define GSIZE_TO_LE(val)	((gsize) GUINT32_TO_LE (val))
++#define GSSIZE_TO_LE(val)	((gssize) GINT32_TO_LE (val))
++#define GSIZE_TO_BE(val)	((gsize) GUINT32_TO_BE (val))
++#define GSSIZE_TO_BE(val)	((gssize) GINT32_TO_BE (val))
++#endif
 +#ifdef __BIG_ENDIAN__
 +#define G_BYTE_ORDER G_BIG_ENDIAN
 +#else
@@ -207,7 +222,7 @@
  
  #define GLIB_SYSDEF_POLLIN =$g_pollin
  #define GLIB_SYSDEF_POLLOUT =$g_pollout
-@@ -3330,10 +3405,10 @@
+@@ -3401,10 +3483,10 @@
  *)			glib_vacopy=''
  esac
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100515/af434cb9/attachment.html>