From 56ba561d654a0c422b0bad06116a3431e7526bb8 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Wed, 4 Nov 2009 13:14:24 +0000 Subject: Fix bug #288552, /viewer-type key did not exist key, it caused gconf_client to returned a NULL GConfEntry which was stored in a Gnome::GConf::Entry object as gobject_ field, then Gnome::GConf::Entry::set_value() segfaulted (gobj() == NULL) (Portage version: 2.2_rc48/cvs/Linux x86_64) --- gnome-extra/hardware-monitor/ChangeLog | 12 +++++- ...ware-monitor-1.4.2-create-viewer-type-key.patch | 19 +++++++++ .../hardware-monitor-1.4.2-r1.ebuild | 45 ++++++++++++++++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 gnome-extra/hardware-monitor/files/hardware-monitor-1.4.2-create-viewer-type-key.patch create mode 100644 gnome-extra/hardware-monitor/hardware-monitor-1.4.2-r1.ebuild (limited to 'gnome-extra/hardware-monitor') diff --git a/gnome-extra/hardware-monitor/ChangeLog b/gnome-extra/hardware-monitor/ChangeLog index e2146c2a69d0..6265ac01f62e 100644 --- a/gnome-extra/hardware-monitor/ChangeLog +++ b/gnome-extra/hardware-monitor/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for gnome-extra/hardware-monitor # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/ChangeLog,v 1.26 2009/07/21 20:17:09 mrpouet Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/ChangeLog,v 1.27 2009/11/04 13:14:23 mrpouet Exp $ + +*hardware-monitor-1.4.2-r1 (04 Nov 2009) + + 04 Nov 2009; Romain Perier + +hardware-monitor-1.4.2-r1.ebuild, + +files/hardware-monitor-1.4.2-create-viewer-type-key.patch: + Fix bug #288552, /viewer-type key did not exist key, it caused + gconf_client to returned a NULL GConfEntry which was stored in a + Gnome::GConf::Entry object as gobject_ field, then + Gnome::GConf::Entry::set_value() segfaulted (gobj() == NULL). 22 Jul 2009; Romain Perier hardware-monitor-1.4.2.ebuild: Changed sys-apps/lm_sensors to >=sys-apps/lm_sensors-3 into RDEPEND diff --git a/gnome-extra/hardware-monitor/files/hardware-monitor-1.4.2-create-viewer-type-key.patch b/gnome-extra/hardware-monitor/files/hardware-monitor-1.4.2-create-viewer-type-key.patch new file mode 100644 index 000000000000..101f8f3e55d1 --- /dev/null +++ b/gnome-extra/hardware-monitor/files/hardware-monitor-1.4.2-create-viewer-type-key.patch @@ -0,0 +1,19 @@ +From: Romain Perier +Date: Wed, 4 Nov 2009 13:01:01 +0100 +Subject: Set and create /viewer_type key to avoid to have a NULL GConfEntry stored in a Gnome::Gconf::Entry object retourned by gconf_client->get_entry(), when this key does not exist yet. + +--- + src/applet.cpp | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +--- a/src/applet.cpp ++++ b/src/applet.cpp +@@ -81,6 +81,7 @@ Applet::Applet(PanelApplet *a) + // circumvent GConf bug (FIXME: report it) + gconf_client->set(gconf_dir + "/dummy", 0); + gconf_client->set(gconf_dir + "/monitors/dummy", 0); ++ gconf_client->set(gconf_dir + "/viewer_type", "curve"); + + // connect GConf + gconf_client->notify_add(gconf_dir + "/viewer_type", + diff --git a/gnome-extra/hardware-monitor/hardware-monitor-1.4.2-r1.ebuild b/gnome-extra/hardware-monitor/hardware-monitor-1.4.2-r1.ebuild new file mode 100644 index 000000000000..9aa0e55af0da --- /dev/null +++ b/gnome-extra/hardware-monitor/hardware-monitor-1.4.2-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/hardware-monitor-1.4.2-r1.ebuild,v 1.1 2009/11/04 13:14:23 mrpouet Exp $ + +GCONF_DEBUG="no" + +inherit gnome2 eutils + +DESCRIPTION="Gnome2 Hardware Monitor Applet" +HOMEPAGE="http://people.iola.dk/olau/hardware-monitor/" +SRC_URI="http://people.iola.dk/olau/hardware-monitor/source/${P}.tar.bz2" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="lm_sensors" + +RDEPEND=">=dev-cpp/gconfmm-2.6.0 + >=dev-cpp/gtkmm-2.6.0 + >=dev-cpp/libgnomecanvasmm-2.6.0 + >=dev-cpp/libglademm-2.6.0 + >=gnome-base/gnome-panel-2 + >=gnome-base/libgnomeui-2.20.1 + >=gnome-base/libgtop-2.6.0 + lm_sensors? ( >=sys-apps/lm_sensors-3 )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=dev-util/intltool-0.29" + +DOCS="AUTHORS ChangeLog NEWS" + +pkg_setup() { + G2CONF="${G2CONF} \ + $(use_with lm_sensors libsensors)" + +} + +src_unpack() { + gnome2_src_unpack + + # Set and create "/viewer-type" key which does not exist yet + # when the applet is loaded, in order to avoid a segfault, + # bug 288552. + epatch "${FILESDIR}/${P}-create-viewer-type-key.patch" +} -- cgit v1.2.3-65-gdbad