[79486] trunk/dports/devel/glib2-devel
ryandesign at macports.org
ryandesign at macports.org
Wed Jun 15 12:28:29 PDT 2011
Revision: 79486
http://trac.macports.org/changeset/79486
Author: ryandesign at macports.org
Date: 2011-06-15 12:28:29 -0700 (Wed, 15 Jun 2011)
Log Message:
-----------
glib2-devel: update to 2.29.8
Modified Paths:
--------------
trunk/dports/devel/glib2-devel/Portfile
trunk/dports/devel/glib2-devel/files/patch-configure.ac.diff
trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff
Removed Paths:
-------------
trunk/dports/devel/glib2-devel/files/patch-glib_gbitlock.c.diff
Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile 2011-06-15 17:54:55 UTC (rev 79485)
+++ trunk/dports/devel/glib2-devel/Portfile 2011-06-15 19:28:29 UTC (rev 79486)
@@ -7,7 +7,7 @@
name glib2-devel
conflicts glib2
set my_name glib
-version 2.29.6
+version 2.29.8
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign openmaintainer
@@ -28,14 +28,13 @@
master_sites gnome:sources/${my_name}/${branch}/ \
ftp://ftp.gtk.org/pub/${my_name}/${branch}/
-checksums sha1 173d6f5fea773c99b03336438db415c155e3316c \
- rmd160 45153972fd960a9efc982dd0265eb06f3cce855a
+checksums sha1 eafe1fe1cc5b5465917fc15b034d525ef5799196 \
+ rmd160 21b300505ad1b460a1bd81ebb2081df4dc07bad4
# ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
# See http://trac.macports.org/changeset/27148
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 \
patch-gio_xdgmime_xdgmime.c.diff \
Modified: trunk/dports/devel/glib2-devel/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-configure.ac.diff 2011-06-15 17:54:55 UTC (rev 79485)
+++ trunk/dports/devel/glib2-devel/files/patch-configure.ac.diff 2011-06-15 19:28:29 UTC (rev 79486)
@@ -1,6 +1,6 @@
---- 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 @@
+--- configure.ac.orig 2011-06-13 22:20:32.000000000 -0500
++++ configure.ac 2011-06-15 14:11:01.000000000 -0500
+@@ -3036,18 +3036,32 @@
cat >>$outfile <<_______EOF
#define G_HAVE_GINT64 1 /* deprecated, always true */
@@ -40,7 +40,7 @@
_______EOF
else
cat >>$outfile <<_______EOF
-@@ -3054,9 +3068,15 @@
+@@ -3059,9 +3073,15 @@
cat >>$outfile <<_______EOF
@@ -59,7 +59,7 @@
_______EOF
-@@ -3084,18 +3104,33 @@
+@@ -3089,18 +3109,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
-@@ -3211,13 +3246,29 @@
+@@ -3216,13 +3251,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)))
-@@ -3241,7 +3292,11 @@
+@@ -3246,7 +3297,11 @@
typedef union _GSystemThread GSystemThread;
union _GSystemThread
{
@@ -147,7 +147,7 @@
double dummy_double;
void *dummy_pointer;
long dummy_long;
-@@ -3249,7 +3304,9 @@
+@@ -3254,7 +3309,9 @@
_______EOF
if test x"$g_memory_barrier_needed" != xno; then
echo >>$outfile
@@ -157,7 +157,7 @@
fi
if test x"$g_gcc_atomic_ops" != xno; then
echo >>$outfile
-@@ -3259,27 +3316,52 @@
+@@ -3264,27 +3321,52 @@
g_bit_sizes="16 32 64"
for bits in $g_bit_sizes; do
cat >>$outfile <<_______EOF
@@ -223,7 +223,7 @@
#define GLIB_SYSDEF_POLLIN =$g_pollin
#define GLIB_SYSDEF_POLLOUT =$g_pollout
-@@ -3564,10 +3646,10 @@
+@@ -3569,10 +3651,10 @@
*) glib_vacopy=''
esac
Modified: trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff 2011-06-15 17:54:55 UTC (rev 79485)
+++ trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff 2011-06-15 19:28:29 UTC (rev 79486)
@@ -1,6 +1,6 @@
---- gio/gdbusprivate.c.orig 2011-04-11 23:42:20.000000000 -0500
-+++ gio/gdbusprivate.c 2011-04-13 20:35:55.000000000 -0500
-@@ -1761,12 +1761,12 @@
+--- gio/gdbusprivate.c.orig 2011-06-05 19:39:48.000000000 -0500
++++ gio/gdbusprivate.c 2011-06-15 14:11:02.000000000 -0500
+@@ -1709,12 +1709,12 @@
gchar *ret;
/* TODO: use PACKAGE_LOCALSTATEDIR ? */
ret = NULL;
Deleted: trunk/dports/devel/glib2-devel/files/patch-glib_gbitlock.c.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-glib_gbitlock.c.diff 2011-06-15 17:54:55 UTC (rev 79485)
+++ trunk/dports/devel/glib2-devel/files/patch-glib_gbitlock.c.diff 2011-06-15 19:28:29 UTC (rev 79486)
@@ -1,81 +0,0 @@
-From 25a9b58e586cf677e3692d4e3c679f3898fc9e59 Mon Sep 17 00:00:00 2001
-From: Christophe Fergeau <cfergeau at redhat.com>
-Date: Wed, 8 Jun 2011 11:18:26 +0200
-Subject: [PATCH] bitlock: don't use asm goto on older gcc
-
-asm goto was addded in gcc 4.5 so don't try to use it on gcc versions
-older than this one. This is achieved by explicitly checking gcc
-version, an alternative would be to try to compile a program using
-asm volatile in configure.
---- glib/gbitlock.c.orig
-+++ glib/gbitlock.c
-@@ -181,6 +181,12 @@ g_futex_wake (const volatile gint *address)
- #define CONTENTION_CLASSES 11
- static volatile gint g_bit_lock_contended[CONTENTION_CLASSES];
-
-+#if (defined (i386) || defined (__amd64__))
-+ #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-+ #define USE_ASM_GOTO 1
-+ #endif
-+#endif
-+
- /**
- * g_bit_lock:
- * @address: a pointer to an integer
-@@ -206,7 +212,7 @@ void
- g_bit_lock (volatile gint *address,
- gint lock_bit)
- {
--#if defined (__GNUC__) && (defined (i386) || defined (__amd64__))
-+#ifdef USE_ASM_GOTO
- retry:
- asm volatile goto ("lock bts %1, (%0)\n"
- "jc %l[contended]"
-@@ -277,7 +283,7 @@ gboolean
- g_bit_trylock (volatile gint *address,
- gint lock_bit)
- {
--#if defined (__GNUC__) && (defined (i386) || defined (__amd64__))
-+#ifdef USE_ASM_GOTO
- gboolean result;
-
- asm volatile ("lock bts %2, (%1)\n"
-@@ -317,7 +323,7 @@ void
- g_bit_unlock (volatile gint *address,
- gint lock_bit)
- {
--#if defined (__GNUC__) && (defined (i386) || defined (__amd64__))
-+#ifdef USE_ASM_GOTO
- asm volatile ("lock btr %1, (%0)"
- : /* no output */
- : "r" (address), "r" (lock_bit)
-@@ -393,7 +399,7 @@ void
- g_return_if_fail (lock_bit < 32);
-
- {
--#if defined (__GNUC__) && (defined (i386) || defined (__amd64__))
-+#ifdef USE_ASM_GOTO
- retry:
- asm volatile goto ("lock bts %1, (%0)\n"
- "jc %l[contended]"
-@@ -463,7 +469,7 @@ gboolean
- g_return_val_if_fail (lock_bit < 32, FALSE);
-
- {
--#if defined (__GNUC__) && (defined (i386) || defined (__amd64__))
-+#ifdef USE_ASM_GOTO
- gboolean result;
-
- asm volatile ("lock bts %2, (%1)\n"
-@@ -508,7 +514,7 @@ void
- g_return_if_fail (lock_bit < 32);
-
- {
--#if defined (__GNUC__) && (defined (i386) || defined (__amd64__))
-+#ifdef USE_ASM_GOTO
- asm volatile ("lock btr %1, (%0)"
- : /* no output */
- : "r" (address), "r" ((gsize) lock_bit)
---
-1.7.5.2
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110615/41f05e34/attachment-0001.html>
More information about the macports-changes
mailing list