[73514] trunk/dports/devel/glib2

[ryandesign at macports.org]

Revision: 73514
          http://trac.macports.org/changeset/73514
Author:   ryandesign at macports.org
Date:     2010-11-16 00:11:31 -0800 (Tue, 16 Nov 2010)
Log Message:
-----------
glib2: update to 2.26.1

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

Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile	2010-11-16 07:43:19 UTC (rev 73513)
+++ trunk/dports/devel/glib2/Portfile	2010-11-16 08:11:31 UTC (rev 73514)
@@ -7,8 +7,7 @@
 name                        glib2
 conflicts                   glib2-devel
 set my_name                 glib
-version                     2.26.0
-revision                    1
+version                     2.26.1
 set branch                  [join [lrange [split ${version} .] 0 1] .]
 categories                  devel
 maintainers                 ryandesign openmaintainer
@@ -29,9 +28,8 @@
 master_sites                gnome:sources/${my_name}/${branch}/ \
                             ftp://ftp.gtk.org/pub/${my_name}/${branch}/
 
-checksums                   md5     9b7dc61f5e389e1cff277a6350c37397 \
-                            sha1    9d7e9dce2add3fadc35079ad291a94f45ebcf706 \
-                            rmd160  176441944f24c274398903ae1816eecfe2cff36b
+checksums                   sha1    8d35d5cf41d681dd6480a16be39f7d3cffbd29f0 \
+                            rmd160  e8b00fce55aa539ee00588500c0162a8877dc060
 
 # ${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.ac.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-configure.ac.diff	2010-11-16 07:43:19 UTC (rev 73513)
+++ trunk/dports/devel/glib2/files/patch-configure.ac.diff	2010-11-16 08:11:31 UTC (rev 73514)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2010-09-27 09:02:28.000000000 -0700
-+++ configure.ac	2010-09-27 16:42:42.000000000 -0700
-@@ -2989,18 +2989,32 @@
+--- configure.ac.orig	2010-11-13 23:59:52.000000000 -0600
++++ configure.ac	2010-11-16 01:57:57.000000000 -0600
+@@ -2990,18 +2990,32 @@
  	cat >>$outfile <<_______EOF
  #define G_HAVE_GINT64 1          /* deprecated, always true */
  
@@ -40,7 +40,7 @@
  _______EOF
          else
  	  cat >>$outfile <<_______EOF
-@@ -3012,9 +3026,15 @@
+@@ -3013,9 +3027,15 @@
  
          cat >>$outfile <<_______EOF
  
@@ -59,7 +59,7 @@
  
  _______EOF
  
-@@ -3042,18 +3062,33 @@
+@@ -3043,18 +3063,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
-@@ -3169,13 +3204,29 @@
+@@ -3170,13 +3205,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)))
-@@ -3199,7 +3250,11 @@
+@@ -3200,7 +3251,11 @@
  typedef union _GSystemThread GSystemThread;
  union _GSystemThread
  {
@@ -147,7 +147,7 @@
    double dummy_double;
    void  *dummy_pointer;
    long   dummy_long;
-@@ -3207,34 +3262,61 @@
+@@ -3208,34 +3263,61 @@
  _______EOF
  	if test x"$g_memory_barrier_needed" != xno; then
  	  echo >>$outfile
@@ -222,7 +222,7 @@
  
  #define GLIB_SYSDEF_POLLIN =$g_pollin
  #define GLIB_SYSDEF_POLLOUT =$g_pollout
-@@ -3519,10 +3601,10 @@
+@@ -3520,10 +3602,10 @@
  *)			glib_vacopy=''
  esac
  

Modified: trunk/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff	2010-11-16 07:43:19 UTC (rev 73513)
+++ trunk/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff	2010-11-16 08:11:31 UTC (rev 73514)
@@ -1,6 +1,6 @@
---- gio/gdbusprivate.c.orig	2010-10-20 16:08:38.000000000 -0700
-+++ gio/gdbusprivate.c	2010-10-20 16:12:16.000000000 -0700
-@@ -1750,12 +1750,12 @@
+--- gio/gdbusprivate.c.orig	2010-11-12 07:55:16.000000000 -0600
++++ gio/gdbusprivate.c	2010-11-16 01:58:39.000000000 -0600
+@@ -1751,12 +1751,12 @@
    gchar *ret;
    /* TODO: use PACKAGE_LOCALSTATEDIR ? */
    ret = NULL;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101116/7ab07cec/attachment.html>