summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Boshell <leonardop@gentoo.org>2005-06-08 16:13:05 +0000
committerLeonardo Boshell <leonardop@gentoo.org>2005-06-08 16:13:05 +0000
commite7a88272898493ea5dcc55af3491865fa7937005 (patch)
tree91ac096ff8d124710a763a9a7faa91642fd88ae8 /gnome-base/gnome-panel
parentStable on sparc (diff)
downloadgentoo-2-e7a88272898493ea5dcc55af3491865fa7937005.tar.gz
gentoo-2-e7a88272898493ea5dcc55af3491865fa7937005.tar.bz2
gentoo-2-e7a88272898493ea5dcc55af3491865fa7937005.zip
Call gtk-update-icon-cache in pkg_postinst(), fixing bug #92289.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'gnome-base/gnome-panel')
-rw-r--r--gnome-base/gnome-panel/ChangeLog8
-rw-r--r--gnome-base/gnome-panel/gnome-panel-2.10.0.ebuild20
2 files changed, 22 insertions, 6 deletions
diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 8f1f37ecfbbd..1b205ddc8545 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for gnome-base/gnome-panel
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.128 2005/06/07 16:30:49 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.129 2005/06/08 16:13:05 leonardop Exp $
+ 08 Jun 2005; Leonardo Boshell <leonardop@gentoo.org>
+ gnome-panel-2.10.0.ebuild:
+ Add post-installation logic to update the icons under
+ /usr/share/icons/hicolor. Resolves bug #92289. Add test to verify that the
+ default gconf settings file exists before using it.
+
07 Jun 2005; Leonardo Boshell <leonardop@gentoo.org>
gnome-panel-1.4.1.ebuild, gnome-panel-1.4.2-r2.ebuild:
Add WANT_AUTOMAKE=1.4 when calling automake to fix compilation issues.
diff --git a/gnome-base/gnome-panel/gnome-panel-2.10.0.ebuild b/gnome-base/gnome-panel/gnome-panel-2.10.0.ebuild
index 96cb107e97ad..c57004817e14 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.10.0.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.10.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.10.0.ebuild,v 1.7 2005/06/05 19:34:55 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.10.0.ebuild,v 1.8 2005/06/08 16:13:05 leonardop Exp $
inherit gnome2 eutils
@@ -56,10 +56,20 @@ pkg_postinst() {
gnome2_pkg_postinst
- einfo "setting panel gconf defaults..."
- GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
- ${ROOT}/usr/bin/gconftool-2 --direct --config-source ${GCONF_CONFIG_SOURCE} --load=/etc/gconf/schemas/panel-default-setup.entries
- rm /etc/gconf/schemas/panel-default-setup.entries
+ local entries="/etc/gconf/schemas/panel-default-setup.entries"
+ if [ -e "$entries" ]; then
+ einfo "setting panel gconf defaults..."
+ GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
+ ${ROOT}/usr/bin/gconftool-2 --direct --config-source \
+ ${GCONF_CONFIG_SOURCE} --load=${entries}
+ rm -f ${entries}
+ fi
+
+ local updater=`which gtk-update-icon-cache`
+ if [ -x "$updater" ]; then
+ einfo "Updating icon cache"
+ $updater -qf ${ROOT}/usr/share/icons/hicolor
+ fi
}