[91680] trunk/dports/devel/glib2
ryandesign at macports.org
ryandesign at macports.org
Sat Apr 7 13:42:52 PDT 2012
Revision: 91680
https://trac.macports.org/changeset/91680
Author: ryandesign at macports.org
Date: 2012-04-07 13:42:48 -0700 (Sat, 07 Apr 2012)
Log Message:
-----------
glib2: update to 2.32.0
Modified Paths:
--------------
trunk/dports/devel/glib2/Portfile
trunk/dports/devel/glib2/files/config.h.ed
trunk/dports/devel/glib2/files/patch-configure.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 2012-04-07 20:05:25 UTC (rev 91679)
+++ trunk/dports/devel/glib2/Portfile 2012-04-07 20:42:48 UTC (rev 91680)
@@ -7,7 +7,7 @@
name glib2
conflicts glib2-devel
set my_name glib
-version 2.30.3
+version 2.32.0
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign openmaintainer
@@ -28,8 +28,8 @@
master_sites gnome:sources/${my_name}/${branch}/ \
ftp://ftp.gtk.org/pub/${my_name}/${branch}/
-checksums rmd160 0887b08e2fff75c325ed1fb1123baaf42dc9779b \
- sha256 e6cbb27c71c445993346e785e8609cc75cea2941e32312e544872feba572dd27
+checksums rmd160 475941a8193c19dc443012ba8931b456482aaf55 \
+ sha256 cde9d9f25ed648069c547e323897ad9379974e1f936b4477fa51bcf1bb261ae4
# ${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/config.h.ed
===================================================================
--- trunk/dports/devel/glib2/files/config.h.ed 2012-04-07 20:05:25 UTC (rev 91679)
+++ trunk/dports/devel/glib2/files/config.h.ed 2012-04-07 20:42:48 UTC (rev 91680)
@@ -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/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-configure.diff 2012-04-07 20:05:25 UTC (rev 91679)
+++ trunk/dports/devel/glib2/files/patch-configure.diff 2012-04-07 20:42:48 UTC (rev 91680)
@@ -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-03-19 12:45:13.000000000 -0500
++++ configure 2012-03-20 20:56:05.000000000 -0500
+@@ -30074,10 +30074,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 @@
+@@ -31828,18 +31828,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 @@
+@@ -31851,9 +31865,15 @@
cat >>$outfile <<_______EOF
@@ -73,7 +73,7 @@
_______EOF
-@@ -32315,18 +32335,33 @@
+@@ -31881,18 +31901,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
+@@ -32005,7 +32040,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 @@
+@@ -32015,27 +32052,52 @@
g_bit_sizes="16 32 64"
for bits in $g_bit_sizes; do
cat >>$outfile <<_______EOF
Modified: trunk/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff 2012-04-07 20:05:25 UTC (rev 91679)
+++ trunk/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff 2012-04-07 20:42:48 UTC (rev 91680)
@@ -1,17 +1,20 @@
---- 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;
+--- gio/gdbusprivate.c.orig 2012-03-17 21:35:25.000000000 -0500
++++ gio/gdbusprivate.c 2012-03-20 20:56:05.000000000 -0500
+@@ -2053,7 +2053,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) &&
+@@ -2063,7 +2063,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/files/patch-glib-2.0.pc.in.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in.diff 2012-04-07 20:05:25 UTC (rev 91679)
+++ trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in.diff 2012-04-07 20:42:48 UTC (rev 91680)
@@ -1,8 +1,8 @@
---- 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 2012-01-15 21:12:06.000000000 -0600
++++ glib-2.0.pc.in 2012-01-19 22:29:43.000000000 -0600
+@@ -13,4 +13,4 @@
+ Requires.private: @PCRE_REQUIRES@
Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
- Libs.private: @ICONV_LIBS@ @GLIB_RT_LIBS@
+ Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_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@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120407/29976be4/attachment-0001.html>
More information about the macports-changes
mailing list