[88770] trunk/dports/devel/glib2-devel
ryandesign at macports.org
ryandesign at macports.org
Tue Jan 10 21:01:49 PST 2012
Revision: 88770
http://trac.macports.org/changeset/88770
Author: ryandesign at macports.org
Date: 2012-01-10 21:01:47 -0800 (Tue, 10 Jan 2012)
Log Message:
-----------
glib2-devel: update to 2.31.8; see #32682
Modified Paths:
--------------
trunk/dports/devel/glib2-devel/Portfile
trunk/dports/devel/glib2-devel/files/config.h.ed
trunk/dports/devel/glib2-devel/files/patch-configure.diff
trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff
trunk/dports/devel/glib2-devel/files/patch-glib-2.0.pc.in.diff
Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile 2012-01-11 02:43:18 UTC (rev 88769)
+++ trunk/dports/devel/glib2-devel/Portfile 2012-01-11 05:01:47 UTC (rev 88770)
@@ -7,8 +7,7 @@
name glib2-devel
conflicts glib2
set my_name glib
-version 2.29.92
-revision 2
+version 2.31.8
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign openmaintainer
@@ -17,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
@@ -29,8 +28,8 @@
master_sites gnome:sources/${my_name}/${branch}/ \
ftp://ftp.gtk.org/pub/${my_name}/${branch}/
-checksums rmd160 f1369d7d9ff7c09e849d3610da0235ab378f7075 \
- sha256 2be76bd6c19b37d382aad43f910ccab6052bb8d73a51b493740077acdefa9799
+checksums rmd160 74fe75abc1ac6c6a9a5936b272eb122dfccb6727 \
+ sha256 1ce3d275189000e1c50e92efcdb6447bc260b1e5c41699b7a1959e3e1928fbaa
# ${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-devel/files/config.h.ed
===================================================================
--- trunk/dports/devel/glib2-devel/files/config.h.ed 2012-01-11 02:43:18 UTC (rev 88769)
+++ trunk/dports/devel/glib2-devel/files/config.h.ed 2012-01-11 05:01:47 UTC (rev 88770)
@@ -1,63 +1,6 @@
/ AC_APPLE_UNIVERSAL_BUILD /c
/* #undef AC_APPLE_UNIVERSAL_BUILD */
.
-/ ASM_NUMERIC_LABELS /c
-#ifdef __BIG_ENDIAN__
-#define ASM_NUMERIC_LABELS 1
-#else
-/* #undef ASM_NUMERIC_LABELS */
-#endif
-.
-/ GLIB_BYTE_CONTENTS_GMUTEX /c
-#ifdef __LP64__
-#ifdef __BIG_ENDIAN__
-#define GLIB_BYTE_CONTENTS_GMUTEX 50,-86,-85,-89,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-#else
-#define GLIB_BYTE_CONTENTS_GMUTEX -89,-85,-86,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-#endif
-#else
-#ifdef __BIG_ENDIAN__
-#define GLIB_BYTE_CONTENTS_GMUTEX 50,-86,-85,-89,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-#else
-#define GLIB_BYTE_CONTENTS_GMUTEX -89,-85,-86,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-#endif
-#endif
-.
-/ GLIB_SIZEOF_GMUTEX /c
-#ifdef __LP64__
-#define GLIB_SIZEOF_GMUTEX 64
-#else
-#define GLIB_SIZEOF_GMUTEX 44
-#endif
-.
-/ GLIB_SIZEOF_SYSTEM_THREAD /c
-#ifdef __LP64__
-#define GLIB_SIZEOF_SYSTEM_THREAD 8
-#else
-#define GLIB_SIZEOF_SYSTEM_THREAD 4
-#endif
-.
-/ G_ATOMIC_I486 /c
-#if !defined(__BIG_ENDIAN__) && !defined(__LP64__)
-#define G_ATOMIC_I486
-#else
-/* #undef G_ATOMIC_I486 */
-#endif
-.
-/ G_ATOMIC_POWERPC /c
-#ifdef __BIG_ENDIAN__
-#define G_ATOMIC_POWERPC 1
-#else
-/* #undef G_ATOMIC_POWERPC */
-#endif
-.
-/ G_ATOMIC_X86_64 /c
-#if !defined(__BIG_ENDIAN__) && defined(__LP64__)
-#define G_ATOMIC_X86_64
-#else
-/* #undef G_ATOMIC_X86_64 */
-#endif
-.
/ G_VA_COPY_AS_ARRAY /c
#ifdef __LP64__
#define G_VA_COPY_AS_ARRAY 1
Modified: trunk/dports/devel/glib2-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-configure.diff 2012-01-11 02:43:18 UTC (rev 88769)
+++ trunk/dports/devel/glib2-devel/files/patch-configure.diff 2012-01-11 05:01:47 UTC (rev 88770)
@@ -1,6 +1,6 @@
---- configure.orig 2011-11-11 16:11:52.000000000 -0600
-+++ configure 2011-11-24 01:26:58.000000000 -0600
-@@ -30485,10 +30485,10 @@
+--- configure.orig 2012-01-09 22:24:16.000000000 -0600
++++ configure 2012-01-10 02:58:04.000000000 -0600
+@@ -29846,10 +29846,10 @@
*) glib_vacopy=''
esac
@@ -14,7 +14,7 @@
if test x$glib_cv_hasinline = xyes; then
glib_inline='#define G_HAVE_INLINE 1'
-@@ -32262,18 +32262,32 @@
+@@ -31600,18 +31600,32 @@
cat >>$outfile <<_______EOF
#define G_HAVE_GINT64 1 /* deprecated, always true */
@@ -54,7 +54,7 @@
_______EOF
else
cat >>$outfile <<_______EOF
-@@ -32285,9 +32299,15 @@
+@@ -31623,9 +31637,15 @@
cat >>$outfile <<_______EOF
@@ -73,7 +73,7 @@
_______EOF
-@@ -32315,18 +32335,33 @@
+@@ -31653,18 +31673,33 @@
if test -z "$glib_unknown_void_p"; then
cat >>$outfile <<_______EOF
@@ -116,62 +116,17 @@
_______EOF
else
echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
-@@ -32442,13 +32477,29 @@
- {
- struct _GMutex *runtime_mutex;
- union {
-- char pad[$g_mutex_sizeof];
-+#ifdef __LP64__
-+ char pad[64];
-+#else
-+ char pad[44];
-+#endif
- double dummy_double;
- void *dummy_pointer;
- long dummy_long;
- } static_mutex;
- };
--#define G_STATIC_MUTEX_INIT { NULL, { { $g_mutex_contents} } }
-+#ifdef __LP64__
-+#ifdef __BIG_ENDIAN__
-+#define G_STATIC_MUTEX_INIT { NULL, { { 50,-86,-85,-89,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-+#else
-+#define G_STATIC_MUTEX_INIT { NULL, { { -89,-85,-86,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-+#endif
-+#else
-+#ifdef __BIG_ENDIAN__
-+#define G_STATIC_MUTEX_INIT { NULL, { { 50,-86,-85,-89,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-+#else
-+#define G_STATIC_MUTEX_INIT { NULL, { { -89,-85,-86,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-+#endif
-+#endif
- #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)))
-@@ -32472,7 +32523,11 @@
- typedef union _GSystemThread GSystemThread;
- union _GSystemThread
- {
-- char data[$g_system_thread_sizeof];
-+#ifdef __LP64__
-+ char data[8];
-+#else
-+ char data[4];
-+#endif
- double dummy_double;
- void *dummy_pointer;
- long dummy_long;
-@@ -32480,7 +32535,9 @@
- _______EOF
+@@ -31777,7 +31812,9 @@
+
if test x"$g_memory_barrier_needed" != xno; then
echo >>$outfile
+ echo "#ifdef __BIG_ENDIAN__" >>$outfile
echo "#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1" >>$outfile
+ echo "#endif" >>$outfile
fi
- if test x"$g_gcc_atomic_ops" != xno; then
+ if test x"$g_atomic_lock_free" = xyes; then
echo >>$outfile
-@@ -32490,27 +32547,52 @@
+@@ -31787,27 +31824,52 @@
g_bit_sizes="16 32 64"
for bits in $g_bit_sizes; do
cat >>$outfile <<_______EOF
Modified: trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff 2012-01-11 02:43:18 UTC (rev 88769)
+++ trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff 2012-01-11 05:01:47 UTC (rev 88770)
@@ -1,17 +1,20 @@
---- gio/gdbusprivate.c.orig 2011-08-15 19:51:30.000000000 -0500
-+++ gio/gdbusprivate.c 2011-08-31 21:45:09.000000000 -0500
-@@ -1728,12 +1728,12 @@
- gchar *ret;
+--- gio/gdbusprivate.c.orig 2012-01-09 21:57:20.000000000 -0600
++++ gio/gdbusprivate.c 2012-01-10 02:58:06.000000000 -0600
+@@ -2052,7 +2052,7 @@
/* TODO: use PACKAGE_LOCALSTATEDIR ? */
ret = NULL;
+ first_error = NULL;
- if (!g_file_get_contents ("/var/lib/dbus/machine-id",
+ if (!g_file_get_contents ("@@PREFIX@@/var/lib/dbus/machine-id",
&ret,
NULL,
- error))
+ &first_error) &&
+@@ -2062,7 +2062,7 @@
+ NULL))
{
-- g_prefix_error (error, _("Unable to load /var/lib/dbus/machine-id: "));
-+ g_prefix_error (error, _("Unable to load @@PREFIX@@/var/lib/dbus/machine-id: "));
+ g_propagate_prefixed_error (error, first_error,
+- _("Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "));
++ _("Unable to load @@PREFIX@@/var/lib/dbus/machine-id or /etc/machine-id: "));
}
else
{
Modified: trunk/dports/devel/glib2-devel/files/patch-glib-2.0.pc.in.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-glib-2.0.pc.in.diff 2012-01-11 02:43:18 UTC (rev 88769)
+++ trunk/dports/devel/glib2-devel/files/patch-glib-2.0.pc.in.diff 2012-01-11 05:01:47 UTC (rev 88770)
@@ -1,7 +1,7 @@
---- 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@
+--- glib-2.0.pc.in.orig 2011-12-07 19:10:26.000000000 -0600
++++ glib-2.0.pc.in 2011-12-12 23:42:14.000000000 -0600
+@@ -13,4 +13,4 @@
+ Requires.private: @PCRE_REQUIRES@
Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
Libs.private: @ICONV_LIBS@ @GLIB_RT_LIBS@
-Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120110/3ba7c986/attachment-0001.html>
More information about the macports-changes
mailing list