From 230c7faa41978c8c6973f4eb124fffd4a4a67a24 Mon Sep 17 00:00:00 2001 From: zhuk Date: Sun, 9 Feb 2014 14:36:10 +0000 Subject: [PATCH] After more discussion with ajacoutot@, force removing of erroneous icon-theme.cache file on package install. To be removed from PLIST-guic after release. --- x11/gtk+2/Makefile | 5 +++-- x11/gtk+2/pkg/PLIST-guic | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/x11/gtk+2/Makefile b/x11/gtk+2/Makefile index 4e10ef75da0..b6204f23899 100644 --- a/x11/gtk+2/Makefile +++ b/x11/gtk+2/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.180 2014/02/09 14:24:08 zhuk Exp $ +# $OpenBSD: Makefile,v 1.181 2014/02/09 14:36:10 zhuk Exp $ # XXX remove '@exec ... gtk-2.0/gtk.immodules' after OPENBSD_5_5 is branched +# XXX remove '@exec rm -f %D/share/icons/icon-theme.cache' after OPENBSD_5_5 is branched COMMENT-main= multi-platform graphical toolkit COMMENT-guic= gtk+ icon theme caching utility @@ -12,7 +13,7 @@ PKGNAME-main= gtk+2-${GNOME_VERSION} PKGNAME-guic= gtk-update-icon-cache-${GNOME_VERSION} REVISION-main= 0 -REVISION-guic= 0 +REVISION-guic= 1 CATEGORIES= x11 devel diff --git a/x11/gtk+2/pkg/PLIST-guic b/x11/gtk+2/pkg/PLIST-guic index d2a631e3e77..cf90658ac46 100644 --- a/x11/gtk+2/pkg/PLIST-guic +++ b/x11/gtk+2/pkg/PLIST-guic @@ -1,5 +1,6 @@ -@comment $OpenBSD: PLIST-guic,v 1.3 2014/02/09 14:24:08 zhuk Exp $ +@comment $OpenBSD: PLIST-guic,v 1.4 2014/02/09 14:36:10 zhuk Exp $ @conflict gtk+2-<2.24.8p0 @unexec rm -f %D/share/icons/hicolor/icon-theme.cache @bin bin/gtk-update-icon-cache +@exec /bin/rm -f %D/share/icons/icon-theme.cache @exec /usr/bin/find %D/share/icons -type d -mindepth 1 -maxdepth 1 -exec %D/bin/gtk-update-icon-cache -q -t -f {} \; 2>/dev/null || true