[Midnightbsd-cvs] mports: devel/glib20: Update glib as part of the GTK upgrade.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Aug 23 02:32:33 EDT 2007
Log Message:
-----------
Update glib as part of the GTK upgrade.
Modified Files:
--------------
mports/devel/glib20:
Makefile (r1.3 -> r1.4)
distinfo (r1.1.1.1 -> r1.2)
pkg-plist (r1.1.1.1 -> r1.2)
mports/devel/glib20/files:
extra-patch-glib_gunicollate.c (r1.1.1.1 -> r1.2)
patch-ag (r1.1.1.1 -> r1.2)
patch-glib_gutils.c (r1.1.1.1 -> r1.2)
patch-gmodule::gmodule-dl.c (r1.1.1.1 -> r1.2)
Removed Files:
-------------
mports/devel/glib20/files:
extra-patch-gthread_gthread-posix.c
patch-glib_gthread.c
patch-glib_gthreadprivate.h
patch-gthread_gthread-impl.c
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/devel/glib20/pkg-plist,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Ldevel/glib20/pkg-plist -Ldevel/glib20/pkg-plist -u -r1.1.1.1 -r1.2
--- devel/glib20/pkg-plist
+++ devel/glib20/pkg-plist
@@ -9,6 +9,8 @@
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/gbase64.h
+include/glib-2.0/glib/gbookmarkfile.h
include/glib-2.0/glib/gcache.h
include/glib-2.0/glib/gcompletion.h
include/glib-2.0/glib/gconvert.h
@@ -105,8 +107,10 @@
share/locale/ar/LC_MESSAGES/glib20.mo
share/locale/az/LC_MESSAGES/glib20.mo
share/locale/be/LC_MESSAGES/glib20.mo
+share/locale/be at latin/LC_MESSAGES/glib20.mo
share/locale/bg/LC_MESSAGES/glib20.mo
share/locale/bn/LC_MESSAGES/glib20.mo
+share/locale/bn_IN/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
@@ -131,6 +135,7 @@
share/locale/hi/LC_MESSAGES/glib20.mo
share/locale/hr/LC_MESSAGES/glib20.mo
share/locale/hu/LC_MESSAGES/glib20.mo
+share/locale/hy/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
@@ -148,7 +153,6 @@
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
@@ -178,31 +182,35 @@
share/locale/zh_CN/LC_MESSAGES/glib20.mo
share/locale/zh_HK/LC_MESSAGES/glib20.mo
share/locale/zh_TW/LC_MESSAGES/glib20.mo
- at dirrmtry share/locale/dz/LC_MESSAGES
- at dirrmtry share/locale/dz
- at dirrmtry share/locale/ku/LC_MESSAGES
- at dirrmtry share/locale/ku
- at dirrmtry share/locale/ne/LC_MESSAGES
- at dirrmtry share/locale/ne
- at dirrmtry share/locale/rw/LC_MESSAGES
- at dirrmtry share/locale/rw
- at dirrmtry share/locale/sr at ije/LC_MESSAGES
- at dirrmtry share/locale/sr at ije
- at dirrmtry share/locale/tt/LC_MESSAGES
- at dirrmtry share/locale/tt
- at dirrmtry share/locale/te/LC_MESSAGES
- at dirrmtry share/locale/te
- at dirrmtry share/locale/tl/LC_MESSAGES
- at dirrmtry share/locale/tl
- at dirrmtry share/locale/xh/LC_MESSAGES
- at dirrmtry share/locale/xh
- at dirrmtry share/locale/yi/LC_MESSAGES
- at dirrmtry share/locale/yi
- at dirrmtry share/locale/zh_HK/LC_MESSAGES
- at 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
+ at dirrmtry share/locale/zh_HK/LC_MESSAGES
+ at dirrmtry share/locale/zh_HK
+ at dirrmtry share/locale/yi/LC_MESSAGES
+ at dirrmtry share/locale/yi
+ at dirrmtry share/locale/xh/LC_MESSAGES
+ at dirrmtry share/locale/xh
+ at dirrmtry share/locale/tt/LC_MESSAGES
+ at dirrmtry share/locale/tt
+ at dirrmtry share/locale/tl/LC_MESSAGES
+ at dirrmtry share/locale/tl
+ at dirrmtry share/locale/te/LC_MESSAGES
+ at dirrmtry share/locale/te
+ at dirrmtry share/locale/sr at ije/LC_MESSAGES
+ at dirrmtry share/locale/sr at ije
+ at dirrmtry share/locale/rw/LC_MESSAGES
+ at dirrmtry share/locale/rw
+ at dirrmtry share/locale/ku/LC_MESSAGES
+ at dirrmtry share/locale/ku
+ at dirrmtry share/locale/hy/LC_MESSAGES
+ at dirrmtry share/locale/hy
+ at dirrmtry share/locale/dz/LC_MESSAGES
+ at dirrmtry share/locale/dz
+ at dirrmtry share/locale/bn_IN/LC_MESSAGES
+ at dirrmtry share/locale/bn_IN
+ at dirrmtry share/locale/be at latin/LC_MESSAGES
+ at dirrmtry share/locale/be at latin
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/glib20/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ldevel/glib20/Makefile -Ldevel/glib20/Makefile -u -r1.3 -r1.4
--- devel/glib20/Makefile
+++ devel/glib20/Makefile
@@ -3,16 +3,16 @@
# Whom: Vanilla I. Shu <vanilla at FreeBSD.org>
#
# $MidnightBSD$
-# $FreeBSD: ports/devel/glib20/Makefile,v 1.126 2006/09/07 18:47:07 jylefort Exp $
-# $MCom: ports/devel/glib20/Makefile,v 1.75 2006/04/13 07:57:40 bland Exp $
+# $FreeBSD: ports/devel/glib20/Makefile,v 1.142 2007/07/17 02:35:58 marcus Exp $
+# $MCom: ports/devel/glib20/Makefile,v 1.91 2006/10/05 06:55:34 mezz Exp $
#
PORTNAME= glib
-PORTVERSION= 2.10.3
+PORTVERSION= 2.12.13
PORTREVISION?= 0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/2.10,} \
- ftp://ftp.gtk.org/pub/gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
+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%/ \
@@ -31,7 +31,7 @@
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_GNOME= gnomehack gnometarget pkgconfig ltverhack
USE_GMAKE= yes
USE_PERL5= yes
@@ -47,6 +47,16 @@
.include <bsd.port.pre.mk>
+# Let glib use asm code for implementing atomic ops on i386 and amd64.
+.if ${ARCH} == "i386"
+GLIB_ARCH= i486
+.elif ${ARCH} == "amd64"
+GLIB_ARCH= x86_64
+.else
+GLIB_ARCH= ${ARCH}
+.endif
+CONFIGURE_TARGET= --build=${GLIB_ARCH}-portbld-freebsd6.0
+
.if defined(WITH_COLLATION_FIX)
LIB_DEPENDS+= icui18n:${PORTSDIR}/devel/icu
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \
@@ -54,8 +64,7 @@
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
- s|%%X11BASE%%|${X11BASE}|g' \
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/glib/gutils.c
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/devel/glib20/distinfo,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Ldevel/glib20/distinfo -Ldevel/glib20/distinfo -u -r1.1.1.1 -r1.2
--- devel/glib20/distinfo
+++ devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.10.3.tar.bz2) = 87206e721c12d185d17dd9ecd7e30369
-SHA256 (gnome2/glib-2.10.3.tar.bz2) = 1d3700e35ca7240a9ce28cf222429648ea50271d62524e008191ccd04a3f8f6f
-SIZE (gnome2/glib-2.10.3.tar.bz2) = 2774011
+MD5 (gnome2/glib-2.12.13.tar.bz2) = d76124236e4e216e8c0861341e967a76
+SHA256 (gnome2/glib-2.12.13.tar.bz2) = 1253d563ca2e50292d924849fe3a23c3b7bc707ab8b79bda19319f9d192b0e8e
+SIZE (gnome2/glib-2.12.13.tar.bz2) = 2938164
Index: patch-gmodule::gmodule-dl.c
===================================================================
RCS file: /home/cvs/mports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Ldevel/glib20/files/patch-gmodule::gmodule-dl.c -Ldevel/glib20/files/patch-gmodule::gmodule-dl.c -u -r1.1.1.1 -r1.2
--- devel/glib20/files/patch-gmodule::gmodule-dl.c
+++ devel/glib20/files/patch-gmodule::gmodule-dl.c
@@ -1,6 +1,6 @@
-$FreeBSD: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.6 2006/04/30 00:46:48 marcus Exp $
- $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.16 2005/12/15 00:18:44 marcus Exp $
+$FreeBSD: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.7 2006/10/14 08:35:12 marcus Exp $
+ $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.19 2006/10/10 20:22:06 mezz Exp $
--- gmodule/gmodule-dl.c.orig Sat Feb 17 08:28:07 2001
+++ gmodule/gmodule-dl.c Fri Jan 18 09:48:45 2002
--- 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__ */
--- 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
--- 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;
--- 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)
Index: patch-ag
===================================================================
RCS file: /home/cvs/mports/devel/glib20/files/patch-ag,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Ldevel/glib20/files/patch-ag -Ldevel/glib20/files/patch-ag -u -r1.1.1.1 -r1.2
--- devel/glib20/files/patch-ag
+++ devel/glib20/files/patch-ag
@@ -1,14 +1,22 @@
---- Makefile.in.orig Sun Dec 23 16:53:53 2001
-+++ Makefile.in Fri Feb 8 12:44:30 2002
-@@ -151,3 +151,3 @@
+--- Makefile.in.orig Tue May 1 20:39:42 2007
++++ Makefile.in Tue May 1 20:40:23 2007
+@@ -239,7 +239,7 @@ target_alias = @target_alias@
+
+ AUTOMAKE_OPTIONS = 1.7
-SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
+SUBDIRS = . m4macros glib gobject gmodule gthread build po docs
-@@ -192,4 +192,4 @@
+ bin_SCRIPTS = glib-gettextize
+
+@@ -292,8 +292,8 @@ BUILT_EXTRA_DIST = \
+ config.h.win32 \
+ gtk-doc.make
-
-configexecincludedir = $(libdir)/glib-2.0/include
+glibincludedir = $(includedir)/glib-2.0
+configexecincludedir = $(glibincludedir)
+ CONFIGURE_DEPENDENCIES = acglib.m4
+
Index: extra-patch-glib_gunicollate.c
===================================================================
RCS file: /home/cvs/mports/devel/glib20/files/extra-patch-glib_gunicollate.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Ldevel/glib20/files/extra-patch-glib_gunicollate.c -Ldevel/glib20/files/extra-patch-glib_gunicollate.c -u -r1.1.1.1 -r1.2
--- devel/glib20/files/extra-patch-glib_gunicollate.c
+++ devel/glib20/files/extra-patch-glib_gunicollate.c
@@ -1,5 +1,5 @@
---- glib/gunicollate.c.orig Sun Nov 27 21:15:41 2005
-+++ glib/gunicollate.c Wed Jul 19 01:06:32 2006
+--- glib/gunicollate.c.orig Thu Jun 8 17:24:10 2006
++++ glib/gunicollate.c Thu Oct 19 20:12:50 2006
@@ -26,10 +26,57 @@
#include <wchar.h>
#endif
@@ -55,10 +55,10 @@
+ return result;
+}
+
- /**
- * g_utf8_collate:
- * @str1: a UTF-8 encoded string
-@@ -76,6 +123,28 @@
+ #ifdef _MSC_VER
+ /* Workaround for bug in MSVCR80.DLL */
+ static size_t
+@@ -94,6 +141,28 @@
g_return_val_if_fail (str1 != NULL, 0);
g_return_val_if_fail (str2 != NULL, 0);
@@ -87,7 +87,7 @@
str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE);
str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE);
-@@ -217,6 +286,26 @@
+@@ -235,6 +304,26 @@
gchar *str_norm;
g_return_val_if_fail (str != NULL, NULL);
@@ -99,14 +99,14 @@
+ UChar *wstr = utf8_to_uchar(str, len, &wstr_len);
+ if (wstr != NULL)
+ {
-+ uint8_t dummy;
+ int32_t result_len;
+
+ /* get size of result */
-+ result_len = ucol_getSortKey(icu_collator, wstr, wstr_len, &dummy, 1);
++ result_len = ucol_getSortKey(icu_collator, wstr, wstr_len, NULL, 0);
+
+ result = g_new(char, result_len);
+ ucol_getSortKey(icu_collator, wstr, wstr_len, result, result_len);
++ g_free(wstr);
+
+ return result;
+ }
Index: patch-glib_gutils.c
===================================================================
RCS file: /home/cvs/mports/devel/glib20/files/patch-glib_gutils.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Ldevel/glib20/files/patch-glib_gutils.c -Ldevel/glib20/files/patch-glib_gutils.c -u -r1.1.1.1 -r1.2
--- devel/glib20/files/patch-glib_gutils.c
+++ devel/glib20/files/patch-glib_gutils.c
@@ -5,7 +5,7 @@
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_dirs = "/usr/local/share/gnome/:/usr/local/share/:/usr/share/";
data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
#endif
@@ -14,7 +14,7 @@
if (!conf_dirs || !conf_dirs[0])
- conf_dirs = "/etc/xdg";
-+ conf_dirs = "%%X11BASE%%/etc/xdg:/usr/local/etc/xdg:/etc/xdg";
++ conf_dirs = "/usr/local/etc/xdg:/etc/xdg";
conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
#endif
More information about the Midnightbsd-cvs
mailing list