Date: Sat, 15 Sep 2012 23:21:19 GMT From: "Fabian M. Borschel" <fmb@onibox.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/171676: Update devel/glib20 to 2.32.4 Message-ID: <201209152321.q8FNLJhm093869@red.freebsd.org> Resent-Message-ID: <201209152330.q8FNUDqX083365@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 171676
>Category: ports
>Synopsis: Update devel/glib20 to 2.32.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Sep 15 23:30:12 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Fabian M. Borschel
>Release: FreeBSD 9.0
>Organization:
>Environment:
>Description:
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 934f000..827913e 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -2,14 +2,13 @@
# Date Created: 28 July 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
-# $FreeBSD$
+# $FreeBSD: head/devel/glib20/Makefile 300896 2012-07-14 13:54:48Z beat $
# $MCom: ports/devel/glib20/Makefile,v 1.209 2011/06/11 19:51:14 mezz Exp $
#
# !! DON'T FORGET ABOUT devel/gio-fam-backend !!
PORTNAME= glib
-PORTVERSION= 2.28.8
-PORTREVISION?= 4
+PORTVERSION= 2.32.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
@@ -31,7 +30,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
.if !defined(REFERENCE_PORT)
-LIB_DEPENDS+= pcre.1:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+= pcre.1:${PORTSDIR}/devel/pcre \
+ ffi.5:${PORTSDIR}/devel/libffi
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 93d831f..129eca3 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-2.28.8.tar.xz) = 4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353
-SIZE (gnome2/glib-2.28.8.tar.xz) = 5223564
+SHA256 (gnome2/glib-2.32.4.tar.xz) = a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2
+SIZE (gnome2/glib-2.32.4.tar.xz) = 6178556
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 80fcb92..f821e9e 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig 2010-09-09 12:18:43.000000000 +0200
-+++ configure 2010-09-09 12:20:56.000000000 +0200
-@@ -575,6 +575,9 @@
+--- configure.orig 2012-08-31 08:18:07.000000000 +0200
++++ configure 2012-08-31 13:21:09.000000000 +0200
+@@ -583,6 +583,9 @@
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
@@ -10,7 +10,7 @@
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-@@ -5187,7 +5190,7 @@
+@@ -5452,7 +5455,7 @@
fi
GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@@ -19,30 +19,21 @@
if test "x$with_runtime_libdir" != "x"; then
-@@ -22212,7 +22215,7 @@
+@@ -23481,7 +23484,7 @@
fi
done
--for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
-+for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
+-for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid
++for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid sysctlbyname
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-@@ -24815,6 +24818,8 @@
- ;;
- esac
- fi
-+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
-+ G_THREAD_LIBS="${PTHREAD_LIBS}"
-
- if test x"$G_THREAD_CFLAGS" = x; then
-
-@@ -27415,7 +27420,7 @@
+@@ -26144,6 +26147,8 @@
+ ;;
+ esac
fi
++G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
++G_THREAD_LIBS="${PTHREAD_LIBS}"
-
--if test "x${enable_Bsymbolic}" == "xyes"; then
-+if test "x${enable_Bsymbolic}" = "xyes"; then
- GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions
- fi
+ if test x"$G_THREAD_CFLAGS" = x; then
diff --git a/devel/glib20/files/patch-gio_gdesktopappinfo.c b/devel/glib20/files/patch-gio_gdesktopappinfo.c
deleted file mode 100644
index 73283b4..0000000
--- a/devel/glib20/files/patch-gio_gdesktopappinfo.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- gio/gdesktopappinfo.c.orig 2011-09-25 11:41:14.000000000 -0400
-+++ gio/gdesktopappinfo.c 2011-09-25 11:41:18.000000000 -0400
-@@ -1515,18 +1515,29 @@ update_mimeapps_list (const char *deskt
- */
- if (!explicit_default)
- {
-- system_list = get_all_desktop_entries_for_mime_type (content_type, (const char **) list, FALSE, NULL);
-+ char *user_default;
-+ /* The system default can be in the list, don't exclude it */
-+ system_list = get_all_desktop_entries_for_mime_type (content_type, NULL, FALSE, &user_default);
-
-- if (system_list != NULL)
-+ string = NULL;
-+ if (user_default != NULL)
-+ {
-+ /* There is an existing default set in a lower priority defaults file, re-use it */
-+ string = user_default;
-+ }
-+ else if (system_list != NULL)
- {
- string = system_list->data;
--
-+ }
-+ if (string)
-+ {
- g_key_file_set_string (key_file,
- DEFAULT_APPLICATIONS_GROUP,
- content_types[k],
- string);
- }
-
-+ g_free (user_default);
- g_list_free_full (system_list, g_free);
- }
- }
diff --git a/devel/glib20/files/patch-gio_gunixcredentialsmessage.c b/devel/glib20/files/patch-gio_gunixcredentialsmessage.c
index b81a6e2..4b27854 100644
--- a/devel/glib20/files/patch-gio_gunixcredentialsmessage.c
+++ b/devel/glib20/files/patch-gio_gunixcredentialsmessage.c
@@ -1,11 +1,6 @@
---- gio/gunixcredentialsmessage.c.orig 2011-09-25 11:42:09.000000000 -0400
-+++ gio/gunixcredentialsmessage.c 2011-09-25 11:42:22.000000000 -0400
-@@ -162,11 +162,11 @@ g_unix_credentials_message_deserialize (
- {
- goto out;
- }
-- if (size < CMSG_LEN (sizeof *cred))
-+ if (size < sizeof *cred)
+--- gio/gunixcredentialsmessage.c.orig 2011-08-27 19:17:06.000000000 +0200
++++ gio/gunixcredentialsmessage.c 2012-08-31 13:32:45.000000000 +0200
+@@ -164,7 +164,7 @@
{
g_warning ("Expected a struct cmsgcred (%" G_GSIZE_FORMAT " bytes) but "
"got %" G_GSIZE_FORMAT " bytes of data",
diff --git a/devel/glib20/files/patch-gio_gunixmounts.c b/devel/glib20/files/patch-gio_gunixmounts.c
index f99358d..3e90625 100644
--- a/devel/glib20/files/patch-gio_gunixmounts.c
+++ b/devel/glib20/files/patch-gio_gunixmounts.c
@@ -1,16 +1,16 @@
---- gio/gunixmounts.c.orig 2011-06-05 19:18:49.000000000 -0400
-+++ gio/gunixmounts.c 2011-11-09 04:20:49.000000000 -0500
-@@ -135,6 +135,9 @@ struct _GUnixMountMonitor {
-
+--- gio/gunixmounts.c.orig 2011-11-29 01:40:42.000000000 +0100
++++ gio/gunixmounts.c 2012-08-31 14:36:02.000000000 +0200
+@@ -155,6 +155,9 @@
GFileMonitor *fstab_monitor;
GFileMonitor *mtab_monitor;
-+
+
+ guint mount_poller_source;
+ GList *mount_poller_mounts;
++
+ GSource *proc_mounts_watch_source;
};
- struct _GUnixMountMonitorClass {
-@@ -146,6 +149,8 @@ static GUnixMountMonitor *the_mount_moni
+@@ -167,6 +170,8 @@
static GList *_g_get_unix_mounts (void);
static GList *_g_get_unix_mount_points (void);
@@ -19,15 +19,7 @@
G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT);
#define MOUNT_POLL_INTERVAL 4000
-@@ -172,6 +177,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
- #endif
-
- #if defined(HAVE_GETMNTINFO) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
-+#include <sys/param.h>
- #include <sys/ucred.h>
- #include <sys/mount.h>
- #include <fstab.h>
-@@ -222,20 +228,28 @@ g_unix_is_mount_path_system_internal (co
+@@ -243,22 +248,30 @@
"/", /* we already have "Filesystem root" in Nautilus */
"/bin",
"/boot",
@@ -39,6 +31,8 @@
"/lib",
"/lib64",
+ "/libexec",
+ "/live/cow",
+ "/live/image",
"/media",
"/mnt",
"/opt",
@@ -54,9 +48,9 @@
+ "/usr/ports",
+ "/usr/src",
"/var",
- "/var/log/audit", /* https://bugzilla.redhat.com/show_bug.cgi?id=333041 */
- "/var/tmp", /* https://bugzilla.redhat.com/show_bug.cgi?id=335241 */
-@@ -271,6 +285,7 @@ guess_system_internal (const char *mount
+ "/var/crash",
+ "/var/local",
+@@ -299,6 +312,7 @@
"devfs",
"devpts",
"ecryptfs",
@@ -64,7 +58,7 @@
"kernfs",
"linprocfs",
"proc",
-@@ -1056,6 +1071,10 @@ get_mounts_timestamp (void)
+@@ -1122,6 +1136,10 @@
if (stat (monitor_file, &buf) == 0)
return (guint64)buf.st_mtime;
}
@@ -75,7 +69,7 @@
return 0;
}
-@@ -1198,6 +1217,13 @@ g_unix_mount_monitor_finalize (GObject *
+@@ -1267,6 +1285,13 @@
g_object_unref (monitor->mtab_monitor);
}
@@ -89,8 +83,8 @@
the_mount_monitor = NULL;
G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
-@@ -1278,6 +1304,51 @@ mtab_file_changed (GFileMonitor *mo
- g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
+@@ -1358,6 +1383,51 @@
+ return TRUE;
}
+static gboolean
@@ -115,15 +109,15 @@
+ for (i = 0; i < g_list_length (current_mounts); i++)
+ {
+ GUnixMountEntry *m1;
-+ GUnixMountEntry *m2;
++ GUnixMountEntry *m2;
+
-+ m1 = (GUnixMountEntry *)g_list_nth_data (current_mounts, i);
-+ m2 = (GUnixMountEntry *)g_list_nth_data (mount_monitor->mount_poller_mounts, i);
++ m1 = (GUnixMountEntry *)g_list_nth_data (current_mounts, i);
++ m2 = (GUnixMountEntry *)g_list_nth_data (mount_monitor->mount_poller_mounts, i);
+ if (! has_changed && g_unix_mount_compare (m1, m2) != 0)
+ has_changed = TRUE;
+
-+ g_unix_mount_free (m2);
-+ }
++ g_unix_mount_free (m2);
++ }
+ }
+
+ g_list_free (mount_monitor->mount_poller_mounts);
@@ -141,9 +135,9 @@
static void
g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
{
-@@ -1300,6 +1371,12 @@ g_unix_mount_monitor_init (GUnixMountMon
-
- g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
+@@ -1412,6 +1482,12 @@
+ g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
+ }
}
+ else
+ {
diff --git a/devel/glib20/files/patch-gio_libasyncns_asyncns.c b/devel/glib20/files/patch-gio_libasyncns_asyncns.c
deleted file mode 100644
index 966dd27..0000000
--- a/devel/glib20/files/patch-gio_libasyncns_asyncns.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gio/libasyncns/asyncns.c.orig 2009-05-05 15:25:10.000000000 -0400
-+++ gio/libasyncns/asyncns.c 2009-05-05 15:25:51.000000000 -0400
-@@ -35,6 +35,8 @@
- #include <errno.h>
- #include <sys/wait.h>
- #include <sys/types.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
- #include <pwd.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/patch-glib_Makefile.in
index d58efb7..4f9bad8 100644
--- a/devel/glib20/files/patch-glib_Makefile.in
+++ b/devel/glib20/files/patch-glib_Makefile.in
@@ -1,30 +1,30 @@
---- glib/Makefile.in.orig 2010-08-08 12:46:01.000000000 +0200
-+++ glib/Makefile.in 2010-08-08 12:46:01.000000000 +0200
-@@ -529,7 +529,7 @@ BUILT_SOURCES = glibconfig-stamp $(am__a
+--- glib/Makefile.in.orig 2012-09-11 19:10:57.000000000 +0200
++++ glib/Makefile.in 2012-09-11 19:14:54.000000000 +0200
+@@ -572,7 +572,7 @@
#
DISTCLEANFILES = glibconfig-stamp glibconfig.h
- CLEANFILES = $(am__append_2)
+ CLEANFILES = libglib-gdb.py glib-public-headers.txt $(am__append_5)
-configexecincludedir = $(libdir)/glib-2.0/include
+configexecincludedir = $(includedir)/glib-2.0
nodist_configexecinclude_HEADERS = glibconfig.h
@HAVE_GOOD_PRINTF_FALSE@PRINTF_SUBDIR = gnulib
@HAVE_GOOD_PRINTF_FALSE@printf_la = gnulib/libgnulib.la
-@@ -1530,7 +1530,7 @@ info: info-recursive
-
+@@ -1609,7 +1609,7 @@
info-am:
--install-data-am: install-data-local install-dist_gdbSCRIPTS \
-+install-data-am: install-data-local \
- install-glibincludeHEADERS install-glibsubincludeHEADERS \
- install-tapsetDATA
+ install-data-am: install-data-local install-deprecatedincludeHEADERS \
+- install-dist_gdbSCRIPTS install-glibincludeHEADERS \
++ install-glibincludeHEADERS \
+ install-glibsubincludeHEADERS install-tapsetDATA
@$(NORMAL_INSTALL)
-@@ -1786,9 +1786,7 @@ distclean-local:
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+@@ -1897,9 +1897,7 @@
libglib-gdb.py: libglib-gdb.py.in
- $(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
+ $(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
-install-data-hook: libglib-gdb.py
- mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
-- $(INSTALL) libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
+- $(INSTALL) $(builddir)/libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
+install-data-hook:
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/devel/glib20/files/patch-glib_fix_hidden b/devel/glib20/files/patch-glib_fix_hidden
index b0cb4ec..a2acac5 100644
--- a/devel/glib20/files/patch-glib_fix_hidden
+++ b/devel/glib20/files/patch-glib_fix_hidden
@@ -1,21 +1,21 @@
---- glib/gatomic-gcc.c.orig 2011-06-06 01:18:49.000000000 +0200
-+++ glib/gatomic-gcc.c 2011-12-07 00:24:48.000000000 +0100
-@@ -22,6 +22,8 @@
+--- glib/gatomic.c.orig 2012-08-31 14:56:35.000000000 +0200
++++ glib/gatomic.c 2012-08-31 14:56:52.000000000 +0200
+@@ -23,6 +23,8 @@
#include "gatomic.h"
+#include "gthreadprivate.h"
+
- gint
- g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint val)
---- glib/gmem.c.orig 2011-02-10 00:31:42.000000000 +0100
-+++ glib/gmem.c 2011-12-07 00:21:38.000000000 +0100
-@@ -39,6 +39,7 @@
+ /**
+ * SECTION:atomic_operations
+ * @title: Atomic Operations
+--- glib/gmem.c.orig 2011-11-29 01:40:42.000000000 +0100
++++ glib/gmem.c 2012-08-31 14:55:19.000000000 +0200
+@@ -42,6 +42,7 @@
#include "gbacktrace.h"
#include "gtestutils.h"
#include "gthread.h"
+#include "gthreadprivate.h"
#include "glib_trace.h"
-
\ No newline at end of file
+ #define MEM_PROFILE_TABLE_SIZE 4096
diff --git a/devel/glib20/files/patch-glib_tests_include.c b/devel/glib20/files/patch-glib_tests_include.c
new file mode 100644
index 0000000..8616110
--- /dev/null
+++ b/devel/glib20/files/patch-glib_tests_include.c
@@ -0,0 +1,10 @@
+--- glib/tests/include.c.orig 2012-08-30 23:02:30.000000000 +0200
++++ glib/tests/include.c 2012-08-30 23:03:00.000000000 +0200
+@@ -3,6 +3,7 @@
+ #define _POSIX_C_SOURCE 0
+ #undef _GNU_SOURCE
+ #undef _XOPEN_SOURCE
++#include <sys/types.h>
+ #include <pthread.h>
+ #include <glib.h>
+
diff --git a/devel/glib20/files/patch-gobject_Makefile.in b/devel/glib20/files/patch-gobject_Makefile.in
index 12a2021..baf0f27 100644
--- a/devel/glib20/files/patch-gobject_Makefile.in
+++ b/devel/glib20/files/patch-gobject_Makefile.in
@@ -1,6 +1,6 @@
---- gobject/Makefile.in.orig 2010-06-08 09:19:51.000000000 +0200
-+++ gobject/Makefile.in 2010-06-08 09:20:41.000000000 +0200
-@@ -1236,7 +1236,7 @@ info: info-recursive
+--- gobject/Makefile.in.orig 2012-09-11 19:15:49.000000000 +0200
++++ gobject/Makefile.in 2012-09-11 19:20:14.000000000 +0200
+@@ -1416,7 +1416,7 @@
info-am:
@@ -9,13 +9,13 @@
install-libgobjectincludeHEADERS install-tapsetDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-@@ -1460,9 +1460,7 @@ libgobject-gdb.py: libgobject-gdb.py.in
+@@ -1684,9 +1684,7 @@
uninstall-gdb:
-rm -r $(DESTDIR)$(datadir)/gdb
-install-data-hook: libgobject-gdb.py
- mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)
-- $(INSTALL) libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
+- $(INSTALL) $(builddir)/libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
+install-data-hook:
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/devel/glib20/files/patch-gthread_gthread-posix.c b/devel/glib20/files/patch-gthread_gthread-posix.c
deleted file mode 100644
index 47c5ab8..0000000
--- a/devel/glib20/files/patch-gthread_gthread-posix.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- gthread/gthread-posix.c.orig Mon Nov 1 13:47:12 2004
-+++ gthread/gthread-posix.c Wed Mar 9 14:21:20 2005
-@@ -125,7 +129,8 @@
- g_thread_impl_init(void)
- {
- #ifdef _SC_THREAD_STACK_MIN
-- g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN), 0);
-+ g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN),
-+ g_thread_min_stack_size);
- #endif /* _SC_THREAD_STACK_MIN */
- #ifdef HAVE_PRIORITIES
- # ifdef G_THREADS_IMPL_POSIX
-@@ -176,7 +181,7 @@
- result = pthread_mutex_trylock ((pthread_mutex_t *) mutex);
-
- #ifdef G_THREADS_IMPL_POSIX
-- if (result == EBUSY)
-+ if ((result == EBUSY) || (result == EDEADLK))
- return FALSE;
- #else /* G_THREADS_IMPL_DCE */
- if (result == 0)
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index e3b7ff0..61de601 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -8,8 +8,6 @@ bin/gobject-query
bin/gsettings
bin/gtester
bin/gtester-report
-etc/bash_completion.d/gdbus-bash-completion.sh
-etc/bash_completion.d/gsettings-bash-completion.sh
include/gio-unix-2.0/gio/gdesktopappinfo.h
include/gio-unix-2.0/gio/gfiledescriptorbased.h
include/gio-unix-2.0/gio/gunixconnection.h
@@ -21,7 +19,9 @@ include/gio-unix-2.0/gio/gunixmounts.h
include/gio-unix-2.0/gio/gunixoutputstream.h
include/gio-unix-2.0/gio/gunixsocketaddress.h
include/glib-2.0/gio/gaction.h
+include/glib-2.0/gio/gactionmap.h
include/glib-2.0/gio/gactiongroup.h
+include/glib-2.0/gio/gactiongroupexporter.h
include/glib-2.0/gio/gappinfo.h
include/glib-2.0/gio/gapplication.h
include/glib-2.0/gio/gapplicationcommandline.h
@@ -38,15 +38,25 @@ include/glib-2.0/gio/gconverteroutputstream.h
include/glib-2.0/gio/gcredentials.h
include/glib-2.0/gio/gdatainputstream.h
include/glib-2.0/gio/gdataoutputstream.h
+include/glib-2.0/gio/gdbusactiongroup.h
include/glib-2.0/gio/gdbusaddress.h
include/glib-2.0/gio/gdbusauthobserver.h
include/glib-2.0/gio/gdbusconnection.h
include/glib-2.0/gio/gdbuserror.h
+include/glib-2.0/gio/gdbusinterface.h
+include/glib-2.0/gio/gdbusinterfaceskeleton.h
include/glib-2.0/gio/gdbusintrospection.h
+include/glib-2.0/gio/gdbusmenumodel.h
include/glib-2.0/gio/gdbusmessage.h
include/glib-2.0/gio/gdbusmethodinvocation.h
include/glib-2.0/gio/gdbusnameowning.h
include/glib-2.0/gio/gdbusnamewatching.h
+include/glib-2.0/gio/gdbusobject.h
+include/glib-2.0/gio/gdbusobjectmanager.h
+include/glib-2.0/gio/gdbusobjectmanagerclient.h
+include/glib-2.0/gio/gdbusobjectmanagerserver.h
+include/glib-2.0/gio/gdbusobjectproxy.h
+include/glib-2.0/gio/gdbusobjectskeleton.h
include/glib-2.0/gio/gdbusproxy.h
include/glib-2.0/gio/gdbusserver.h
include/glib-2.0/gio/gdbusutils.h
@@ -67,6 +77,7 @@ include/glib-2.0/gio/gfilterinputstream.h
include/glib-2.0/gio/gfilteroutputstream.h
include/glib-2.0/gio/gicon.h
include/glib-2.0/gio/ginetaddress.h
+include/glib-2.0/gio/ginetaddressmask.h
include/glib-2.0/gio/ginetsocketaddress.h
include/glib-2.0/gio/ginitable.h
include/glib-2.0/gio/ginputstream.h
@@ -81,10 +92,14 @@ include/glib-2.0/gio/giotypes.h
include/glib-2.0/gio/gloadableicon.h
include/glib-2.0/gio/gmemoryinputstream.h
include/glib-2.0/gio/gmemoryoutputstream.h
+include/glib-2.0/gio/gmenu.h
+include/glib-2.0/gio/gmenuexporter.h
+include/glib-2.0/gio/gmenumodel.h
include/glib-2.0/gio/gmount.h
include/glib-2.0/gio/gmountoperation.h
include/glib-2.0/gio/gnativevolumemonitor.h
include/glib-2.0/gio/gnetworkaddress.h
+include/glib-2.0/gio/gnetworkmonitor.h
include/glib-2.0/gio/gnetworkservice.h
include/glib-2.0/gio/goutputstream.h
include/glib-2.0/gio/gpermission.h
@@ -96,10 +111,13 @@ include/glib-2.0/gio/gproxyaddressenumerator.h
include/glib-2.0/gio/gproxyresolver.h
include/glib-2.0/gio/gsimpleaction.h
include/glib-2.0/gio/gsimpleactiongroup.h
+include/glib-2.0/gio/gremoteactiongroup.h
include/glib-2.0/gio/gresolver.h
+include/glib-2.0/gio/gresource.h
include/glib-2.0/gio/gseekable.h
include/glib-2.0/gio/gsettings.h
include/glib-2.0/gio/gsettingsbackend.h
+include/glib-2.0/gio/gsettingsschema.h
include/glib-2.0/gio/gsimpleasyncresult.h
include/glib-2.0/gio/gsimplepermission.h
include/glib-2.0/gio/gsocket.h
@@ -120,6 +138,10 @@ include/glib-2.0/gio/gtlsbackend.h
include/glib-2.0/gio/gtlscertificate.h
include/glib-2.0/gio/gtlsclientconnection.h
include/glib-2.0/gio/gtlsconnection.h
+include/glib-2.0/gio/gtlsdatabase.h
+include/glib-2.0/gio/gtlsfiledatabase.h
+include/glib-2.0/gio/gtlsinteraction.h
+include/glib-2.0/gio/gtlspassword.h
include/glib-2.0/gio/gtlsserverconnection.h
include/glib-2.0/gio/gvfs.h
include/glib-2.0/gio/gvolume.h
@@ -127,6 +149,7 @@ include/glib-2.0/gio/gvolumemonitor.h
include/glib-2.0/gio/gzlibcompressor.h
include/glib-2.0/gio/gzlibdecompressor.h
include/glib-2.0/glib-object.h
+include/glib-2.0/glib-unix.h
include/glib-2.0/glib.h
include/glib-2.0/glib/galloca.h
include/glib-2.0/glib/garray.h
@@ -136,17 +159,20 @@ include/glib-2.0/glib/gbacktrace.h
include/glib-2.0/glib/gbase64.h
include/glib-2.0/glib/gbitlock.h
include/glib-2.0/glib/gbookmarkfile.h
-include/glib-2.0/glib/gcache.h
+include/glib-2.0/glib/gbytes.h
+include/glib-2.0/glib/gcharset.h
include/glib-2.0/glib/gchecksum.h
-include/glib-2.0/glib/gcompletion.h
include/glib-2.0/glib/gconvert.h
include/glib-2.0/glib/gdataset.h
include/glib-2.0/glib/gdate.h
include/glib-2.0/glib/gdatetime.h
include/glib-2.0/glib/gdir.h
+include/glib-2.0/glib/genviron.h
include/glib-2.0/glib/gerror.h
include/glib-2.0/glib/gfileutils.h
+include/glib-2.0/glib/ggettext.h
include/glib-2.0/glib/ghash.h
+include/glib-2.0/glib/ghmac.h
include/glib-2.0/glib/ghook.h
include/glib-2.0/glib/ghostutils.h
include/glib-2.0/glib/gi18n-lib.h
@@ -171,7 +197,6 @@ include/glib-2.0/glib/gquark.h
include/glib-2.0/glib/gqueue.h
include/glib-2.0/glib/grand.h
include/glib-2.0/glib/gregex.h
-include/glib-2.0/glib/grel.h
include/glib-2.0/glib/gscanner.h
include/glib-2.0/glib/gsequence.h
include/glib-2.0/glib/gshell.h
@@ -181,11 +206,13 @@ include/glib-2.0/glib/gspawn.h
include/glib-2.0/glib/gstdio.h
include/glib-2.0/glib/gstrfuncs.h
include/glib-2.0/glib/gstring.h
+include/glib-2.0/glib/gstringchunk.h
include/glib-2.0/glib/gtestutils.h
include/glib-2.0/glib/gthread.h
include/glib-2.0/glib/gthreadpool.h
include/glib-2.0/glib/gtimer.h
include/glib-2.0/glib/gtimezone.h
+include/glib-2.0/glib/gtrashstack.h
include/glib-2.0/glib/gtree.h
include/glib-2.0/glib/gtypes.h
include/glib-2.0/glib/gunicode.h
@@ -193,13 +220,22 @@ include/glib-2.0/glib/gurifuncs.h
include/glib-2.0/glib/gutils.h
include/glib-2.0/glib/gvariant.h
include/glib-2.0/glib/gvarianttype.h
+include/glib-2.0/glib/gversion.h
+include/glib-2.0/glib/gversionmacros.h
include/glib-2.0/glib/gwin32.h
+include/glib-2.0/glib/deprecated/gallocator.h
+include/glib-2.0/glib/deprecated/gcache.h
+include/glib-2.0/glib/deprecated/gcompletion.h
+include/glib-2.0/glib/deprecated/gmain.h
+include/glib-2.0/glib/deprecated/grel.h
+include/glib-2.0/glib/deprecated/gthread.h
include/glib-2.0/glibconfig.h
include/glib-2.0/gmodule.h
include/glib-2.0/gobject/gbinding.h
include/glib-2.0/gobject/gboxed.h
include/glib-2.0/gobject/gclosure.h
include/glib-2.0/gobject/genums.h
+include/glib-2.0/gobject/glib-types.h
include/glib-2.0/gobject/gmarshal.h
include/glib-2.0/gobject/gobject.h
include/glib-2.0/gobject/gobjectnotifyqueue.c
@@ -346,7 +382,6 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@exec mkdir -p %D/share/GConf/gsettings
@dirrm share/GConf/gsettings
@dirrm share/GConf
-@exec glib-compile-schemas --uninstall %D/share/glib-2.0/schemas
@dirrm share/glib-2.0/schemas
@dirrm share/glib-2.0/gettext/po
@dirrm share/glib-2.0/gettext
@@ -357,6 +392,7 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrmtry lib/gio/modules
@dirrmtry lib/gio
@dirrm include/glib-2.0/gobject
+@dirrm include/glib-2.0/glib/deprecated
@dirrm include/glib-2.0/glib
@dirrm include/glib-2.0/gio
@dirrm include/glib-2.0
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209152321.q8FNLJhm093869>