[76234] trunk/dports/devel/glib2
ryandesign at macports.org
ryandesign at macports.org
Fri Feb 18 19:35:48 PST 2011
Revision: 76234
http://trac.macports.org/changeset/76234
Author: ryandesign at macports.org
Date: 2011-02-18 19:35:48 -0800 (Fri, 18 Feb 2011)
Log Message:
-----------
glib2: update to 2.28.1 (#28456) and undo r75483 which was unnecessary
Revision Links:
--------------
http://trac.macports.org/changeset/75483
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-02-19 01:51:22 UTC (rev 76233)
+++ trunk/dports/devel/glib2/Portfile 2011-02-19 03:35:48 UTC (rev 76234)
@@ -7,8 +7,7 @@
name glib2
conflicts glib2-devel
set my_name glib
-version 2.26.1
-revision 1
+version 2.28.1
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 sha1 8d35d5cf41d681dd6480a16be39f7d3cffbd29f0 \
- rmd160 e8b00fce55aa539ee00588500c0162a8877dc060
+checksums sha1 f65a89d0a15d0dab07959d01f88502531a4d7ea5 \
+ rmd160 acb196c2163a07e23cdf81634969f98eafe572d5
# ${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 2011-02-19 01:51:22 UTC (rev 76233)
+++ trunk/dports/devel/glib2/files/patch-configure.ac.diff 2011-02-19 03:35:48 UTC (rev 76234)
@@ -1,6 +1,6 @@
---- 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 @@
+--- configure.ac.orig 2011-02-17 22:33:11.000000000 -0600
++++ configure.ac 2011-02-18 15:12:29.000000000 -0600
+@@ -2984,18 +2984,32 @@
cat >>$outfile <<_______EOF
#define G_HAVE_GINT64 1 /* deprecated, always true */
@@ -40,7 +40,7 @@
_______EOF
else
cat >>$outfile <<_______EOF
-@@ -3013,9 +3027,15 @@
+@@ -3007,9 +3021,15 @@
cat >>$outfile <<_______EOF
@@ -59,7 +59,7 @@
_______EOF
-@@ -3043,18 +3063,33 @@
+@@ -3037,18 +3057,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
-@@ -3170,13 +3205,29 @@
+@@ -3164,13 +3199,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)))
-@@ -3200,7 +3251,11 @@
+@@ -3194,7 +3245,11 @@
typedef union _GSystemThread GSystemThread;
union _GSystemThread
{
@@ -147,7 +147,7 @@
double dummy_double;
void *dummy_pointer;
long dummy_long;
-@@ -3208,34 +3263,61 @@
+@@ -3202,34 +3257,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
-@@ -3520,10 +3602,10 @@
+@@ -3514,10 +3596,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-02-19 01:51:22 UTC (rev 76233)
+++ trunk/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff 2011-02-19 03:35:48 UTC (rev 76234)
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
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-02-19 01:51:22 UTC (rev 76233)
+++ trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in.diff 2011-02-19 03:35:48 UTC (rev 76234)
@@ -1,11 +1,8 @@
---- glib-2.0.pc.in.orig 2009-03-31 18:04:20.000000000 -0500
-+++ glib-2.0.pc.in 2011-01-26 04:04:36.000000000 -0600
-@@ -10,6 +10,5 @@
- Name: GLib
- Description: C Utility Library
+--- 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
+@@ -12,4 +12,4 @@
Version: @VERSION@
--Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
--Libs.private: @ICONV_LIBS@
+ Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
+ Libs.private: @ICONV_LIBS@
-Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
-+Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@
+Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -I${includedir} @GLIB_EXTRA_CFLAGS@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110218/7273cbe5/attachment.html>
More information about the macports-changes
mailing list