summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Mk/bsd.gnome.mk4
-rw-r--r--devel/gio-fam-backend/Makefile4
-rw-r--r--devel/gio-fam-backend/files/patch-ae46
-rw-r--r--devel/glib20/Makefile14
-rw-r--r--devel/glib20/distinfo4
-rw-r--r--devel/glib20/files/patch-ae32
-rw-r--r--devel/glib20/files/patch-gio_fam_Makefile.in35
-rw-r--r--devel/glib20/files/patch-gio_gunixmounts.c54
-rw-r--r--devel/glib20/files/patch-gio_libasyncns_asyncns.c11
-rw-r--r--devel/glib20/files/patch-gio_tests_include.c10
-rw-r--r--devel/glib20/files/patch-glib-2.0.pc.in10
-rw-r--r--devel/glib20/files/patch-glib_Makefile.in26
-rw-r--r--devel/glib20/files/patch-gobject_Makefile.in10
-rw-r--r--devel/glib20/files/patch-gthread_gthread-posix.c21
-rw-r--r--devel/glib20/pkg-plist83
15 files changed, 192 insertions, 172 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index ea7966b07..046ae3602 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -3,7 +3,7 @@
#
# $FreeBSD$
# $NetBSD: $
-# $MCom: ports/Mk/bsd.gnome.mk,v 1.558 2012/01/17 04:01:31 ahze Exp $
+# $MCom: ports/Mk/bsd.gnome.mk,v 1.559 2012/01/17 12:52:54 ahze Exp $
#
# Please view me with 4 column tabs!
@@ -925,7 +925,7 @@ gnome-post-install:
done
@${ECHO_CMD} "@exec glib-compile-schemas %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \
>> ${TMPPLIST}; \
- ${ECHO_CMD} "@unexec glib-compile-schemas --uninstall %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \
+ ${ECHO_CMD} "@unexec glib-compile-schemas %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \
>> ${TMPPLIST};
.endif
diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile
index 1a9a05129..4ad8c0568 100644
--- a/devel/gio-fam-backend/Makefile
+++ b/devel/gio-fam-backend/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.89 2012/01/16 17:33:11 ahze Exp $
+# $MCom$
#
PORTNAME= gio-fam-backend
-PORTVERSION= 2.30.3
+PORTVERSION= 2.32.3
PORTREVISION= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
diff --git a/devel/gio-fam-backend/files/patch-ae b/devel/gio-fam-backend/files/patch-ae
index ee22655db..a8c65b182 100644
--- a/devel/gio-fam-backend/files/patch-ae
+++ b/devel/gio-fam-backend/files/patch-ae
@@ -1,5 +1,5 @@
---- configure.orig 2011-09-15 16:59:35.000000000 +0200
-+++ configure 2011-09-15 17:02:03.000000000 +0200
+--- configure.orig 2012-05-02 21:59:16.000000000 -0500
++++ configure 2012-05-02 22:00:41.000000000 -0500
@@ -583,6 +583,9 @@
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
@@ -10,7 +10,7 @@
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-@@ -5463,7 +5466,7 @@
+@@ -5526,7 +5529,7 @@
fi
GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@@ -19,7 +19,7 @@
if test "x$with_runtime_libdir" != "x"; then
-@@ -23331,7 +23334,7 @@
+@@ -23546,7 +23549,7 @@
fi
done
@@ -28,21 +28,27 @@
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"
-@@ -26124,6 +26127,8 @@
- ;;
- esac
- fi
-+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
-+ G_THREAD_LIBS="${PTHREAD_LIBS}"
-
- if test x"$G_THREAD_CFLAGS" = x; then
-
-@@ -28804,7 +28809,7 @@
- fi
-
-
--if test "x${enable_Bsymbolic}" == "xyes"; then
-+if test "x${enable_Bsymbolic}" = "xyes"; then
- GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions
+@@ -26461,6 +26464,9 @@
+ esac
fi
++G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
++G_THREAD_LIBS="${PTHREAD_LIBS}"
++
+ if test x"$G_THREAD_CFLAGS" = x; then
+
+ # The canonical -pthread[s] does not work. Try something different.
+@@ -26949,9 +26955,12 @@
+ # b) FreeBSD doesn't do this either.
+ #
+ case $host in
+- *-*-freebsd*|*-*-linux*)
++ *-*-linux*)
+ G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-pthread/`"
+ ;;
++ *-*-freebsd*)
++ G_THREAD_LIBS_FOR_GTHREAD="-pthread"
++ ;;
+ *-*-openbsd*)
+ LDFLAGS="$LDFLAGS -pthread"
+ ;;
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index fae5e846f..30cb5db7c 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,21 +3,15 @@
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glib20/Makefile,v 1.219 2012/02/14 19:34:00 kwm Exp $
+# $MCom: ports/devel/glib20/Makefile,v 1.220 2012/05/02 06:59:53 kwm Exp $
#
# !! DON'T FORGET ABOUT devel/gio-fam-backend !!
PORTNAME= glib
-PORTVERSION= 2.30.3
+PORTVERSION= 2.32.3
PORTREVISION?= 0
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/}/ \
- ftp://ftp.gimp.org/pub/%SUBDIR%/ \
- ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
- http://www.ameth.org/gimp/%SUBDIR%/ \
- ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -35,6 +29,7 @@ LIB_DEPENDS+= pcre.1:${PORTSDIR}/devel/pcre \
ffi.5:${PORTSDIR}/devel/libffi
USE_GETTEXT= yes
+USE_ICONV= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= gnomehack ltverhack
@@ -56,7 +51,6 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PCRE_CFLAGS="-I${LOCALBASE}/include" \
PCRE_LIBS="-L${LOCALBASE}/lib -lpcre"
-
OPTIONS= COLLATION_FIX "fix string collation" off
#CONFIGURE_ARGS+=--disable-silent-rules
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 57796c196..164ffcd44 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-2.30.3.tar.xz) = e6cbb27c71c445993346e785e8609cc75cea2941e32312e544872feba572dd27
-SIZE (gnome2/glib-2.30.3.tar.xz) = 5642448
+SHA256 (gnome2/glib-2.32.3.tar.xz) = b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d
+SIZE (gnome2/glib-2.32.3.tar.xz) = 6164984
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 34aee6505..42180586e 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,5 +1,5 @@
---- configure.orig 2011-11-01 08:48:56.000000000 +0100
-+++ configure 2011-11-01 08:53:55.000000000 +0100
+--- configure.orig 2012-03-07 20:38:41.000000000 +0100
++++ configure 2012-03-07 20:38:41.000000000 +0100
@@ -583,6 +583,9 @@
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
@@ -10,7 +10,7 @@
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-@@ -5471,7 +5474,7 @@
+@@ -5483,7 +5486,7 @@
fi
GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@@ -19,7 +19,7 @@
if test "x$with_runtime_libdir" != "x"; then
-@@ -23343,7 +23346,7 @@
+@@ -23514,7 +23517,7 @@
fi
done
@@ -28,16 +28,7 @@
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"
-@@ -26136,6 +26139,8 @@
- ;;
- esac
- fi
-+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
-+ G_THREAD_LIBS="${PTHREAD_LIBS}"
-
- if test x"$G_THREAD_CFLAGS" = x; then
-
-@@ -26907,8 +26912,11 @@
+@@ -26732,8 +26735,11 @@
# b) FreeBSD doesn't do this either.
#
case $host in
@@ -49,14 +40,5 @@
+ *-*-freebsd*)
+ G_THREAD_LIBS_FOR_GTHREAD="-pthread"
;;
- *)
- G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
-@@ -28877,7 +28885,7 @@
- fi
-
-
--if test "x${enable_Bsymbolic}" == "xyes"; then
-+if test "x${enable_Bsymbolic}" = "xyes"; then
- GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions
- fi
-
+ *-*-openbsd*)
+ LDFLAGS="$LDFLAGS -pthread"
diff --git a/devel/glib20/files/patch-gio_fam_Makefile.in b/devel/glib20/files/patch-gio_fam_Makefile.in
new file mode 100644
index 000000000..033ff3f5d
--- /dev/null
+++ b/devel/glib20/files/patch-gio_fam_Makefile.in
@@ -0,0 +1,35 @@
+--- gio/fam/Makefile.in.orig 2012-03-07 21:07:42.000000000 +0100
++++ gio/fam/Makefile.in 2012-03-07 21:08:30.000000000 +0100
+@@ -87,9 +87,7 @@
+ am__installdirs = "$(DESTDIR)$(giomoduledir)"
+ LTLIBRARIES = $(giomodule_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
+- $(top_builddir)/gobject/libgobject-2.0.la \
+- $(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \
++libgiofam_la_DEPENDENCIES = \
+ $(am__DEPENDENCIES_1)
+ am__objects_1 =
+ am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
+@@ -402,9 +400,9 @@
+
+ libgiofam_la_LDFLAGS = $(module_flags)
+ libgiofam_la_LIBADD = \
+- $(top_builddir)/gio/libgio-2.0.la \
+- $(top_builddir)/gobject/libgobject-2.0.la \
+- $(top_builddir)/glib/libglib-2.0.la \
++ -lgio-2.0 \
++ -lgobject-2.0 \
++ -lglib-2.0 \
+ $(GLIB_LIBS) \
+ $(FAM_LIBS) \
+ $(NULL)
+@@ -843,7 +841,7 @@
+
+ install-data-hook:
+ if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \
+- $(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \
++ gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \
+ fi
+
+ uninstall-local:
diff --git a/devel/glib20/files/patch-gio_gunixmounts.c b/devel/glib20/files/patch-gio_gunixmounts.c
index 89eef9c45..608bd95a3 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-10-13 23:47:57.000000000 -0400
-+++ gio/gunixmounts.c 2011-11-09 04:54:09.000000000 -0500
-@@ -153,6 +153,9 @@ struct _GUnixMountMonitor {
-
+--- gio/gunixmounts.c.orig 2012-05-02 22:02:54.000000000 -0500
++++ gio/gunixmounts.c 2012-05-02 22:15:35.000000000 -0500
+@@ -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 {
-@@ -164,6 +167,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,7 +19,7 @@
G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT);
#define MOUNT_POLL_INTERVAL 4000
-@@ -190,6 +195,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
+@@ -193,6 +198,7 @@
#endif
#if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
@@ -27,7 +27,7 @@
#include <sys/ucred.h>
#include <sys/mount.h>
#include <fstab.h>
-@@ -240,22 +246,30 @@ g_unix_is_mount_path_system_internal (co
+@@ -243,22 +249,29 @@
"/", /* we already have "Filesystem root" in Nautilus */
"/bin",
"/boot",
@@ -50,7 +50,6 @@
"/srv",
"/tmp",
"/usr",
-+ "/usr/X11R6",
"/usr/local",
+ "/usr/obj",
+ "/usr/ports",
@@ -58,7 +57,7 @@
"/var",
"/var/crash",
"/var/local",
-@@ -296,6 +310,7 @@ guess_system_internal (const char *mount
+@@ -299,6 +312,7 @@
"devfs",
"devpts",
"ecryptfs",
@@ -66,7 +65,7 @@
"kernfs",
"linprocfs",
"proc",
-@@ -1111,6 +1126,10 @@ get_mounts_timestamp (void)
+@@ -1122,6 +1136,10 @@
if (stat (monitor_file, &buf) == 0)
return (guint64)buf.st_mtime;
}
@@ -77,7 +76,7 @@
return 0;
}
-@@ -1253,6 +1272,13 @@ g_unix_mount_monitor_finalize (GObject *
+@@ -1267,6 +1285,13 @@
g_object_unref (monitor->mtab_monitor);
}
@@ -91,11 +90,10 @@
the_mount_monitor = NULL;
G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
-@@ -1333,6 +1359,51 @@ mtab_file_changed (GFileMonitor *mo
- g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
+@@ -1348,6 +1373,52 @@
}
-+static gboolean
+ static gboolean
+mount_change_poller (gpointer user_data)
+{
+ GUnixMountMonitor *mount_monitor;
@@ -117,15 +115,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);
@@ -140,12 +138,14 @@
+ return TRUE;
+}
+
- static void
- g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
- {
-@@ -1355,6 +1426,12 @@ g_unix_mount_monitor_init (GUnixMountMon
-
- g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
++
++static gboolean
+ proc_mounts_changed (GIOChannel *channel,
+ GIOCondition cond,
+ gpointer user_data)
+@@ -1412,6 +1483,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 966dd27a6..000000000
--- 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-gio_tests_include.c b/devel/glib20/files/patch-gio_tests_include.c
new file mode 100644
index 000000000..165c97b38
--- /dev/null
+++ b/devel/glib20/files/patch-gio_tests_include.c
@@ -0,0 +1,10 @@
+--- glib/tests/include.c.orig 2012-03-06 12:11:39.000000000 +0100
++++ glib/tests/include.c 2012-03-06 12:13:17.000000000 +0100
+@@ -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-glib-2.0.pc.in b/devel/glib20/files/patch-glib-2.0.pc.in
index f714b6f6e..9bd74ad43 100644
--- a/devel/glib20/files/patch-glib-2.0.pc.in
+++ b/devel/glib20/files/patch-glib-2.0.pc.in
@@ -1,8 +1,8 @@
---- glib-2.0.pc.in.orig 2011-01-06 07:29:30.000000000 +0000
-+++ glib-2.0.pc.in 2011-01-06 07:29:41.000000000 +0000
-@@ -12,4 +12,4 @@
- Version: @VERSION@
+--- glib-2.0.pc.in.orig 2012-01-16 04:12:06.000000000 +0100
++++ glib-2.0.pc.in 2012-03-06 12:30:11.000000000 +0100
+@@ -13,4 +13,4 @@
+ Requires.private: @PCRE_REQUIRES@
Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
- Libs.private: @ICONV_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 @GLIB_EXTRA_CFLAGS@
diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/patch-glib_Makefile.in
index d93d21a8b..48a29df14 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 2011-09-15 17:08:59.000000000 +0200
-+++ glib/Makefile.in 2011-09-15 17:10:38.000000000 +0200
-@@ -542,7 +542,7 @@ BUILT_SOURCES = glibconfig-stamp $(am__a
+--- glib/Makefile.in.orig 2012-05-03 11:27:53.000000000 +0200
++++ glib/Makefile.in 2012-05-03 11:41:38.000000000 +0200
+@@ -550,7 +550,7 @@
#
DISTCLEANFILES = glibconfig-stamp glibconfig.h
- CLEANFILES = glib-public-headers.txt $(am__append_3)
+ 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
-@@ -1481,7 +1481,7 @@ info: info-recursive
-
+@@ -1565,7 +1565,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)
-@@ -1774,9 +1774,7 @@ distclean-local:
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+@@ -1853,9 +1853,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-gobject_Makefile.in b/devel/glib20/files/patch-gobject_Makefile.in
index 12a20215a..f99ec4a97 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-05-03 11:42:11.000000000 +0200
++++ gobject/Makefile.in 2012-05-03 11:42:51.000000000 +0200
+@@ -1381,7 +1381,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
+@@ -1649,9 +1649,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 47c5ab8f1..000000000
--- 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 a251d02b8..c8233475d 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -1,15 +1,18 @@
bin/gdbus
bin/gdbus-codegen
bin/gio-querymodules
+bin/glib-compile-resources
bin/glib-compile-schemas
bin/glib-genmarshal
bin/glib-gettextize
bin/glib-mkenums
bin/gobject-query
+bin/gresource
bin/gsettings
bin/gtester
bin/gtester-report
etc/bash_completion.d/gdbus-bash-completion.sh
+etc/bash_completion.d/gresource-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
@@ -23,6 +26,8 @@ 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/gactiongroup.h
+include/glib-2.0/gio/gactiongroupexporter.h
+include/glib-2.0/gio/gactionmap.h
include/glib-2.0/gio/gappinfo.h
include/glib-2.0/gio/gapplication.h
include/glib-2.0/gio/gapplicationcommandline.h
@@ -39,6 +44,7 @@ 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
@@ -46,6 +52,7 @@ 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
@@ -76,6 +83,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
@@ -90,10 +98,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
@@ -103,12 +115,15 @@ include/glib-2.0/gio/gproxy.h
include/glib-2.0/gio/gproxyaddress.h
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/gsimpleaction.h
+include/glib-2.0/gio/gsimpleactiongroup.h
include/glib-2.0/gio/gsimpleasyncresult.h
include/glib-2.0/gio/gsimplepermission.h
include/glib-2.0/gio/gsocket.h
@@ -142,6 +157,12 @@ 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/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/glib/galloca.h
include/glib-2.0/glib/garray.h
include/glib-2.0/glib/gasyncqueue.h
@@ -150,16 +171,18 @@ 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
@@ -186,7 +209,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
@@ -196,11 +218,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
@@ -208,6 +232,8 @@ 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/glibconfig.h
include/glib-2.0/gmodule.h
@@ -308,9 +334,9 @@ share/locale/da/LC_MESSAGES/glib20.mo
share/locale/de/LC_MESSAGES/glib20.mo
share/locale/dz/LC_MESSAGES/glib20.mo
share/locale/el/LC_MESSAGES/glib20.mo
+share/locale/en@shaw/LC_MESSAGES/glib20.mo
share/locale/en_CA/LC_MESSAGES/glib20.mo
share/locale/en_GB/LC_MESSAGES/glib20.mo
-share/locale/en@shaw/LC_MESSAGES/glib20.mo
share/locale/eo/LC_MESSAGES/glib20.mo
share/locale/es/LC_MESSAGES/glib20.mo
share/locale/et/LC_MESSAGES/glib20.mo
@@ -382,28 +408,6 @@ share/locale/yi/LC_MESSAGES/glib20.mo
share/locale/zh_CN/LC_MESSAGES/glib20.mo
share/locale/zh_HK/LC_MESSAGES/glib20.mo
share/locale/zh_TW/LC_MESSAGES/glib20.mo
-@exec mkdir -p %D/share/glib-2.0/schemas
-@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
-@dirrm share/glib-2.0
-@exec mkdir -p %D/lib/gio/modules
-@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
-@unexec /bin/rm -f %D/lib/gio/modules/giomodule.cache
-@dirrmtry lib/gio/modules
-@dirrmtry lib/gio
-@dirrm lib/gdbus-2.0/codegen
-@dirrm lib/gdbus-2.0
-@dirrm include/glib-2.0/gobject
-@dirrm include/glib-2.0/glib
-@dirrm include/glib-2.0/gio
-@dirrm include/glib-2.0
-@dirrm include/gio-unix-2.0/gio
-@dirrm include/gio-unix-2.0
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/yi/LC_MESSAGES
@@ -458,4 +462,25 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
-@dirrmtry etc/bash_completion.d
+@exec mkdir -p %D/share/glib-2.0/schemas
+@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
+@dirrm share/glib-2.0
+@exec mkdir -p %D/share/GConf/gsettings
+@dirrm share/GConf/gsettings
+@dirrm share/GConf
+@exec mkdir -p %D/lib/gio/modules
+@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
+@dirrmtry lib/gio/modules
+@dirrmtry lib/gio
+@dirrm lib/gdbus-2.0/codegen
+@dirrm lib/gdbus-2.0
+@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
+@dirrm include/gio-unix-2.0/gio
+@dirrm include/gio-unix-2.0
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-14 01:03:13 +0800