[138826] users/devans/GNOME-3/unstable/dports/devel/glib2
devans at macports.org
devans at macports.org
Mon Jul 20 21:10:49 PDT 2015
Revision: 138826
https://trac.macports.org/changeset/138826
Author: devans at macports.org
Date: 2015-07-20 21:10:49 -0700 (Mon, 20 Jul 2015)
Log Message:
-----------
GNOME-3/unstable: glib2, update to version 2.45.4.
Modified Paths:
--------------
users/devans/GNOME-3/unstable/dports/devel/glib2/Portfile
users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-configure.diff
users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-gi18n.h.diff
users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff
users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff
users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-glib-gmain.c.diff
users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-glib_gunicollate.c.diff
Modified: users/devans/GNOME-3/unstable/dports/devel/glib2/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/devel/glib2/Portfile 2015-07-21 03:38:11 UTC (rev 138825)
+++ users/devans/GNOME-3/unstable/dports/devel/glib2/Portfile 2015-07-21 04:10:49 UTC (rev 138826)
@@ -10,8 +10,7 @@
name glib2
conflicts glib2-devel
set my_name glib
-version 2.45.3
-revision 1
+version 2.45.4
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign openmaintainer
@@ -31,8 +30,8 @@
master_sites gnome:sources/${my_name}/${branch}/
-checksums rmd160 d6ef33b7ea0eebac119dbc861a253925d443e22f \
- sha256 790c903cd4dcbd725913a0a915138ac727c1f7b24c0b1132c36d03344e1356c7
+checksums rmd160 70bfce1b83feb770579936a71f0e7908c1f87675 \
+ sha256 b3b9e9f3fff6748192f1ccd053f8601d14efac1d6670c64626c03065e208bc37
# ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
# See https://trac.macports.org/changeset/27148
Modified: users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-configure.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-configure.diff 2015-07-21 03:38:11 UTC (rev 138825)
+++ users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-configure.diff 2015-07-21 04:10:49 UTC (rev 138826)
@@ -1,6 +1,6 @@
---- configure.orig 2015-03-02 10:57:11.000000000 -0600
-+++ configure 2015-03-06 03:15:18.000000000 -0600
-@@ -6086,7 +6086,7 @@
+--- configure.orig 2015-07-20 14:45:59.000000000 -0700
++++ configure 2015-07-20 17:27:32.000000000 -0700
+@@ -6176,7 +6176,7 @@
fi
GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@@ -9,7 +9,7 @@
if test "x$with_runtime_libdir" != "x"; then
-@@ -22240,9 +22240,6 @@
+@@ -22842,9 +22842,6 @@
presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
@@ -19,7 +19,16 @@
# check for header files
-@@ -30464,10 +30461,10 @@
+@@ -29489,7 +29486,7 @@
+
+ for flag in \
+ -Wall -Wstrict-prototypes -Werror=declaration-after-statement \
+- -Werror=missing-prototypes -Werror=implicit-function-declaration \
++ -Werror=implicit-function-declaration \
+ -Werror=pointer-arith -Werror=init-self -Werror=format-security \
+ -Werror=format=2 -Werror=missing-include-dirs; do
+
+@@ -31042,10 +31039,10 @@
*) glib_vacopy=''
esac
@@ -33,7 +42,7 @@
if test x$glib_cv_hasinline = xyes; then
glib_inline='#define G_HAVE_INLINE 1'
-@@ -32224,18 +32221,32 @@
+@@ -32714,18 +32711,32 @@
cat >>$outfile <<_______EOF
#define G_HAVE_GINT64 1 /* deprecated, always true */
@@ -73,7 +82,7 @@
_______EOF
else
cat >>$outfile <<_______EOF
-@@ -32247,10 +32258,17 @@
+@@ -32737,10 +32748,17 @@
cat >>$outfile <<_______EOF
@@ -95,7 +104,7 @@
_______EOF
-@@ -32279,18 +32297,33 @@
+@@ -32769,18 +32787,33 @@
if test -z "$glib_unknown_void_p"; then
cat >>$outfile <<_______EOF
@@ -138,7 +147,7 @@
_______EOF
else
echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
-@@ -32405,7 +32438,9 @@
+@@ -32895,7 +32928,9 @@
if test x"$g_memory_barrier_needed" != xno; then
echo >>$outfile
@@ -148,7 +157,7 @@
fi
if test x"$g_atomic_lock_free" = xyes; then
echo >>$outfile
-@@ -32415,27 +32450,52 @@
+@@ -32905,27 +32940,52 @@
g_bit_sizes="16 32 64"
for bits in $g_bit_sizes; do
cat >>$outfile <<_______EOF
Modified: users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-gi18n.h.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-gi18n.h.diff 2015-07-21 03:38:11 UTC (rev 138825)
+++ users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-gi18n.h.diff 2015-07-21 04:10:49 UTC (rev 138826)
@@ -1,6 +1,6 @@
---- glib/gi18n.h.orig 2008-11-23 23:45:23.000000000 -0600
-+++ glib/gi18n.h 2008-11-25 23:59:29.000000000 -0600
-@@ -27,7 +27,9 @@
+--- glib/gi18n.h.orig 2014-12-19 13:49:48.000000000 -0800
++++ glib/gi18n.h 2015-07-20 17:28:35.000000000 -0700
+@@ -25,7 +25,9 @@
#define _(String) gettext (String)
#define Q_(String) g_dpgettext (NULL, String, 0)
Modified: users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff 2015-07-21 03:38:11 UTC (rev 138825)
+++ users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff 2015-07-21 04:10:49 UTC (rev 138826)
@@ -1,20 +1,20 @@
---- 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 @@
+--- gio/gdbusprivate.c.orig 2015-05-22 14:01:27.000000000 -0700
++++ gio/gdbusprivate.c 2015-07-20 17:28:35.000000000 -0700
+@@ -2068,7 +2068,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",
++ if (!g_file_get_contents ("/opt/local/var/lib/dbus/machine-id",
&ret,
NULL,
&first_error) &&
-@@ -2110,7 +2110,7 @@
+@@ -2078,7 +2078,7 @@
NULL))
{
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: "));
++ _("Unable to load /opt/local/var/lib/dbus/machine-id or /etc/machine-id: "));
}
else
{
Modified: users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff 2015-07-21 03:38:11 UTC (rev 138825)
+++ users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff 2015-07-21 04:10:49 UTC (rev 138826)
@@ -1,11 +1,11 @@
---- gio/xdgmime/xdgmime.c.orig 2009-03-12 22:09:52.000000000 -0600
-+++ gio/xdgmime/xdgmime.c 2009-04-09 23:41:01.000000000 -0600
-@@ -257,7 +257,7 @@
+--- gio/xdgmime/xdgmime.c.orig 2014-12-19 13:49:48.000000000 -0800
++++ gio/xdgmime/xdgmime.c 2015-07-20 17:28:35.000000000 -0700
+@@ -255,7 +255,7 @@
xdg_data_dirs = getenv ("XDG_DATA_DIRS");
if (xdg_data_dirs == NULL)
- xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+ xdg_data_dirs = "@@PREFIX@@/share/:/usr/share/";
++ xdg_data_dirs = "/opt/local/share/:/usr/share/";
ptr = xdg_data_dirs;
Modified: users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-glib-gmain.c.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-glib-gmain.c.diff 2015-07-21 03:38:11 UTC (rev 138825)
+++ users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-glib-gmain.c.diff 2015-07-21 04:10:49 UTC (rev 138826)
@@ -1,9 +1,6 @@
-Fix g_get_monotonic_time on non-Intel processors
-https://bugzilla.gnome.org/show_bug.cgi?id=728123
-https://bug728123.bugzilla-attachments.gnome.org/attachment.cgi?id=275596
---- glib/gmain.c.orig
-+++ glib/gmain.c
-@@ -2648,46 +2648,34 @@ gint64
+--- glib/gmain.c.orig 2015-05-22 14:01:27.000000000 -0700
++++ glib/gmain.c 2015-07-20 17:28:35.000000000 -0700
+@@ -2706,46 +2706,34 @@
g_get_monotonic_time (void)
{
static mach_timebase_info_data_t timebase_info;
Modified: users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-glib_gunicollate.c.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-glib_gunicollate.c.diff 2015-07-21 03:38:11 UTC (rev 138825)
+++ users/devans/GNOME-3/unstable/dports/devel/glib2/files/patch-glib_gunicollate.c.diff 2015-07-21 04:10:49 UTC (rev 138826)
@@ -1,6 +1,6 @@
---- glib/gunicollate.c.orig 2009-03-31 18:04:20.000000000 -0500
-+++ glib/gunicollate.c 2010-03-06 17:59:08.000000000 -0600
-@@ -26,6 +26,9 @@
+--- glib/gunicollate.c.orig 2014-12-19 13:49:48.000000000 -0800
++++ glib/gunicollate.c 2015-07-20 17:28:35.000000000 -0700
+@@ -25,6 +25,9 @@
#include <wchar.h>
#endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150720/0fbdb453/attachment.html>
More information about the macports-changes
mailing list