[111532] trunk/dports/devel
ryandesign at macports.org
ryandesign at macports.org
Tue Sep 24 17:05:43 PDT 2013
Revision: 111532
https://trac.macports.org/changeset/111532
Author: ryandesign at macports.org
Date: 2013-09-24 17:05:43 -0700 (Tue, 24 Sep 2013)
Log Message:
-----------
glib2, glib2-devel: update to 2.38.0
Modified Paths:
--------------
trunk/dports/devel/glib2/Portfile
trunk/dports/devel/glib2/files/patch-configure.diff
trunk/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
trunk/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff
trunk/dports/devel/glib2-devel/Portfile
Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile 2013-09-24 23:53:32 UTC (rev 111531)
+++ trunk/dports/devel/glib2/Portfile 2013-09-25 00:05:43 UTC (rev 111532)
@@ -10,7 +10,7 @@
name glib2
conflicts glib2-devel
set my_name glib
-version 2.36.4
+version 2.38.0
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign openmaintainer
@@ -31,8 +31,8 @@
master_sites gnome:sources/${my_name}/${branch}/ \
ftp://ftp.gtk.org/pub/${my_name}/${branch}/
-checksums rmd160 b6ec32c05231fbdd7520ad077034bbda5508ecb0 \
- sha256 f654d2542329012d8475736a165dfbf82fadf3ee940c2e0e6ddd4b2fde5cad7e
+checksums rmd160 a1855e3e1425eda9323b855b780eda77f4959755 \
+ sha256 7513a7de5e814ccb48206340a8773ea523d6a7bf04dc74565de69b899bc2ff32
# ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
# See https://trac.macports.org/changeset/27148
Modified: trunk/dports/devel/glib2/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-configure.diff 2013-09-24 23:53:32 UTC (rev 111531)
+++ trunk/dports/devel/glib2/files/patch-configure.diff 2013-09-25 00:05:43 UTC (rev 111532)
@@ -1,6 +1,6 @@
---- configure.orig 2012-10-15 19:29:14.000000000 -0500
-+++ configure 2012-10-22 17:29:31.000000000 -0500
-@@ -5602,7 +5602,7 @@
+--- configure.orig 2013-04-30 23:17:08.000000000 -0500
++++ configure 2013-05-05 00:59:06.000000000 -0500
+@@ -5757,7 +5757,7 @@
fi
GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@@ -9,7 +9,7 @@
if test "x$with_runtime_libdir" != "x"; then
-@@ -30649,10 +30649,10 @@
+@@ -30613,10 +30613,10 @@
*) glib_vacopy=''
esac
@@ -23,7 +23,7 @@
if test x$glib_cv_hasinline = xyes; then
glib_inline='#define G_HAVE_INLINE 1'
-@@ -32411,18 +32411,32 @@
+@@ -32380,18 +32380,32 @@
cat >>$outfile <<_______EOF
#define G_HAVE_GINT64 1 /* deprecated, always true */
@@ -63,26 +63,29 @@
_______EOF
else
cat >>$outfile <<_______EOF
-@@ -32434,9 +32448,15 @@
+@@ -32403,10 +32417,17 @@
cat >>$outfile <<_______EOF
-#define GLIB_SIZEOF_VOID_P $glib_void_p
-#define GLIB_SIZEOF_LONG $glib_long
-#define GLIB_SIZEOF_SIZE_T $glib_size_t
+-#define GLIB_SIZEOF_SSIZE_T $glib_ssize_t
+#ifdef __LP64__
+#define GLIB_SIZEOF_VOID_P 8
+#define GLIB_SIZEOF_LONG 8
+#define GLIB_SIZEOF_SIZE_T 8
++#define GLIB_SIZEOF_SSIZE_T 8
+#else
+#define GLIB_SIZEOF_VOID_P 4
+#define GLIB_SIZEOF_LONG 4
+#define GLIB_SIZEOF_SIZE_T 4
++#define GLIB_SIZEOF_SSIZE_T 4
+#endif
_______EOF
-@@ -32464,18 +32484,33 @@
+@@ -32435,18 +32456,33 @@
if test -z "$glib_unknown_void_p"; then
cat >>$outfile <<_______EOF
@@ -125,7 +128,7 @@
_______EOF
else
echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
-@@ -32588,7 +32623,9 @@
+@@ -32559,7 +32595,9 @@
if test x"$g_memory_barrier_needed" != xno; then
echo >>$outfile
@@ -135,7 +138,7 @@
fi
if test x"$g_atomic_lock_free" = xyes; then
echo >>$outfile
-@@ -32598,27 +32635,52 @@
+@@ -32569,27 +32607,52 @@
g_bit_sizes="16 32 64"
for bits in $g_bit_sizes; do
cat >>$outfile <<_______EOF
@@ -178,9 +181,9 @@
#define GINT_TO_BE(val) ((gint) GINT${gintbits}_TO_BE (val))
#define GUINT_TO_BE(val) ((guint) GUINT${gintbits}_TO_BE (val))
-#define GSIZE_TO_LE(val) ((gsize) GUINT${gsizebits}_TO_LE (val))
--#define GSSIZE_TO_LE(val) ((gssize) GINT${gsizebits}_TO_LE (val))
+-#define GSSIZE_TO_LE(val) ((gssize) GINT${gssizebits}_TO_LE (val))
-#define GSIZE_TO_BE(val) ((gsize) GUINT${gsizebits}_TO_BE (val))
--#define GSSIZE_TO_BE(val) ((gssize) GINT${gsizebits}_TO_BE (val))
+-#define GSSIZE_TO_BE(val) ((gssize) GINT${gssizebits}_TO_BE (val))
-#define G_BYTE_ORDER $g_byte_order
+#ifdef __LP64__
+#define GSIZE_TO_LE(val) ((gsize) GUINT64_TO_LE (val))
Modified: trunk/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff 2013-09-24 23:53:32 UTC (rev 111531)
+++ trunk/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff 2013-09-25 00:05:43 UTC (rev 111532)
@@ -1,12 +1,12 @@
---- gio/gdbusaddress.c.orig 2013-02-24 13:02:01.000000000 -0800
-+++ gio/gdbusaddress.c 2013-05-17 08:00:11.000000000 -0700
+--- gio/gdbusaddress.c.orig 2013-05-27 10:01:46.000000000 -0700
++++ gio/gdbusaddress.c 2013-06-13 22:48:22.000000000 -0700
@@ -1426,13 +1426,116 @@
/* ---------------------------------------------------------------------------------------------------- */
+/*
+ * MacPorts specific D-Bus implementation
-+ *
++ *
+ * When building under MacPorts on darwin
+ * plaforms (including Mac OS X), the
+ * symbols G_OS_UNIX and __APPLE__ are
@@ -14,7 +14,7 @@
+ *
+ * The D-Bus session daemon is controlled
+ * using the Apple launchd facility.
-+ *
++ *
+ * For launchd command details see
+ * http://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages
+ *
@@ -32,14 +32,14 @@
+ gchar *launchctl_stdout;
+ gchar *launchctl_stderr;
+ gint exit_status;
-+
++
+ ret = NULL;
+ command_line = NULL;
+ launchctl_stdout = NULL;
+ launchctl_stderr = NULL;
+
+ command_line = g_strdup ("launchctl getenv DBUS_LAUNCHD_SESSION_BUS_SOCKET");
-+
++
+ if (G_UNLIKELY (_g_dbus_debug_address ()))
+ {
+ _g_dbus_debug_print_lock ();
@@ -67,11 +67,11 @@
+ g_free (s);
+ _g_dbus_debug_print_unlock ();
+ }
-+
++
+ if (*launchctl_stdout != '\0')
+ {
+ gchar *lastchar;
-+
++
+ lastchar = launchctl_stdout + strlen(launchctl_stdout) - 1;
+ if (*lastchar == '\n') *lastchar = '\0';
+ ret = g_strdup_printf ("unix:path=%s", launchctl_stdout);
@@ -106,7 +106,7 @@
{
gchar *ret;
#if defined (G_OS_UNIX) || defined(G_OS_WIN32)
- /* need to handle OS X in a different way since `dbus-launch --autolaunch' probably won't work there */
+ /* need to handle OS X in a different way since 'dbus-launch --autolaunch' probably won't work there */
+
+#ifdef __APPLE__
+ ret = get_session_address_macports_specific (error);
Modified: trunk/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff 2013-09-24 23:53:32 UTC (rev 111531)
+++ trunk/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff 2013-09-25 00:05:43 UTC (rev 111532)
@@ -1,6 +1,6 @@
---- gio/gdbusprivate.c.orig 2012-04-30 11:24:02.000000000 -0500
-+++ gio/gdbusprivate.c 2012-05-02 01:57:47.000000000 -0500
-@@ -2094,7 +2094,7 @@
+--- gio/gdbusprivate.c.orig 2012-11-16 17:01:40.000000000 -0600
++++ gio/gdbusprivate.c 2013-01-15 23:21:22.000000000 -0600
+@@ -2100,7 +2100,7 @@
/* TODO: use PACKAGE_LOCALSTATEDIR ? */
ret = NULL;
first_error = NULL;
@@ -9,7 +9,7 @@
&ret,
NULL,
&first_error) &&
-@@ -2104,7 +2104,7 @@
+@@ -2110,7 +2110,7 @@
NULL))
{
g_propagate_prefixed_error (error, first_error,
Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile 2013-09-24 23:53:32 UTC (rev 111531)
+++ trunk/dports/devel/glib2-devel/Portfile 2013-09-25 00:05:43 UTC (rev 111532)
@@ -10,7 +10,7 @@
name glib2-devel
conflicts glib2
set my_name glib
-version 2.37.93
+version 2.38.0
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign openmaintainer
@@ -31,8 +31,8 @@
master_sites gnome:sources/${my_name}/${branch}/ \
ftp://ftp.gtk.org/pub/${my_name}/${branch}/
-checksums rmd160 b869f6f57b7d39a6219c79e6fb7db45bc8664df6 \
- sha256 0141a48e8648cbdf507e1375f5b53558783339ebc00256611a33cd82fbbfbf53
+checksums rmd160 a1855e3e1425eda9323b855b780eda77f4959755 \
+ sha256 7513a7de5e814ccb48206340a8773ea523d6a7bf04dc74565de69b899bc2ff32
# ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
# See https://trac.macports.org/changeset/27148
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130924/292e03a1/attachment.html>
More information about the macports-changes
mailing list