Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a674fb6b148756e074bcc8249a1d3b088ff0ebae

commit a674fb6b148756e074bcc8249a1d3b088ff0ebae
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Tue Jun 2 20:04:57 2009 +0200

gnome-control-center-2.26.0-2-i686
*fixed crash with gnome-mouse-properties

diff --git a/source/gnome/gnome-control-center/FrugalBuild 
b/source/gnome/gnome-control-center/FrugalBuild
index 75bb1a9..99b9e89 100644
--- a/source/gnome/gnome-control-center/FrugalBuild
+++ b/source/gnome/gnome-control-center/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=gnome-control-center
pkgver=2.26.0
-pkgrel=1
+pkgrel=2
pkgdesc="GNOME Control Center"
depends=('gnome-desktop>=2.26.0' 'gnome-menus>=2.26.0' 'metacity>=2.26.0' 
'libgnomekbd>=2.26.0' \
'nautilus>=2.26.0' 'gst-plugins-base>=0.10.19-2' 'desktop-file-utils' \
@@ -23,11 +23,14 @@ _F_gnome_iconcache="y"
options=('scriptlet')
Finclude gnome gnome-scriptlet
Fconfopts="$Fconfopts --enable-gstreamer --disable-schemas-install 
--enable-aboutme"
-sha1sums=('4730780aaab599869a2dfe2d72d68dd54bb77058')
+source=($source fix_unrefgconf.patch)
+sha1sums=('4730780aaab599869a2dfe2d72d68dd54bb77058' \
+          '999e101a8225528447d1dd1feb2a5bed48b7b3ba')

build() {
export CFLAGS="$CFLAGS -fno-strict-aliasing"
Fcd
+       Fpatchall
NOCONFIGURE=y gnome-autogen.sh || Fdie
Fbuild_slice_scrollkeeper
Fmake
diff --git a/source/gnome/gnome-control-center/fix_unrefgconf.patch 
b/source/gnome/gnome-control-center/fix_unrefgconf.patch
new file mode 100644
index 0000000..acdc491
--- /dev/null
+++ b/source/gnome/gnome-control-center/fix_unrefgconf.patch
@@ -0,0 +1,24 @@
+From 45f198113a1807faf094e3529b03da7622acc3ed Mon Sep 17 00:00:00 2001
+From: Jens Granseuer <jen...@gmx.net>
+Date: Wed, 20 May 2009 21:20:04 +0000
+Subject: [common] don't unref NULL GConf entries
+
+ 2009-05-03  Jens Granseuer  <jen...@gmx.net>
+
+       Patch by: <yselkow...@users.sourceforge.net>
+diff --git a/capplets/common/gconf-property-editor.c 
b/capplets/common/gconf-property-editor.c
+index 518fd9f..31f9e0e 100644
+--- a/capplets/common/gconf-property-editor.c
++++ b/capplets/common/gconf-property-editor.c
+@@ -351,7 +351,8 @@ gconf_peditor_new (const gchar           *key,
+       gconf_entry = gconf_client_get_entry (client, GCONF_PROPERTY_EDITOR 
(obj)->p->key, NULL, TRUE, NULL);
+       GCONF_PROPERTY_EDITOR (obj)->p->callback (client, 0, gconf_entry, obj);
+       GCONF_PROPERTY_EDITOR (obj)->p->inited = TRUE;
+-      gconf_entry_free (gconf_entry);
++      if (gconf_entry)
++              gconf_entry_free (gconf_entry);
+       g_object_unref (client);
+
+       return obj;
+--
+cgit v0.8.2
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to