update to glib2-2.14.1. This is a bug fix release in the 2.14 series.
Overview of Changes from GLib 2.14.0 to GLib 2.14.1 =================================================== * Bugs fixed: 476840 Invocation of the interface "g_utf8_strreverse" crashes f... 444765 Fix FIXME in gregex.c when new pcre is out 464145 g_markup_escape_text Produces Invalid XML 465625 g_type_default_interface_ref() does not ensure working g_... 466768 Clearify that comments can be put anywhere in a Key-file. 474229 The GError documentation should give convention for the G... 474899 G_BREAKPOINT() docs inaccurate 475854 Overuse of -lpcre when using system pcre 473879 Incorrect includes in gregex.c 468694 Typoes in documentation 469051 g_snprintf () talks about characters where it probably me... 457601 Missing arch specific atomic implementation 475923 Missing pcre flags when static-linking against glib 475619 glibthread-2.0.la does not list -lpthread Also many updated translations.
This commit is contained in:
parent
c58de1f138
commit
aefb760754
5 changed files with 23 additions and 37 deletions
|
@ -1,9 +1,8 @@
|
|||
# $NetBSD: Makefile,v 1.120 2007/08/16 18:11:44 tnn Exp $
|
||||
# $NetBSD: Makefile,v 1.121 2007/09/18 17:37:02 tnn Exp $
|
||||
|
||||
# When updating glib2, please apply patch-ak to configure.in
|
||||
# Then run a matching version of autoconf to regen patch-aa.
|
||||
DISTNAME= glib-2.14.0
|
||||
PKGREVISION= 1
|
||||
DISTNAME= glib-2.14.1
|
||||
PKGNAME= ${DISTNAME:S/glib/glib2/}
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.14/ \
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.37 2007/08/15 22:09:13 tnn Exp $
|
||||
@comment $NetBSD: PLIST,v 1.38 2007/09/18 17:37:02 tnn Exp $
|
||||
bin/glib-genmarshal
|
||||
bin/glib-gettextize
|
||||
bin/glib-mkenums
|
||||
|
@ -317,6 +317,7 @@ 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/oc/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
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
$NetBSD: distinfo,v 1.84 2007/08/16 18:11:44 tnn Exp $
|
||||
$NetBSD: distinfo,v 1.85 2007/09/18 17:37:02 tnn Exp $
|
||||
|
||||
SHA1 (glib-2.14.0.tar.bz2) = a0ebfd3e170b3c47af44453b8861d3caceb9b7c4
|
||||
RMD160 (glib-2.14.0.tar.bz2) = b929764eaac40afc0064424f094cd6d8a76dfcf4
|
||||
Size (glib-2.14.0.tar.bz2) = 3304745 bytes
|
||||
SHA1 (patch-aa) = e313f298388abba710a2b085bf6c78b915a305c0
|
||||
SHA1 (glib-2.14.1.tar.bz2) = ef9ff562aa7766b0081d37e3ce685843e796c0f8
|
||||
RMD160 (glib-2.14.1.tar.bz2) = 9a0ac925dd42a423a72c86653faa1043ee740afc
|
||||
Size (glib-2.14.1.tar.bz2) = 3337370 bytes
|
||||
SHA1 (patch-aa) = 8acedc299708d0640959840be0b435daa62e292c
|
||||
SHA1 (patch-ab) = a765c6e43856ce858f23f237ffd5b48cb6d029e6
|
||||
SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961
|
||||
SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
|
||||
|
@ -13,4 +13,3 @@ SHA1 (patch-ah) = 8b65c137b07659351b97089c10db0dac61f04905
|
|||
SHA1 (patch-ai) = baf3466a38ed09e956c4e8423a64415395690de7
|
||||
SHA1 (patch-aj) = a8c4e79113828e6dadf0b158777bb860aa44de3e
|
||||
SHA1 (patch-ak) = 86ead0dc2836ee2ced420cca62e2f116ece316aa
|
||||
SHA1 (patch-al) = 2cea566231c2dd1367fc898e616386e274bb9c1d
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $
|
||||
$NetBSD: patch-aa,v 1.35 2007/09/18 17:37:02 tnn Exp $
|
||||
|
||||
--- configure.orig 2007-08-04 04:41:45.000000000 +0200
|
||||
--- configure.orig 2007-09-16 18:29:44.000000000 +0200
|
||||
+++ configure
|
||||
@@ -929,6 +929,7 @@ G_MODULE_PLUGIN_LIBS
|
||||
G_MODULE_LDFLAGS
|
||||
|
@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $
|
|||
G_MODULE_NEED_USCORE
|
||||
GLIB_DEBUG_FLAGS
|
||||
GSPAWN
|
||||
@@ -36706,6 +36707,7 @@ else
|
||||
@@ -36702,6 +36703,7 @@ else
|
||||
fi
|
||||
G_MODULE_NEED_USCORE=0
|
||||
G_MODULE_BROKEN_RTLD_GLOBAL=0
|
||||
|
@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $
|
|||
G_MODULE_HAVE_DLERROR=0
|
||||
if test -z "$G_MODULE_IMPL"; then
|
||||
case "$host" in
|
||||
@@ -37629,6 +37631,84 @@ fi
|
||||
@@ -37625,6 +37627,84 @@ fi
|
||||
|
||||
LIBS="$LIBS_orig"
|
||||
fi
|
||||
|
@ -103,7 +103,7 @@ $NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $
|
|||
if test -z "$G_MODULE_IMPL"; then
|
||||
G_MODULE_IMPL=0
|
||||
G_MODULE_SUPPORTED=false
|
||||
@@ -37665,6 +37745,8 @@ fi
|
||||
@@ -37661,6 +37741,8 @@ fi
|
||||
|
||||
|
||||
|
||||
|
@ -112,7 +112,7 @@ $NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $
|
|||
{ echo "$as_me:$LINENO: checking for gspawn implementation" >&5
|
||||
echo $ECHO_N "checking for gspawn implementation... $ECHO_C" >&6; }
|
||||
case "$host" in
|
||||
@@ -38063,126 +38145,8 @@ if test x"$have_threads" != xno; then
|
||||
@@ -38059,126 +38141,8 @@ if test x"$have_threads" != xno; then
|
||||
G_THREAD_LIBS="-lpthread -lthread"
|
||||
;;
|
||||
*)
|
||||
|
@ -241,7 +241,7 @@ $NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $
|
|||
;;
|
||||
esac
|
||||
fi
|
||||
@@ -40506,6 +40470,10 @@ case $host in
|
||||
@@ -40503,6 +40467,10 @@ case $host in
|
||||
*)
|
||||
G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
|
||||
;;
|
||||
|
@ -252,7 +252,7 @@ $NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $
|
|||
esac
|
||||
|
||||
|
||||
@@ -46139,6 +46107,7 @@ G_MODULE_PLUGIN_LIBS!$G_MODULE_PLUGIN_LI
|
||||
@@ -46199,6 +46167,7 @@ G_MODULE_PLUGIN_LIBS!$G_MODULE_PLUGIN_LI
|
||||
G_MODULE_LDFLAGS!$G_MODULE_LDFLAGS$ac_delim
|
||||
G_MODULE_HAVE_DLERROR!$G_MODULE_HAVE_DLERROR$ac_delim
|
||||
G_MODULE_BROKEN_RTLD_GLOBAL!$G_MODULE_BROKEN_RTLD_GLOBAL$ac_delim
|
||||
|
@ -260,7 +260,7 @@ $NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $
|
|||
G_MODULE_NEED_USCORE!$G_MODULE_NEED_USCORE$ac_delim
|
||||
GLIB_DEBUG_FLAGS!$GLIB_DEBUG_FLAGS$ac_delim
|
||||
GSPAWN!$GSPAWN$ac_delim
|
||||
@@ -46157,7 +46126,6 @@ ENABLE_REGEX_TRUE!$ENABLE_REGEX_TRUE$ac_
|
||||
@@ -46217,7 +46186,6 @@ ENABLE_REGEX_TRUE!$ENABLE_REGEX_TRUE$ac_
|
||||
ENABLE_REGEX_FALSE!$ENABLE_REGEX_FALSE$ac_delim
|
||||
USE_SYSTEM_PCRE_TRUE!$USE_SYSTEM_PCRE_TRUE$ac_delim
|
||||
USE_SYSTEM_PCRE_FALSE!$USE_SYSTEM_PCRE_FALSE$ac_delim
|
||||
|
@ -268,20 +268,20 @@ $NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $
|
|||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@@ -46199,6 +46167,7 @@ _ACEOF
|
||||
@@ -46259,6 +46227,7 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
+PCRE_CFLAGS!$PCRE_CFLAGS$ac_delim
|
||||
PCRE_LIBS!$PCRE_LIBS$ac_delim
|
||||
PCRE_REQUIRES!$PCRE_REQUIRES$ac_delim
|
||||
PCRE_WARN_CFLAGS!$PCRE_WARN_CFLAGS$ac_delim
|
||||
G_LIBS_EXTRA!$G_LIBS_EXTRA$ac_delim
|
||||
@@ -46219,7 +46188,7 @@ LIBOBJS!$LIBOBJS$ac_delim
|
||||
@@ -46281,7 +46250,7 @@ LIBOBJS!$LIBOBJS$ac_delim
|
||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
|
||||
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
|
||||
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then
|
||||
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-al,v 1.1 2007/08/16 18:11:44 tnn Exp $
|
||||
|
||||
--- glib/gthread.h.orig 2007-08-03 19:52:48.000000000 +0200
|
||||
+++ glib/gthread.h
|
||||
@@ -332,7 +332,7 @@ void g_once_init_leav
|
||||
G_INLINE_FUNC gboolean
|
||||
g_once_init_enter (volatile gsize *value_location)
|
||||
{
|
||||
- if G_LIKELY (g_atomic_pointer_get ((void**) value_location) !=0)
|
||||
+ if G_LIKELY (g_atomic_pointer_get ((volatile gpointer*) value_location) !=0)
|
||||
return FALSE;
|
||||
else
|
||||
return g_once_init_enter_impl (value_location);
|
Loading…
Reference in a new issue