diff options
Diffstat (limited to 'devel/glib20')
-rw-r--r-- | devel/glib20/Makefile | 52 | ||||
-rw-r--r-- | devel/glib20/distinfo | 3 | ||||
-rw-r--r-- | devel/glib20/files/extra-patch-gthread_gthread-posix.c | 32 | ||||
-rw-r--r-- | devel/glib20/files/patch-ae | 11 | ||||
-rw-r--r-- | devel/glib20/files/patch-ag | 14 | ||||
-rw-r--r-- | devel/glib20/files/patch-ah | 11 | ||||
-rw-r--r-- | devel/glib20/files/patch-glib::libcharset::Makefile.in | 31 | ||||
-rw-r--r-- | devel/glib20/files/patch-glib_gthread.c | 28 | ||||
-rw-r--r-- | devel/glib20/files/patch-glib_gthreadprivate.h | 53 | ||||
-rw-r--r-- | devel/glib20/files/patch-glib_gutils.c | 20 | ||||
-rw-r--r-- | devel/glib20/files/patch-gmodule::gmodule-dl.c | 24 | ||||
-rw-r--r-- | devel/glib20/files/patch-gthread_gthread-impl.c | 185 | ||||
-rw-r--r-- | devel/glib20/files/patch-gthread_gthread-posix.c | 21 | ||||
-rw-r--r-- | devel/glib20/pkg-descr | 5 | ||||
-rw-r--r-- | devel/glib20/pkg-plist | 208 |
15 files changed, 0 insertions, 698 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile deleted file mode 100644 index b441fb3ab..000000000 --- a/devel/glib20/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# New ports collection makefile for: glib13 -# Date Created: 28 July 1998 -# Whom: Vanilla I. Shu <vanilla@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.74 2006/04/07 18:17:49 ahze Exp $ -# - -PORTNAME= glib -PORTVERSION= 2.10.2 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.10,} \ - ftp://ftp.gtk.org/pub/gtk/v${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/} -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Some useful routines of C programming (current stable version) - -LATEST_LINK= glib20 - -USE_BZIP2= yes -USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes -USE_GNOME= gnomehack gnometarget pkgconfig ltverhack -USE_GMAKE= yes -USE_PERL5= yes -CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \ - --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \ - --disable-man --without-xml-catalog -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lintl" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" - -.include <bsd.port.pre.mk> - -.if ( ( ${OSVERSION} < 504101 ) || ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600012 ) ) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gthread_gthread-posix.c -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - ${WRKSRC}/glib/gutils.c - -.include <bsd.port.post.mk> diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo deleted file mode 100644 index 30f93eeba..000000000 --- a/devel/glib20/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/glib-2.10.2.tar.bz2) = 718961161ee1692c216a2d542196a04a -SHA256 (gnome2/glib-2.10.2.tar.bz2) = 0e30917c2f916de991195db16d8db22298064e876e1a4a965d5ee43bea3d2144 -SIZE (gnome2/glib-2.10.2.tar.bz2) = 2784594 diff --git a/devel/glib20/files/extra-patch-gthread_gthread-posix.c b/devel/glib20/files/extra-patch-gthread_gthread-posix.c deleted file mode 100644 index bde2862f6..000000000 --- a/devel/glib20/files/extra-patch-gthread_gthread-posix.c +++ /dev/null @@ -1,32 +0,0 @@ ---- gthread/gthread-posix.c.orig Thu Jun 9 11:25:01 2005 -+++ gthread/gthread-posix.c Fri Jun 10 20:23:17 2005 -@@ -115,7 +115,11 @@ static gint priority_normal_value; - # define PRIORITY_NORMAL_VALUE priority_normal_value - #endif /* POSIX_MIN_PRIORITY && POSIX_MAX_PRIORITY */ - -+#define G_THREAD_STACK_SIZE32 (1*1024*1024) -+#define G_THREAD_STACK_SIZE64 (2*1024*1024) -+ - static gulong g_thread_min_stack_size = 0; -+static gulong g_thread_default_stack_size = 0; - - #define G_MUTEX_SIZE (sizeof (pthread_mutex_t)) - -@@ -309,8 +313,16 @@ g_thread_create_posix_impl (GThreadFunc - stack_size = MAX (g_thread_min_stack_size, stack_size); - /* No error check here, because some systems can't do it and - * we simply don't want threads to fail because of that. */ -- pthread_attr_setstacksize (&attr, stack_size); - } -+ else -+ { -+ if (sizeof(void *) == 8) -+ g_thread_default_stack_size = G_THREAD_STACK_SIZE64; -+ else -+ g_thread_default_stack_size = G_THREAD_STACK_SIZE32; -+ stack_size = MAX (g_thread_min_stack_size, g_thread_default_stack_size); -+ } -+ pthread_attr_setstacksize (&attr, stack_size); - #endif /* HAVE_PTHREAD_ATTR_SETSTACKSIZE */ - - #ifdef PTHREAD_SCOPE_SYSTEM diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae deleted file mode 100644 index 46738f939..000000000 --- a/devel/glib20/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Sun Jan 29 13:06:22 2006 -+++ configure Sun Jan 29 13:06:48 2006 -@@ -34462,6 +34461,8 @@ - ;; - esac - fi -+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" -+ G_THREAD_LIBS="${PTHREAD_LIBS}" - - if test x"$G_THREAD_CFLAGS" = x; then - diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag deleted file mode 100644 index 3e8fbfbf4..000000000 --- a/devel/glib20/files/patch-ag +++ /dev/null @@ -1,14 +0,0 @@ ---- Makefile.in.orig Sun Dec 23 16:53:53 2001 -+++ Makefile.in Fri Feb 8 12:44:30 2002 -@@ -151,3 +151,3 @@ - --SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs -+SUBDIRS = . m4macros glib gobject gmodule gthread build po docs - -@@ -192,4 +192,4 @@ - -- --configexecincludedir = $(libdir)/glib-2.0/include -+glibincludedir = $(includedir)/glib-2.0 -+configexecincludedir = $(glibincludedir) - diff --git a/devel/glib20/files/patch-ah b/devel/glib20/files/patch-ah deleted file mode 100644 index c339b76e2..000000000 --- a/devel/glib20/files/patch-ah +++ /dev/null @@ -1,11 +0,0 @@ ---- docs/reference/Makefile.in.orig Fri Oct 24 18:05:32 2003 -+++ docs/reference/Makefile.in Fri Oct 24 18:06:00 2003 -@@ -226,7 +226,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --SUBDIRS = glib gobject -+SUBDIRS = #glib gobject - subdir = docs/reference - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in deleted file mode 100644 index 9afd57416..000000000 --- a/devel/glib20/files/patch-glib::libcharset::Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ ---- glib/libcharset/Makefile.in.orig Fri Apr 30 12:10:27 2004 -+++ glib/libcharset/Makefile.in Fri Apr 30 12:12:01 2004 -@@ -225,7 +225,7 @@ - target_alias = @target_alias@ - - INCLUDES = \ -- -DLIBDIR=\"$(libdir)\" -I$(top_srcdir) -+ -DLIBDIR=\"$(prefix)/libdata\" -I$(top_srcdir) - - - noinst_LTLIBRARIES = libcharset.la -@@ -246,8 +246,8 @@ - make-patch.sh - - --charset_alias = $(DESTDIR)$(libdir)/charset.alias --charset_tmp = $(DESTDIR)$(libdir)/charset.tmp -+charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias -+charset_tmp = $(DESTDIR)$(prefix)/libdata/charset.tmp - - SUFFIXES = .sed .sin - -@@ -487,7 +487,7 @@ - - install-data-am: - --install-exec-am: install-exec-local -+install-exec-am: # install-exec-local - - install-info: install-info-am - diff --git a/devel/glib20/files/patch-glib_gthread.c b/devel/glib20/files/patch-glib_gthread.c deleted file mode 100644 index 1dce08388..000000000 --- a/devel/glib20/files/patch-glib_gthread.c +++ /dev/null @@ -1,28 +0,0 @@ ---- glib/gthread.c.orig Mon Mar 14 05:02:07 2005 -+++ glib/gthread.c Wed Jul 20 19:44:08 2005 -@@ -42,24 +42,8 @@ - - #include "glib.h" - #include "gthreadinit.h" -+#include "gthreadprivate.h" - #include "galias.h" -- --#if GLIB_SIZEOF_SYSTEM_THREAD == SIZEOF_VOID_P --# define g_system_thread_equal_simple(thread1, thread2) \ -- ((thread1).dummy_pointer == (thread2).dummy_pointer) --# define g_system_thread_assign(dest, src) \ -- ((dest).dummy_pointer = (src).dummy_pointer) --#else /* GLIB_SIZEOF_SYSTEM_THREAD != SIZEOF_VOID_P */ --# define g_system_thread_equal_simple(thread1, thread2) \ -- (memcmp (&(thread1), &(thread2), GLIB_SIZEOF_SYSTEM_THREAD) == 0) --# define g_system_thread_assign(dest, src) \ -- (memcpy (&(dest), &(src), GLIB_SIZEOF_SYSTEM_THREAD)) --#endif /* GLIB_SIZEOF_SYSTEM_THREAD == SIZEOF_VOID_P */ -- --#define g_system_thread_equal(thread1, thread2) \ -- (g_thread_functions_for_glib_use.thread_equal ? \ -- g_thread_functions_for_glib_use.thread_equal (&(thread1), &(thread2)) :\ -- g_system_thread_equal_simple((thread1), (thread2))) - - GQuark - g_thread_error_quark (void) diff --git a/devel/glib20/files/patch-glib_gthreadprivate.h b/devel/glib20/files/patch-glib_gthreadprivate.h deleted file mode 100644 index 0235c2026..000000000 --- a/devel/glib20/files/patch-glib_gthreadprivate.h +++ /dev/null @@ -1,53 +0,0 @@ ---- glib/gthreadprivate.h.orig Wed Jul 20 19:44:08 2005 -+++ glib/gthreadprivate.h Wed Jul 20 19:44:08 2005 -@@ -0,0 +1,50 @@ -+/* gthreadprivate.h -+ * -+ * Copyright 1998 Sebastian Wilhelmi; University of Karlsruhe -+ * Owen Taylor -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef __G_THREAD_PRIVATE_H__ -+#define __G_THREAD_PRIVATE_H__ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+G_BEGIN_DECLS -+ -+#if GLIB_SIZEOF_SYSTEM_THREAD == SIZEOF_VOID_P -+# define g_system_thread_equal_simple(thread1, thread2) \ -+ ((thread1).dummy_pointer == (thread2).dummy_pointer) -+# define g_system_thread_assign(dest, src) \ -+ ((dest).dummy_pointer = (src).dummy_pointer) -+#else /* GLIB_SIZEOF_SYSTEM_THREAD != SIZEOF_VOID_P */ -+# define g_system_thread_equal_simple(thread1, thread2) \ -+ (memcmp (&(thread1), &(thread2), GLIB_SIZEOF_SYSTEM_THREAD) == 0) -+# define g_system_thread_assign(dest, src) \ -+ (memcpy (&(dest), &(src), GLIB_SIZEOF_SYSTEM_THREAD)) -+#endif /* GLIB_SIZEOF_SYSTEM_THREAD == SIZEOF_VOID_P */ -+ -+#define g_system_thread_equal(thread1, thread2) \ -+ (g_thread_functions_for_glib_use.thread_equal ? \ -+ g_thread_functions_for_glib_use.thread_equal (&(thread1), &(thread2)) :\ -+ g_system_thread_equal_simple((thread1), (thread2))) -+ -+G_END_DECLS -+ -+#endif /* __G_THREAD_PRIVATE_H__ */ diff --git a/devel/glib20/files/patch-glib_gutils.c b/devel/glib20/files/patch-glib_gutils.c deleted file mode 100644 index ad4210c25..000000000 --- a/devel/glib20/files/patch-glib_gutils.c +++ /dev/null @@ -1,20 +0,0 @@ ---- glib/gutils.c.orig Wed Mar 23 09:55:02 2005 -+++ glib/gutils.c Thu Apr 7 01:06:16 2005 -@@ -1929,7 +1929,7 @@ g_get_system_data_dirs (void) - data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); - - if (!data_dirs || !data_dirs[0]) -- data_dirs = "/usr/local/share/:/usr/share/"; -+ data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; - - data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0); - #endif -@@ -1983,7 +1983,7 @@ g_get_system_config_dirs (void) - conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS"); - - if (!conf_dirs || !conf_dirs[0]) -- conf_dirs = "/etc/xdg"; -+ conf_dirs = "%%X11BASE%%/etc/xdg:/usr/local/etc/xdg:/etc/xdg"; - - conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0); - #endif diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule::gmodule-dl.c deleted file mode 100644 index 7e27afe4b..000000000 --- a/devel/glib20/files/patch-gmodule::gmodule-dl.c +++ /dev/null @@ -1,24 +0,0 @@ - -$FreeBSD$ - $MCom: ports-experimental/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.3 2005/11/18 23:01:16 kwm Exp $ - ---- gmodule/gmodule-dl.c.orig Sat Feb 17 08:28:07 2001 -+++ gmodule/gmodule-dl.c Fri Jan 18 09:48:45 2002 -@@ -104,6 +104,7 @@ - static gpointer - _g_module_self (void) - { -+#ifndef __FreeBSD__ - gpointer handle; - - /* to query symbols from the program itself, special link options -@@ -115,6 +116,9 @@ - g_module_set_error (fetch_dlerror (TRUE)); - - return handle; -+#else -+ return RTLD_DEFAULT; -+#endif - } - - static void diff --git a/devel/glib20/files/patch-gthread_gthread-impl.c b/devel/glib20/files/patch-gthread_gthread-impl.c deleted file mode 100644 index 5f1b6dcbd..000000000 --- a/devel/glib20/files/patch-gthread_gthread-impl.c +++ /dev/null @@ -1,185 +0,0 @@ ---- gthread/gthread-impl.c.orig Fri Feb 14 16:08:46 2003 -+++ gthread/gthread-impl.c Wed Jul 20 19:44:08 2005 -@@ -37,9 +37,11 @@ - - #include <glib.h> - #include <gthreadinit.h> -+#include "gthreadprivate.h" - - #ifdef G_THREADS_ENABLED - -+static GSystemThread zero_thread; /* This is initialized to all zero */ - static gboolean thread_system_already_initialized = FALSE; - static gint g_thread_priority_map [G_THREAD_PRIORITY_URGENT + 1]; - -@@ -76,7 +78,7 @@ - struct _ErrorCheckInfo - { - gchar *location; -- GThread *owner; -+ GSystemThread owner; - }; - - static GMutex * -@@ -94,7 +96,9 @@ - gchar *location) - { - ErrorCheckInfo *info; -- GThread *self = g_thread_self (); -+ GSystemThread self; -+ -+ g_thread_functions_for_glib_use.thread_self (&self); - - if (magic != G_MUTEX_DEBUG_MAGIC) - location = "unknown"; -@@ -116,14 +120,14 @@ - } - - info = G_MUTEX_DEBUG_INFO (mutex); -- if (info->owner == self) -+ if (g_system_thread_equal (info->owner, self)) - g_error ("Trying to recursivly lock a mutex at '%s', " - "previously locked at '%s'", - location, info->location); - - g_thread_functions_for_glib_use_default.mutex_lock (mutex); - -- info->owner = self; -+ g_system_thread_assign (info->owner, self); - info->location = location; - } - -@@ -133,7 +137,9 @@ - gchar *location) - { - ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex); -- GThread *self = g_thread_self (); -+ GSystemThread self; -+ -+ g_thread_functions_for_glib_use.thread_self (&self); - - if (magic != G_MUTEX_DEBUG_MAGIC) - location = "unknown"; -@@ -145,7 +151,7 @@ - return TRUE; - } - -- if (info->owner == self) -+ if (g_system_thread_equal (info->owner, self)) - g_error ("Trying to recursivly lock a mutex at '%s', " - "previously locked at '%s'", - location, info->location); -@@ -153,7 +159,7 @@ - if (!g_thread_functions_for_glib_use_default.mutex_trylock (mutex)) - return FALSE; - -- info->owner = self; -+ g_system_thread_assign (info->owner, self); - info->location = location; - - return TRUE; -@@ -165,20 +171,22 @@ - gchar *location) - { - ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex); -- GThread *self = g_thread_self (); -+ GSystemThread self; -+ -+ g_thread_functions_for_glib_use.thread_self (&self); - - if (magic != G_MUTEX_DEBUG_MAGIC) - location = "unknown"; - -- if (!info || info->owner == NULL) -+ if (!info || g_system_thread_equal (info->owner, zero_thread)) - g_error ("Trying to unlock an unlocked mutex at '%s'", location); - -- if (info->owner != self) -+ if (!g_system_thread_equal (info->owner, self)) - g_warning ("Trying to unlock a mutex at '%s', " - "previously locked by a different thread at '%s'", - location, info->location); - -- info->owner = NULL; -+ g_system_thread_assign (info->owner, zero_thread); - info->location = NULL; - - g_thread_functions_for_glib_use_default.mutex_unlock (mutex); -@@ -194,7 +202,7 @@ - if (magic != G_MUTEX_DEBUG_MAGIC) - location = "unknown"; - -- if (info && info->owner != NULL) -+ if (info && !g_system_thread_equal (info->owner, zero_thread)) - g_error ("Trying to free a locked mutex at '%s', " - "which was previously locked at '%s'", - location, info->location); -@@ -211,25 +219,27 @@ - { - - ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex); -- GThread *self = g_thread_self (); -+ GSystemThread self; -+ -+ g_thread_functions_for_glib_use.thread_self (&self); - - if (magic != G_MUTEX_DEBUG_MAGIC) - location = "unknown"; - -- if (!info || info->owner == NULL) -+ if (!info || g_system_thread_equal (info->owner, zero_thread)) - g_error ("Trying to use an unlocked mutex in g_cond_wait() at '%s'", - location); - -- if (info->owner != self) -+ if (!g_system_thread_equal (info->owner, self)) - g_error ("Trying to use a mutex locked by another thread in " - "g_cond_wait() at '%s'", location); - -- info->owner = NULL; -+ g_system_thread_assign (info->owner, zero_thread); - location = info->location; - - g_thread_functions_for_glib_use_default.cond_wait (cond, mutex); - -- info->owner = self; -+ g_system_thread_assign (info->owner, self); - info->location = location; - } - -@@ -242,28 +252,30 @@ - gchar *location) - { - ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex); -- GThread *self = g_thread_self (); -+ GSystemThread self; - gboolean retval; - -+ g_thread_functions_for_glib_use.thread_self (&self); -+ - if (magic != G_MUTEX_DEBUG_MAGIC) - location = "unknown"; - -- if (!info || info->owner == NULL) -+ if (!info || g_system_thread_equal (info->owner, zero_thread)) - g_error ("Trying to use an unlocked mutex in g_cond_timed_wait() at '%s'", - location); - -- if (info->owner != self) -+ if (!g_system_thread_equal (info->owner, self)) - g_error ("Trying to use a mutex locked by another thread in " - "g_cond_timed_wait() at '%s'", location); - -- info->owner = NULL; -+ g_system_thread_assign (info->owner, zero_thread); - location = info->location; - - retval = g_thread_functions_for_glib_use_default.cond_timed_wait (cond, - mutex, - end_time); - -- info->owner = self; -+ g_system_thread_assign (info->owner, self); - info->location = location; - - return retval; 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-descr b/devel/glib20/pkg-descr deleted file mode 100644 index 3b3059030..000000000 --- a/devel/glib20/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -GLib provides a simple, abstract, and highly portable set of C support -routines such as lists, trees, hashes, memory allocation, and much, much -more. It is a foundation for writing portable applications. - -WWW: http://www.gtk.org/ diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist deleted file mode 100644 index aa6628f4e..000000000 --- a/devel/glib20/pkg-plist +++ /dev/null @@ -1,208 +0,0 @@ -bin/glib-genmarshal -bin/glib-gettextize -bin/glib-mkenums -bin/gobject-query -include/glib-2.0/glib-object.h -include/glib-2.0/glib.h -include/glib-2.0/glib/galloca.h -include/glib-2.0/glib/garray.h -include/glib-2.0/glib/gasyncqueue.h -include/glib-2.0/glib/gatomic.h -include/glib-2.0/glib/gbacktrace.h -include/glib-2.0/glib/gcache.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/gdir.h -include/glib-2.0/glib/gerror.h -include/glib-2.0/glib/gfileutils.h -include/glib-2.0/glib/ghash.h -include/glib-2.0/glib/ghook.h -include/glib-2.0/glib/gi18n-lib.h -include/glib-2.0/glib/gi18n.h -include/glib-2.0/glib/giochannel.h -include/glib-2.0/glib/gkeyfile.h -include/glib-2.0/glib/glist.h -include/glib-2.0/glib/gmacros.h -include/glib-2.0/glib/gmain.h -include/glib-2.0/glib/gmappedfile.h -include/glib-2.0/glib/gmarkup.h -include/glib-2.0/glib/gmem.h -include/glib-2.0/glib/gmessages.h -include/glib-2.0/glib/gnode.h -include/glib-2.0/glib/goption.h -include/glib-2.0/glib/gpattern.h -include/glib-2.0/glib/gprimes.h -include/glib-2.0/glib/gprintf.h -include/glib-2.0/glib/gqsort.h -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/grel.h -include/glib-2.0/glib/gscanner.h -include/glib-2.0/glib/gshell.h -include/glib-2.0/glib/gslice.h -include/glib-2.0/glib/gslist.h -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/gthread.h -include/glib-2.0/glib/gthreadpool.h -include/glib-2.0/glib/gtimer.h -include/glib-2.0/glib/gtree.h -include/glib-2.0/glib/gtypes.h -include/glib-2.0/glib/gunicode.h -include/glib-2.0/glib/gutils.h -include/glib-2.0/glib/gwin32.h -include/glib-2.0/glibconfig.h -include/glib-2.0/gmodule.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/gmarshal.h -include/glib-2.0/gobject/gobject.h -include/glib-2.0/gobject/gobjectnotifyqueue.c -include/glib-2.0/gobject/gparam.h -include/glib-2.0/gobject/gparamspecs.h -include/glib-2.0/gobject/gsignal.h -include/glib-2.0/gobject/gsourceclosure.h -include/glib-2.0/gobject/gtype.h -include/glib-2.0/gobject/gtypemodule.h -include/glib-2.0/gobject/gtypeplugin.h -include/glib-2.0/gobject/gvalue.h -include/glib-2.0/gobject/gvaluearray.h -include/glib-2.0/gobject/gvaluecollector.h -include/glib-2.0/gobject/gvaluetypes.h -lib/libglib-2.0.a -lib/libglib-2.0.la -lib/libglib-2.0.so -lib/libglib-2.0.so.0 -lib/libgmodule-2.0.a -lib/libgmodule-2.0.la -lib/libgmodule-2.0.so -lib/libgmodule-2.0.so.0 -lib/libgobject-2.0.a -lib/libgobject-2.0.la -lib/libgobject-2.0.so -lib/libgobject-2.0.so.0 -lib/libgthread-2.0.a -lib/libgthread-2.0.la -lib/libgthread-2.0.so -lib/libgthread-2.0.so.0 -libdata/pkgconfig/glib-2.0.pc -libdata/pkgconfig/gmodule-2.0.pc -libdata/pkgconfig/gmodule-export-2.0.pc -libdata/pkgconfig/gmodule-no-export-2.0.pc -libdata/pkgconfig/gobject-2.0.pc -libdata/pkgconfig/gthread-2.0.pc -share/aclocal/glib-2.0.m4 -share/aclocal/glib-gettext.m4 -share/glib-2.0/gettext/mkinstalldirs -share/glib-2.0/gettext/po/Makefile.in.in -share/locale/am/LC_MESSAGES/glib20.mo -share/locale/ar/LC_MESSAGES/glib20.mo -share/locale/az/LC_MESSAGES/glib20.mo -share/locale/be/LC_MESSAGES/glib20.mo -share/locale/bg/LC_MESSAGES/glib20.mo -share/locale/bn/LC_MESSAGES/glib20.mo -share/locale/bs/LC_MESSAGES/glib20.mo -share/locale/ca/LC_MESSAGES/glib20.mo -share/locale/cs/LC_MESSAGES/glib20.mo -share/locale/cy/LC_MESSAGES/glib20.mo -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_CA/LC_MESSAGES/glib20.mo -share/locale/en_GB/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 -share/locale/eu/LC_MESSAGES/glib20.mo -share/locale/fa/LC_MESSAGES/glib20.mo -share/locale/fi/LC_MESSAGES/glib20.mo -share/locale/fr/LC_MESSAGES/glib20.mo -share/locale/ga/LC_MESSAGES/glib20.mo -share/locale/gl/LC_MESSAGES/glib20.mo -share/locale/gu/LC_MESSAGES/glib20.mo -share/locale/he/LC_MESSAGES/glib20.mo -share/locale/hi/LC_MESSAGES/glib20.mo -share/locale/hr/LC_MESSAGES/glib20.mo -share/locale/hu/LC_MESSAGES/glib20.mo -share/locale/id/LC_MESSAGES/glib20.mo -share/locale/is/LC_MESSAGES/glib20.mo -share/locale/it/LC_MESSAGES/glib20.mo -share/locale/ja/LC_MESSAGES/glib20.mo -share/locale/ka/LC_MESSAGES/glib20.mo -share/locale/ko/LC_MESSAGES/glib20.mo -share/locale/ku/LC_MESSAGES/glib20.mo -share/locale/lt/LC_MESSAGES/glib20.mo -share/locale/lv/LC_MESSAGES/glib20.mo -share/locale/mk/LC_MESSAGES/glib20.mo -share/locale/ml/LC_MESSAGES/glib20.mo -share/locale/mn/LC_MESSAGES/glib20.mo -share/locale/ms/LC_MESSAGES/glib20.mo -share/locale/nb/LC_MESSAGES/glib20.mo -share/locale/ne/LC_MESSAGES/glib20.mo -share/locale/nl/LC_MESSAGES/glib20.mo -share/locale/nn/LC_MESSAGES/glib20.mo -share/locale/no/LC_MESSAGES/glib20.mo -share/locale/or/LC_MESSAGES/glib20.mo -share/locale/pa/LC_MESSAGES/glib20.mo -share/locale/pl/LC_MESSAGES/glib20.mo -share/locale/pt/LC_MESSAGES/glib20.mo -share/locale/pt_BR/LC_MESSAGES/glib20.mo -share/locale/ro/LC_MESSAGES/glib20.mo -share/locale/ru/LC_MESSAGES/glib20.mo -share/locale/rw/LC_MESSAGES/glib20.mo -share/locale/sk/LC_MESSAGES/glib20.mo -share/locale/sl/LC_MESSAGES/glib20.mo -share/locale/sq/LC_MESSAGES/glib20.mo -share/locale/sr/LC_MESSAGES/glib20.mo -share/locale/sr@Latn/LC_MESSAGES/glib20.mo -share/locale/sr@ije/LC_MESSAGES/glib20.mo -share/locale/sv/LC_MESSAGES/glib20.mo -share/locale/ta/LC_MESSAGES/glib20.mo -share/locale/te/LC_MESSAGES/glib20.mo -share/locale/th/LC_MESSAGES/glib20.mo -share/locale/tl/LC_MESSAGES/glib20.mo -share/locale/tr/LC_MESSAGES/glib20.mo -share/locale/tt/LC_MESSAGES/glib20.mo -share/locale/uk/LC_MESSAGES/glib20.mo -share/locale/vi/LC_MESSAGES/glib20.mo -share/locale/wa/LC_MESSAGES/glib20.mo -share/locale/xh/LC_MESSAGES/glib20.mo -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 -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/ku/LC_MESSAGES -@dirrmtry share/locale/ku -@dirrmtry share/locale/ne/LC_MESSAGES -@dirrmtry share/locale/ne -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/sr@ije/LC_MESSAGES -@dirrmtry share/locale/sr@ije -@dirrmtry share/locale/tt/LC_MESSAGES -@dirrmtry share/locale/tt -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/tl/LC_MESSAGES -@dirrmtry share/locale/tl -@dirrmtry share/locale/xh/LC_MESSAGES -@dirrmtry share/locale/xh -@dirrmtry share/locale/yi/LC_MESSAGES -@dirrmtry share/locale/yi -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrm share/glib-2.0/gettext/po -@dirrm share/glib-2.0/gettext -@dirrm share/glib-2.0 -@dirrm include/glib-2.0/gobject -@dirrm include/glib-2.0/glib -@dirrm include/glib-2.0 |