Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ec084a8a5a347ad69df87eea8127bcc2309b63ab
commit ec084a8a5a347ad69df87eea8127bcc2309b63ab Author: crazy <[EMAIL PROTECTED]> Date: Thu Sep 27 20:32:00 2007 +0200 glib2-2.14.1-4-i686 * relbump * add 2 more bug fixes * disable debug ( even I don't like to diable it ) , is not going to work with gnome 2.20* * I try figure broken stuff after rc2 is out but I'm not sure I can fix all the stuff * still missing a glib2.sh , will be in -5 diff --git a/source/base/glib2/FrugalBuild b/source/base/glib2/FrugalBuild index 301a741..a8e6c1d 100644 --- a/source/base/glib2/FrugalBuild +++ b/source/base/glib2/FrugalBuild @@ -3,7 +3,7 @@ pkgname=glib2 pkgver=2.14.1 -pkgrel=3 +pkgrel=4 pkgdesc="Common C routines used by GTK+2 and other libraries" url="http://www.gtk.org/"; depends=('glibc') @@ -14,13 +14,22 @@ options=('scriptlet') _F_gnome_name="glib" _F_gnome_devel="n" Finclude gnome -source=($source glib2-bug476849.patch glib2-bug478459.patch) +source=($source \ + glib2-bug476849.patch \ + glib2-bug478459.patch \ + glib2-bug479724.patch \ + glib-cast.patch) _F_cd_path="glib-$pkgver" -## DON'T remove nor change the debug level or it breaks again -Fconfopts="$Fconfopts --enable-gtk-doc --enable-static --with-threads=posix --enable-debug" +## DON'T remove nor change the debug level or it breaks again .. ## --enable-debug=yes # +## Gnome segfaults all over the place with debug , remover for rc2 , maybe for stable. +## NOTE: there is still a way to debug even with debug enabled : +## http://library.gnome.org/devel/glib/unstable/glib-running.html +Fconfopts="$Fconfopts --enable-gtk-doc --enable-static --with-threads=posix" sha1sums=('ef9ff562aa7766b0081d37e3ce685843e796c0f8' \ '0c6723a3af0c19c735014071d59751ca138d28f8' \ - 'd5294900ed3ee713ee0472a8f05fd9286d2a5690') + 'd5294900ed3ee713ee0472a8f05fd9286d2a5690' \ + '8aa98ec8c7a8aad90d27e6c81a7fee1c686914fe' \ + 'a78a870e933a317148e11bffdf5d19c8fe4ac2bd') # Don't touch that export CFLAGS="$CFLAGS -fno-strict-aliasing" diff --git a/source/base/glib2/glib-cast.patch b/source/base/glib2/glib-cast.patch new file mode 100644 index 0000000..56ececa --- /dev/null +++ b/source/base/glib2/glib-cast.patch @@ -0,0 +1,85 @@ +Index: glib/gthread.c +=================================================================== +--- glib/gthread.c.orig ++++ glib/gthread.c +@@ -200,7 +200,7 @@ g_once_impl (GOnce *once, + } + + gboolean +-g_once_init_enter_impl (volatile gsize *value_location) ++g_once_init_enter_impl (volatile gpointer *value_location) + { + gboolean need_init; + g_mutex_lock (g_once_mutex); +@@ -220,8 +220,8 @@ g_once_init_enter_impl (volatile gsize * + } + + void +-g_once_init_leave (volatile gsize *value_location, +- gsize initialization_value) ++g_once_init_leave (volatile gpointer *value_location, ++ gpointer initialization_value) + { + g_return_if_fail (g_atomic_pointer_get (value_location) == 0); + g_return_if_fail (initialization_value != 0); +Index: glib/gthread.h +=================================================================== +--- glib/gthread.h.orig ++++ glib/gthread.h +@@ -324,13 +324,13 @@ gpointer g_once_impl (GOnce *once, GThre + #endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */ + + /* initialize-once guards, keyed by value_location */ +-G_INLINE_FUNC gboolean g_once_init_enter (volatile gsize *value_location); +-gboolean g_once_init_enter_impl (volatile gsize *value_location); +-void g_once_init_leave (volatile gsize *value_location, +- gsize initialization_value); ++G_INLINE_FUNC gboolean g_once_init_enter (volatile gpointer *value_location); ++gboolean g_once_init_enter_impl (volatile gpointer *value_location); ++void g_once_init_leave (volatile gpointer *value_location, ++ gpointer initialization_value); + #if defined (G_CAN_INLINE) || defined (__G_THREAD_C__) + G_INLINE_FUNC gboolean +-g_once_init_enter (volatile gsize *value_location) ++g_once_init_enter (volatile gpointer *value_location) + { + if G_LIKELY (g_atomic_pointer_get (value_location) !=0) + return FALSE; +Index: gobject/gtype.h +=================================================================== +--- gobject/gtype.h.orig ++++ gobject/gtype.h +@@ -368,7 +368,7 @@ static void type_name##_class_intern + GType \ + type_name##_get_type (void) \ + { \ +- static volatile gsize g_define_type_id__volatile = 0; \ ++ static volatile gpointer g_define_type_id__volatile = 0; \ + if (g_once_init_enter (&g_define_type_id__volatile)) \ + { \ + GType g_define_type_id = \ +@@ -383,9 +383,9 @@ type_name##_get_type (void) \ + #define _G_DEFINE_TYPE_EXTENDED_END() \ + /* following custom code */ \ + } \ +- g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \ ++ g_once_init_leave (&g_define_type_id__volatile, (gpointer) g_define_type_id); \ + } \ +- return g_define_type_id__volatile; \ ++ return (GType) g_define_type_id__volatile; \ + } /* closes type_name##_get_type() */ + + +Index: glib/garray.h +=================================================================== +--- glib/garray.h.orig ++++ glib/garray.h +@@ -61,7 +61,7 @@ struct _GPtrArray + #define g_array_append_val(a,v) g_array_append_vals (a, &(v), 1) + #define g_array_prepend_val(a,v) g_array_prepend_vals (a, &(v), 1) + #define g_array_insert_val(a,i,v) g_array_insert_vals (a, i, &(v), 1) +-#define g_array_index(a,t,i) (((t*) (a)->data) [(i)]) ++#define g_array_index(a,t,i) (((t*) ((void *) ((a)->data))) [(i)]) + + GArray* g_array_new (gboolean zero_terminated, + gboolean clear_, diff --git a/source/base/glib2/glib2-bug479724.patch b/source/base/glib2/glib2-bug479724.patch new file mode 100644 index 0000000..cf5ff05 --- /dev/null +++ b/source/base/glib2/glib2-bug479724.patch @@ -0,0 +1,15 @@ +diff -Naur glib-2.14.1/glib/gmain.c glib-2.14.1-p/glib/gmain.c +--- glib-2.14.1/glib/gmain.c 2007-09-16 19:32:03.000000000 +0200 ++++ glib-2.14.1-p/glib/gmain.c 2007-09-27 19:29:16.000000000 +0200 +@@ -665,6 +665,11 @@ + else + main_contexts_without_pipe = g_slist_remove (main_contexts_without_pipe, + context); ++ ++ if(context->cond != NULL) ++ { ++ g_cond_free(context->cond); ++ } + #endif + + g_free (context); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
