Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d46bdba6d90602d6bba8eadb6f935f9d474104c5
commit d46bdba6d90602d6bba8eadb6f935f9d474104c5 Author: crazy <[EMAIL PROTECTED]> Date: Tue Oct 16 17:52:14 2007 +0200 glib2-2.14.2-1-i686 * Version bump * removed some patches are upstream now diff --git a/source/base/glib2/FrugalBuild b/source/base/glib2/FrugalBuild index 381e4ce..a28a7bf 100644 --- a/source/base/glib2/FrugalBuild +++ b/source/base/glib2/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix <[EMAIL PROTECTED]> pkgname=glib2 -pkgver=2.14.1 -pkgrel=5 +pkgver=2.14.2 +pkgrel=1 pkgdesc="Common C routines used by GTK+2 and other libraries" url="http://www.gtk.org/"; depends=('glibc') @@ -15,15 +15,11 @@ _F_gnome_name="glib" _F_gnome_devel="n" Finclude gnome 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 .. -sha1sums=('ef9ff562aa7766b0081d37e3ce685843e796c0f8' \ - '0c6723a3af0c19c735014071d59751ca138d28f8' \ - 'd5294900ed3ee713ee0472a8f05fd9286d2a5690' \ +sha1sums=('0711f1e8abf6a052aa298bcb1350bcf2195da6e4' \ '8aa98ec8c7a8aad90d27e6c81a7fee1c686914fe' \ 'a78a870e933a317148e11bffdf5d19c8fe4ac2bd') # Don't touch that diff --git a/source/base/glib2/glib2-bug476849.patch b/source/base/glib2/glib2-bug476849.patch deleted file mode 100644 index 140ada9..0000000 --- a/source/base/glib2/glib2-bug476849.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 712c38a..0000000 --- a/source/base/glib2/glib2-bug478459.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- 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
