Changeset 79309

Timestamp:

06/08/11 18:03:39 (4 years ago)

Author:

ryandesign@…

Message:

glib2-devel: update to 2.29.6

Location:

trunk/dports/devel/glib2-devel

Files:

• Portfile (modified) (4 diffs)
• files/patch-child-test.c.diff (deleted)
• files/patch-configure.ac.diff (modified) (8 diffs)
• files/patch-glib_gbitlock.c.diff (added)

trunk/dports/devel/glib2-devel/Portfile

@@ -8 +8 @@
 conflicts                   glib2
 set my_name                 glib
-version                     2.29.4
-revision                    1
+version                     2.29.6
 set branch                  [join [lrange [split ${version} .] 0 1] .]
 categories                  devel
@@ -30 +29 @@
                             ftp://ftp.gtk.org/pub/${my_name}/${branch}/
 
-checksums                   sha1    9cf943d611de84df7ebcf46a2492adb71f75a125 \
-                            rmd160  3006ee1ad11a050279d177f0910326d88529cf1f
+checksums                   sha1    173d6f5fea773c99b03336438db415c155e3316c \
+                            rmd160  45153972fd960a9efc982dd0265eb06f3cce855a
 
 # ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
@@ -37 +36 @@
 patchfiles                  patch-configure.ac.diff \
                             patch-glib-2.0.pc.in.diff \
+                            patch-glib_gbitlock.c.diff \
                             patch-glib_gunicollate.c.diff \
                             patch-gi18n.h.diff \
@@ -86 +86 @@
 }
 
-platform darwin {
-    patchfiles-append patch-child-test.c.diff
-}
-
 build.args                  V=1
 

trunk/dports/devel/glib2-devel/files/patch-configure.ac.diff

@@ -1 @@
---- configure.ac.orig   2011-05-04 13:53:01.000000000 -0500
-+++ configure.ac        2011-05-06 01:45:28.000000000 -0500
-@@ -3036,18 +3036,32 @@
+--- configure.ac.orig   2011-06-04 18:05:51.000000000 -0500
++++ configure.ac        2011-06-05 18:35:38.000000000 -0500
+@@ -3031,18 +3031,32 @@
         cat >>$outfile <<_______EOF
  #define G_HAVE_GINT64 1          /* deprecated, always true */
@@ -41 +41 @@
          else
           cat >>$outfile <<_______EOF
-@@ -3059,9 +3073,15 @@
+@@ -3054,9 +3068,15 @@
  
          cat >>$outfile <<_______EOF
@@ -60 +60 @@
  _______EOF
  
-@@ -3089,18 +3109,33 @@
+@@ -3084,18 +3104,33 @@
         if test -z "$glib_unknown_void_p"; then
           cat >>$outfile <<_______EOF
@@ -103 +103 @@
         else
           echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
-@@ -3216,13 +3251,29 @@
+@@ -3211,13 +3246,29 @@
  {
    struct _GMutex *runtime_mutex;
@@ -135 +135 @@
    (g_thread_use_default_impl ? ((GMutex*)(gpointer) ((mutex)->static_mutex.pad)) : \\
     g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex)))
-@@ -3246,7 +3297,11 @@
+@@ -3241,7 +3292,11 @@
  typedef union _GSystemThread GSystemThread;
  union _GSystemThread
@@ -148 +148 @@
    void  *dummy_pointer;
    long   dummy_long;
-@@ -3254,34 +3309,61 @@
+@@ -3249,7 +3304,9 @@
  _______EOF
         if test x"$g_memory_barrier_needed" != xno; then
@@ -156 +156 @@
 +         echo "#endif" >>$outfile
         fi
- 
-        echo >>$outfile
+        if test x"$g_gcc_atomic_ops" != xno; then
+           echo >>$outfile
+@@ -3259,27 +3316,52 @@
         g_bit_sizes="16 32 64"
         for bits in $g_bit_sizes; do
@@ -223 +224 @@
  #define GLIB_SYSDEF_POLLIN =$g_pollin
  #define GLIB_SYSDEF_POLLOUT =$g_pollout
-@@ -3566,10 +3648,10 @@
+@@ -3564,10 +3646,10 @@
  *)                     glib_vacopy=''
  esac