diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-09-19 12:07:42 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-09-19 12:07:42 +0800 |
| commit | 4019ef32f9b9b63f729fd25796d53a94d5386bdc (patch) | |
| tree | 1fc767843f1be31b9fbdb9a05c802679e49b582b | |
| parent | 7275342c1242d35d33b246e21c8e43d8e614b040 (diff) | |
| download | marcuscom-ports-4019ef32f9b9b63f729fd25796d53a94d5386bdc.tar marcuscom-ports-4019ef32f9b9b63f729fd25796d53a94d5386bdc.tar.gz marcuscom-ports-4019ef32f9b9b63f729fd25796d53a94d5386bdc.tar.bz2 marcuscom-ports-4019ef32f9b9b63f729fd25796d53a94d5386bdc.tar.lz marcuscom-ports-4019ef32f9b9b63f729fd25796d53a94d5386bdc.tar.xz marcuscom-ports-4019ef32f9b9b63f729fd25796d53a94d5386bdc.tar.zst marcuscom-ports-4019ef32f9b9b63f729fd25796d53a94d5386bdc.zip | |
Always force an update of the icon cache. This may fix problems with
icons mysteriously disappearing.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4849 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | Mk/bsd.gnome.mk | 8 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 4 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/pkg-plist | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index c3eef4a3d..b453f893f 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -3,7 +3,7 @@ # # $FreeBSD$ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.329 2005/09/09 03:20:22 ahze Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.330 2005/09/17 19:47:05 marcus Exp $ # # Please view me with 4 column tabs! @@ -754,11 +754,11 @@ gnome-post-install: @for i in `${GREP} "^share/icons/.*/" ${TMPPLIST} | ${CUT} -d / -f 1-3 | ${SORT} -u`; do \ ${ECHO_CMD} "@unexec /bin/rm %D/$${i}/icon-theme.cache 2>/dev/null || /usr/bin/true" \ >> ${TMPPLIST}.icons1; \ - ${ECHO_CMD} "@exec %%X11BASE%%/bin/gtk-update-icon-cache -q %D/$${i} 2>/dev/null || /usr/bin/true" \ + ${ECHO_CMD} "@exec %%X11BASE%%/bin/gtk-update-icon-cache -q -f %D/$${i} 2>/dev/null || /usr/bin/true" \ >> ${TMPPLIST}; \ - ${ECHO_CMD} "@unexec %%X11BASE%%/bin/gtk-update-icon-cache -q %D/$${i} 2>/dev/null || /usr/bin/true" \ + ${ECHO_CMD} "@unexec %%X11BASE%%/bin/gtk-update-icon-cache -q -f %D/$${i} 2>/dev/null || /usr/bin/true" \ >> ${TMPPLIST}; \ - ${X11BASE}/bin/gtk-update-icon-cache -q ${PREFIX}/$${i} 2>/dev/null || ${TRUE}; \ + ${X11BASE}/bin/gtk-update-icon-cache -q -f ${PREFIX}/$${i} 2>/dev/null || ${TRUE}; \ done @if test -f ${TMPPLIST}.icons1; then \ ${CAT} ${TMPPLIST}.icons1 ${TMPPLIST} > ${TMPPLIST}.icons2; \ diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 7419c4095..f38f94c16 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,7 +3,7 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.73 2005/09/10 14:40:01 jylefort Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.74 2005/09/13 14:22:35 bland Exp $ # PORTNAME= gtk @@ -118,7 +118,7 @@ pre-build: post-install: -@${FIND} ${PREFIX}/share/icons -type d -depth 1 -exec \ - ${PREFIX}/bin/gtk-update-icon-cache -q {} \; 2>/dev/null + ${PREFIX}/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null @${MKDIR} ${PREFIX}/lib/gtk-2.0/modules @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK_VERSION}/engines diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 3203a8557..9eb174052 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -477,7 +477,7 @@ share/locale/zh_TW/LC_MESSAGES/gtk20.mo share/themes/Default/gtk-2.0-key/gtkrc share/themes/Emacs/gtk-2.0-key/gtkrc share/themes/Raleigh/gtk-2.0/gtkrc -@exec /usr/bin/find %D/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q {} \; 2>/dev/null || /usr/bin/true +@exec /usr/bin/find %D/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true @unexec /usr/bin/find %D/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true @dirrm share/themes/Raleigh/gtk-2.0 @dirrm share/themes/Raleigh |