Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9e8dc326c93ef0eff3345f18062221554da160c8
commit 9e8dc326c93ef0eff3345f18062221554da160c8 Author: crazy <[EMAIL PROTECTED]> Date: Sun Sep 23 01:55:06 2007 +0200 glib2-2.14.1-2-i686 * relbump * added to patches to fix g_hook_free() issues diff --git a/source/base/glib2/FrugalBuild b/source/base/glib2/FrugalBuild index 34724ab..3f50cc6 100644 --- a/source/base/glib2/FrugalBuild +++ b/source/base/glib2/FrugalBuild @@ -3,7 +3,7 @@ pkgname=glib2 pkgver=2.14.1 -pkgrel=1 +pkgrel=2 pkgdesc="Common C routines used by GTK+2 and other libraries" url="http://www.gtk.org/"; depends=('glibc') @@ -14,8 +14,11 @@ options=('scriptlet') _F_gnome_name="glib" _F_gnome_devel="n" Finclude gnome +source=($source glib2-bug476849.patch glib2-bug478459.patch) _F_cd_path="glib-$pkgver" Fconfopts="$Fconfopts --enable-gtk-doc --enable-static --enable-debug=minimum" -sha1sums=('ef9ff562aa7766b0081d37e3ce685843e796c0f8') +sha1sums=('ef9ff562aa7766b0081d37e3ce685843e796c0f8' \ + '0c6723a3af0c19c735014071d59751ca138d28f8' \ + 'd5294900ed3ee713ee0472a8f05fd9286d2a5690') # optimization OK diff --git a/source/base/glib2/glib2-bug476849.patch b/source/base/glib2/glib2-bug476849.patch new file mode 100644 index 0000000..140ada9 --- /dev/null +++ b/source/base/glib2/glib2-bug476849.patch @@ -0,0 +1,11 @@ +--- trunk/glib/ghook.c 2005/11/01 18:10:31 4320 ++++ trunk/glib/ghook.c 2007/09/19 20:36:53 5776 +@@ -130,7 +130,8 @@ + g_return_if_fail (G_HOOK_IS_UNLINKED (hook)); + g_return_if_fail (!G_HOOK_IN_CALL (hook)); + +- hook_list->finalize_hook (hook_list, hook); ++ if(hook_list->finalize_hook != NULL) ++ hook_list->finalize_hook (hook_list, hook); + g_slice_free1 (hook_list->hook_size, hook); + } diff --git a/source/base/glib2/glib2-bug478459.patch b/source/base/glib2/glib2-bug478459.patch new file mode 100644 index 0000000..712c38a --- /dev/null +++ b/source/base/glib2/glib2-bug478459.patch @@ -0,0 +1,17 @@ +--- trunk/gobject/gtypemodule.h 2006/12/29 06:12:11 5179 ++++ trunk/gobject/gtypemodule.h 2007/09/20 10:56:34 5777 +@@ -86,6 +86,7 @@ + static void \ + type_name##_register_type (GTypeModule *type_module) \ + { \ ++ GType g_define_type_id; \ + const GTypeInfo g_define_type_info = { \ + sizeof (TypeName##Class), \ + (GBaseInitFunc) NULL, \ +@@ -103,6 +104,7 @@ + #TypeName, \ + &g_define_type_info, \ + (GTypeFlags) flags); \ ++ g_define_type_id = type_name##_type_id; \ + { CODE ; } \ + } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
