Revision: 87469 http://trac.macports.org/changeset/87469 Author: ryandesign@macports.org Date: 2011-11-22 21:47:02 -0800 (Tue, 22 Nov 2011) Log Message: ----------- glib2: update to 2.30.2; use xz distfile; add libffi dependency 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 trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in.diff Modified: trunk/dports/devel/glib2/Portfile =================================================================== --- trunk/dports/devel/glib2/Portfile 2011-11-23 04:28:06 UTC (rev 87468) +++ trunk/dports/devel/glib2/Portfile 2011-11-23 05:47:02 UTC (rev 87469) @@ -7,7 +7,7 @@ name glib2 conflicts glib2-devel set my_name glib -version 2.28.8 +version 2.30.2 set branch [join [lrange [split ${version} .] 0 1] .] categories devel maintainers ryandesign openmaintainer @@ -16,7 +16,7 @@ platforms darwin dist_subdir glib2 distname ${my_name}-${version} -use_bzip2 yes +use_xz yes use_parallel_build yes description Library with data structure functions and other constructs @@ -28,8 +28,8 @@ master_sites gnome:sources/${my_name}/${branch}/ \ ftp://ftp.gtk.org/pub/${my_name}/${branch}/ -checksums sha1 20cd63705a8805260da0320c65b979233f2e3c18 \ - rmd160 f087a71445eb40fae5eab45a14cb74d4e239d5e6 +checksums rmd160 d8fc7c876bd15ea3a9255d4d0a67d745e3790488 \ + sha256 f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82 # ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h # See http://trac.macports.org/changeset/27148 @@ -43,11 +43,13 @@ depends_lib port:gettext \ port:libiconv \ port:zlib \ + port:libffi \ path:bin/perl:perl5 archcheck.files lib/libintl.dylib \ lib/libiconv.dylib \ - lib/libz.dylib + lib/libz.dylib \ + lib/libffi.dylib use_autoconf yes @@ -65,6 +67,12 @@ ZLIB_CFLAGS="-I${prefix}/include" \ ZLIB_LIBS="-L${prefix}/lib -lz" +pre-configure { + set libffi_version [exec sed -n {s/Version: //p} ${prefix}/lib/pkgconfig/libffi.pc] + configure.env-append LIBFFI_CFLAGS="-I${prefix}/lib/libffi-${libffi_version}/include" \ + LIBFFI_LIBS="-L${prefix}/lib -lffi" +} + post-patch { reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/glib/gutils.c reinplace "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" ${worksrcpath}/glib/gutils.c ${worksrcpath}/glib/gspawn.c Modified: trunk/dports/devel/glib2/files/patch-configure.ac.diff =================================================================== --- trunk/dports/devel/glib2/files/patch-configure.ac.diff 2011-11-23 04:28:06 UTC (rev 87468) +++ trunk/dports/devel/glib2/files/patch-configure.ac.diff 2011-11-23 05:47:02 UTC (rev 87469) @@ -1,6 +1,6 @@ ---- configure.ac.orig 2011-06-05 18:18:49.000000000 -0500 -+++ configure.ac 2011-06-07 23:20:56.000000000 -0500 -@@ -2984,18 +2984,32 @@ +--- configure.ac.orig 2011-11-11 16:11:22.000000000 -0600 ++++ configure.ac 2011-11-22 22:33:16.000000000 -0600 +@@ -3137,18 +3137,32 @@ cat >>$outfile <<_______EOF #define G_HAVE_GINT64 1 /* deprecated, always true */ @@ -40,7 +40,7 @@ _______EOF else cat >>$outfile <<_______EOF -@@ -3007,9 +3021,15 @@ +@@ -3160,9 +3174,15 @@ cat >>$outfile <<_______EOF @@ -59,7 +59,7 @@ _______EOF -@@ -3037,18 +3057,33 @@ +@@ -3190,18 +3210,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 -@@ -3164,13 +3199,29 @@ +@@ -3317,13 +3352,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))) -@@ -3194,7 +3245,11 @@ +@@ -3347,7 +3398,11 @@ typedef union _GSystemThread GSystemThread; union _GSystemThread { @@ -147,7 +147,7 @@ double dummy_double; void *dummy_pointer; long dummy_long; -@@ -3202,34 +3257,61 @@ +@@ -3355,7 +3410,9 @@ _______EOF if test x"$g_memory_barrier_needed" != xno; then echo >>$outfile @@ -155,8 +155,9 @@ echo "#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1" >>$outfile + echo "#endif" >>$outfile fi - - echo >>$outfile + if test x"$g_gcc_atomic_ops" != xno; then + echo >>$outfile +@@ -3365,27 +3422,52 @@ g_bit_sizes="16 32 64" for bits in $g_bit_sizes; do cat >>$outfile <<_______EOF @@ -222,7 +223,7 @@ #define GLIB_SYSDEF_POLLIN =$g_pollin #define GLIB_SYSDEF_POLLOUT =$g_pollout -@@ -3514,10 +3596,10 @@ +@@ -3670,10 +3752,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 2011-11-23 04:28:06 UTC (rev 87468) +++ trunk/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff 2011-11-23 05:47:02 UTC (rev 87469) @@ -1,6 +1,6 @@ ---- gio/gdbusprivate.c.orig 2011-02-15 19:47:39.000000000 -0600 -+++ gio/gdbusprivate.c 2011-02-18 15:12:29.000000000 -0600 -@@ -1760,12 +1760,12 @@ +--- gio/gdbusprivate.c.orig 2011-11-11 11:56:56.000000000 -0600 ++++ gio/gdbusprivate.c 2011-11-22 22:36:35.000000000 -0600 +@@ -1988,12 +1988,12 @@ gchar *ret; /* TODO: use PACKAGE_LOCALSTATEDIR ? */ ret = NULL; Modified: trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in.diff =================================================================== --- trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in.diff 2011-11-23 04:28:06 UTC (rev 87468) +++ trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in.diff 2011-11-23 05:47:02 UTC (rev 87469) @@ -1,8 +1,8 @@ ---- glib-2.0.pc.in.orig 2008-07-02 16:13:24.000000000 -0500 -+++ glib-2.0.pc.in 2008-07-05 15:57:19.000000000 -0500 +--- glib-2.0.pc.in.orig 2011-08-03 16:45:19.000000000 -0500 ++++ glib-2.0.pc.in 2011-08-17 01:59:10.000000000 -0500 @@ -12,4 +12,4 @@ Version: @VERSION@ Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ - Libs.private: @ICONV_LIBS@ + Libs.private: @ICONV_LIBS@ @GLIB_RT_LIBS@ -Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@ +Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -I${includedir} @GLIB_EXTRA_CFLAGS@
participants (1)
-
ryandesign@macports.org