diff options
| author |   Marinus Schraal <foser@gentoo.org> | 2006-04-13 16:32:41 +0000 |
|---|---|---|
| committer | Marinus Schraal <foser@gentoo.org> | 2006-04-13 16:32:41 +0000 |
| commit | 3a17e95d94ee2ed29dc3b1d596e32a62c67d3b66 (patch) | |
| tree | c6519af6df56462c39cbcf359c93de24a98991ac /gnome-base | |
| parent | fix DEPEND so that we can use mips-headers with USE=nptl (diff) | |
| download | gentoo-2-3a17e95d94ee2ed29dc3b1d596e32a62c67d3b66.tar.gz gentoo-2-3a17e95d94ee2ed29dc3b1d596e32a62c67d3b66.tar.bz2 gentoo-2-3a17e95d94ee2ed29dc3b1d596e32a62c67d3b66.zip | |
fix cpufreq startup preferences glitch
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'gnome-base')
4 files changed, 47 insertions, 3 deletions
diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog index 55e30e5d02a0..a17cd2835443 100644 --- a/gnome-base/gnome-applets/ChangeLog +++ b/gnome-base/gnome-applets/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/gnome-applets # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.165 2006/04/12 22:39:37 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.166 2006/04/13 16:32:41 foser Exp $ + + 13 Apr 2006; Marinus Schraal <foser@gentoo.org> + gnome-applets-2.14.{0,1}.ebuild, files/gnome-applets-2.14.0-prefs_startup-r1.patch : + Fix issue with cpufreq settings not being applied on startup (#129739) *gnome-applets-2.14.1 (12 Apr 2006) diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.14.0-prefs_startup-r1.patch b/gnome-base/gnome-applets/files/gnome-applets-2.14.0-prefs_startup-r1.patch new file mode 100644 index 000000000000..b6197fcc413e --- /dev/null +++ b/gnome-base/gnome-applets/files/gnome-applets-2.14.0-prefs_startup-r1.patch @@ -0,0 +1,18 @@ +--- cpufreq-applet.c~ 2005-12-12 12:43:27.000000000 +0100 ++++ cpufreq-applet.c 2006-04-13 17:56:41.000000000 +0200 +@@ -525,10 +525,11 @@ + gtk_widget_destroy (applet->label); + + applet->label = gtk_label_new (" --- "); +- if (freq) { +- gtk_label_set_text (GTK_LABEL (applet->label), freq); +- g_free (freq); +- } ++ if (applet->show_text_mode == MODE_TEXT_PERCENTAGE) ++ if (perc) gtk_label_set_text (GTK_LABEL (applet->label), perc); ++ else ++ if (freq) gtk_label_set_text (GTK_LABEL (applet->label), freq); ++ if (freq) g_free (freq); + + gtk_widget_size_request (applet->label, &req); + if (applet->show_mode != MODE_GRAPHIC) diff --git a/gnome-base/gnome-applets/gnome-applets-2.14.0.ebuild b/gnome-base/gnome-applets/gnome-applets-2.14.0.ebuild index dcc1b586592c..99593da10086 100644 --- a/gnome-base/gnome-applets/gnome-applets-2.14.0.ebuild +++ b/gnome-base/gnome-applets/gnome-applets-2.14.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.14.0.ebuild,v 1.3 2006/03/26 00:40:26 allanonjl Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.14.0.ebuild,v 1.4 2006/04/13 16:32:41 foser Exp $ inherit eutils gnome2 @@ -49,6 +49,7 @@ DOCS="AUTHORS ChangeLog NEWS README" MAKEOPTS="${MAKEOPTS} -j1" pkg_setup() { + G2CONF="--disable-scrollkeeper \ --enable-flags \ $(use_enable ipv6) @@ -64,6 +65,7 @@ pkg_setup() { } src_install() { + gnome2_src_install for applet in \ @@ -79,3 +81,12 @@ src_install() { done } + +src_unpack() { + + unpack ${A} + + cd ${S}/cpufreq/src + epatch ${FILESDIR}/${P}-prefs_startup-r1.patch + +} diff --git a/gnome-base/gnome-applets/gnome-applets-2.14.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.14.1.ebuild index 6c44e66d8c19..362f810b11b6 100644 --- a/gnome-base/gnome-applets/gnome-applets-2.14.1.ebuild +++ b/gnome-base/gnome-applets/gnome-applets-2.14.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.14.1.ebuild,v 1.1 2006/04/12 22:39:37 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.14.1.ebuild,v 1.2 2006/04/13 16:32:41 foser Exp $ inherit eutils gnome2 @@ -49,6 +49,7 @@ DOCS="AUTHORS ChangeLog NEWS README" MAKEOPTS="${MAKEOPTS} -j1" pkg_setup() { + G2CONF="--disable-scrollkeeper \ --enable-flags \ $(use_enable ipv6) @@ -64,6 +65,7 @@ pkg_setup() { } src_install() { + gnome2_src_install for applet in \ @@ -79,3 +81,12 @@ src_install() { done } + +src_unpack() { + + unpack ${A} + + cd ${S}/cpufreq/src + epatch ${FILESDIR}/${PN}-2.14.0-prefs_startup-r1.patch + +} |