[95596] trunk/dports/devel/glib2

ryandesign at macports.org ryandesign at macports.org
Tue Jul 17 02:48:23 PDT 2012


Revision: 95596
          https://trac.macports.org/changeset/95596
Author:   ryandesign at macports.org
Date:     2012-07-17 02:48:22 -0700 (Tue, 17 Jul 2012)
Log Message:
-----------
glib2: update to 2.32.4; remove libxml2 dependency which was added in r93908 (#34744)

Revision Links:
--------------
    https://trac.macports.org/changeset/93908

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

Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile	2012-07-17 09:11:36 UTC (rev 95595)
+++ trunk/dports/devel/glib2/Portfile	2012-07-17 09:48:22 UTC (rev 95596)
@@ -7,8 +7,7 @@
 name                        glib2
 conflicts                   glib2-devel
 set my_name                 glib
-version                     2.32.3
-revision                    1
+version                     2.32.4
 set branch                  [join [lrange [split ${version} .] 0 1] .]
 categories                  devel
 maintainers                 ryandesign openmaintainer
@@ -29,8 +28,8 @@
 master_sites                gnome:sources/${my_name}/${branch}/ \
                             ftp://ftp.gtk.org/pub/${my_name}/${branch}/
 
-checksums                   rmd160  204ddce09d6622926c7b2d51b995f503ec18673e \
-                            sha256  b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d
+checksums                   rmd160  9ed87203d42b9432842ddbc0d5b1bd0cab61ae13 \
+                            sha256  a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2
 
 # ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
 # See https://trac.macports.org/changeset/27148
@@ -45,13 +44,11 @@
                             port:libiconv \
                             port:zlib \
                             port:libffi \
-                            port:libxml2 \
                             path:bin/perl:perl5
 
 archcheck.files             lib/libintl.dylib \
                             lib/libiconv.dylib \
                             lib/libz.dylib \
-                            lib/libxml2.dylib \
                             lib/libffi.dylib
 
 # TODO: compiling with clang produces a glib that breaks other ports; see #32202, #32204, #32233.
@@ -94,7 +91,7 @@
     reinplace "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" ${worksrcpath}/glib/gutils.c ${worksrcpath}/glib/gspawn.c
     reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/gio/xdgmime/xdgmime.c
     reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/gio/gdbusprivate.c
-    reinplace "s|#! */usr/bin/env python|#!${configure.python}|g" ${worksrcpath}/gio/gdbus-2.0/codegen/gdbus-codegen.in ${worksrcpath}/glib/gtester-report
+    reinplace "s|#! */usr/bin/env python|#!${configure.python}|g" ${worksrcpath}/glib/gtester-report
 }
 
 post-configure {

Modified: trunk/dports/devel/glib2/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-configure.diff	2012-07-17 09:11:36 UTC (rev 95595)
+++ trunk/dports/devel/glib2/files/patch-configure.diff	2012-07-17 09:48:22 UTC (rev 95596)
@@ -1,6 +1,6 @@
---- configure.orig	2012-05-18 10:06:09.000000000 +0200
-+++ configure	2012-05-18 10:07:24.000000000 +0200
-@@ -5526,7 +5526,7 @@
+--- configure.orig	2012-07-14 16:44:53.000000000 -0500
++++ configure	2012-07-17 04:41:50.000000000 -0500
+@@ -5548,7 +5548,7 @@
  fi
  
  GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@@ -9,7 +9,7 @@
  
  
   if test "x$with_runtime_libdir" != "x"; then
-@@ -30325,10 +30325,10 @@
+@@ -30329,10 +30329,10 @@
  *)			glib_vacopy=''
  esac
  
@@ -23,7 +23,7 @@
  
  if test x$glib_cv_hasinline = xyes; then
      glib_inline='#define G_HAVE_INLINE 1'
-@@ -32089,18 +32089,32 @@
+@@ -32093,18 +32093,32 @@
  	cat >>$outfile <<_______EOF
  #define G_HAVE_GINT64 1          /* deprecated, always true */
  
@@ -63,7 +63,7 @@
  _______EOF
          else
  	  cat >>$outfile <<_______EOF
-@@ -32112,9 +32126,15 @@
+@@ -32116,9 +32130,15 @@
  
          cat >>$outfile <<_______EOF
  
@@ -82,7 +82,7 @@
  
  _______EOF
  
-@@ -32142,18 +32162,33 @@
+@@ -32146,18 +32166,33 @@
  	if test -z "$glib_unknown_void_p"; then
  	  cat >>$outfile <<_______EOF
  
@@ -125,7 +125,7 @@
  _______EOF
  	else
  	  echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
-@@ -32266,7 +32301,9 @@
+@@ -32270,7 +32305,9 @@
  
  	if test x"$g_memory_barrier_needed" != xno; then
  	  echo >>$outfile
@@ -135,7 +135,7 @@
  	fi
  	if test x"$g_atomic_lock_free" = xyes; then
            echo >>$outfile
-@@ -32276,27 +32313,52 @@
+@@ -32280,27 +32317,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: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120717/5e40bb4b/attachment.html>


More information about the macports-changes mailing list