gtk-update-icon-cache(1) is moving from gtk+2 to gtk+3. This is a requirement

for the upcoming GNOME 3.16 update.

There may be dragons but I need to do this before p2k15!

big thank you to landry@ for running a bulk with the giant diff
and thanks for portbump(1) for giving me back some precious lifetime
This commit is contained in:
ajacoutot 2015-03-27 08:08:50 +00:00
parent 892b7614e4
commit f6b00343fe
4 changed files with 20 additions and 136 deletions

View File

@ -1,15 +1,13 @@
# $OpenBSD: Makefile,v 1.204 2015/03/25 06:27:57 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.205 2015/03/27 08:08:50 ajacoutot Exp $
COMMENT-main= multi-platform graphical toolkit
COMMENT-guic= gtk+ icon theme caching utility
GNOME_VERSION= 2.24.27
GNOME_PROJECT= gtk+
PKGNAME-main= gtk+2-${GNOME_VERSION}
PKGNAME-guic= gtk-update-icon-cache-${GNOME_VERSION}
REVISION-guic= 0
REVISION-main= 0
CATEGORIES= x11 devel
@ -24,48 +22,38 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += ffi gdk_pixbuf-2.0 m pcre png z
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 avahi-client avahi-common c
WANTLIB += cairo cups dbus-1 expat ffi fontconfig freetype gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gmp gnutls gobject-2.0
WANTLIB += graphite2 gthread-2.0 harfbuzz hogweed m nettle p11-kit
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += png pthread pthread-stubs tasn1 xcb xcb-render xcb-shm
WANTLIB += z
MULTI_PACKAGES= -main -guic
MULTI_PACKAGES= -main
MODULES= devel/gettext \
lang/python \
x11/gnome
LIB_DEPENDS= graphics/gdk-pixbuf2
RUN_DEPENDS= x11/hicolor-icon-theme
RUN_DEPENDS-main= ${RUN_DEPENDS} \
${MODPY_RUN_DEPENDS} \
${BASE_PKGPATH},-guic
LIB_DEPENDS-main= ${LIB_DEPENDS} \
LIB_DEPENDS= devel/atk \
devel/pango \
devel/atk \
graphics/gdk-pixbuf2 \
print/cups,-libs
RUN_DEPENDS= x11/hicolor-icon-theme
# convenient dependency to prevent hunting what needs what:
# some apps need more icons than the stock ones
# some apps needs the svg version of the icon (librsvg pulled in)
RUN_DEPENDS-main += x11/gnome/icon-theme-symbolic # pulls x11/gnome/icon-theme
WANTLIB-main += ${WANTLIB}
WANTLIB-main += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB-main += Xrandr Xrender atk-1.0 avahi-client avahi-common c
WANTLIB-main += cairo cups dbus-1 expat fontconfig freetype
WANTLIB-main += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
WANTLIB-main += gthread-2.0 harfbuzz pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB-main += pixman-1 pthread pthread-stubs xcb xcb-render xcb-shm
WANTLIB-main += gmp gnutls hogweed nettle p11-kit tasn1
WANTLIB-guic += ${WANTLIB}
WANTLIB-guic += c gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 pthread
RUN_DEPENDS += x11/gnome/icon-theme-symbolic # pulls x11/gnome/icon-theme
MODPY_BUILDDEP= No
MODPY_RUNDEP= No
MODPY_ADJ_FILES= gtk/gtk-builder-convert
MODGNOME_TOOLS += gobject-introspection
MODGNOME_TOOLS= gobject-introspection gtk-update-icon-cache
MODGNOME_CPPFLAGS= -I${X11BASE}/include/freetype2
@ -82,5 +70,7 @@ post-install:
${PREFIX}/share/gtk-2.0
rm ${PREFIX}/lib/gtk-2.0/2.10.0/{engines,immodules,printbackends}/*.{a,la}
rm ${PREFIX}/lib/gtk-2.0/modules/*.{a,la}
# built as a subpackage of x11/gtk+3
rm ${PREFIX}/bin/gtk-update-icon-cache
.include <bsd.port.mk>

View File

@ -1 +0,0 @@
gtk-update-icon-cache creates mmapable cache files for icon themes.

View File

@ -1,5 +0,0 @@
@comment $OpenBSD: PLIST-guic,v 1.6 2014/04/12 17:09:19 ajacoutot Exp $
@conflict gtk+2-<2.24.8p0
@unexec-delete rm -f %D/share/icons/hicolor/icon-theme.cache
@bin bin/gtk-update-icon-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

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.40 2014/10/02 20:02:20 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.41 2015/03/27 08:08:50 ajacoutot Exp $
@conflict gail-*
@conflict gtk+2-cups-*
@conflict gtk+2-docs-*
@ -386,8 +386,6 @@ share/gtk-2.0/demo/toolpalette.c
share/gtk-2.0/demo/tree_store.c
share/gtk-2.0/demo/ui_manager.c
share/gtk-2.0/gtkrc
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/gail-libgail-util/
share/gtk-doc/html/gail-libgail-util/gail-libgail-util-GailMisc.html
share/gtk-doc/html/gail-libgail-util/gail-libgail-util-GailTextUtil.html
@ -1020,32 +1018,20 @@ share/gtk-doc/html/gtk2/zoom-fit-best.png
share/gtk-doc/html/gtk2/zoom-in.png
share/gtk-doc/html/gtk2/zoom-original.png
share/gtk-doc/html/gtk2/zoom-out.png
share/locale/af/
share/locale/af/LC_MESSAGES/
share/locale/af/LC_MESSAGES/gtk20-properties.mo
share/locale/af/LC_MESSAGES/gtk20.mo
share/locale/am/
share/locale/am/LC_MESSAGES/
share/locale/am/LC_MESSAGES/gtk20-properties.mo
share/locale/am/LC_MESSAGES/gtk20.mo
share/locale/ang/
share/locale/ang/LC_MESSAGES/
share/locale/ang/LC_MESSAGES/gtk20-properties.mo
share/locale/ang/LC_MESSAGES/gtk20.mo
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/gtk20-properties.mo
share/locale/ar/LC_MESSAGES/gtk20.mo
share/locale/as/
share/locale/as/LC_MESSAGES/
share/locale/as/LC_MESSAGES/gtk20-properties.mo
share/locale/as/LC_MESSAGES/gtk20.mo
share/locale/ast/
share/locale/ast/LC_MESSAGES/
share/locale/ast/LC_MESSAGES/gtk20-properties.mo
share/locale/ast/LC_MESSAGES/gtk20.mo
share/locale/az/
share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/gtk20-properties.mo
share/locale/az/LC_MESSAGES/gtk20.mo
share/locale/az_IR/
@ -1054,32 +1040,22 @@ share/locale/az_IR/LC_MESSAGES/gtk20-properties.mo
share/locale/az_IR/LC_MESSAGES/gtk20.mo
share/locale/be/LC_MESSAGES/gtk20-properties.mo
share/locale/be/LC_MESSAGES/gtk20.mo
share/locale/be@latin/
share/locale/be@latin/LC_MESSAGES/
share/locale/be@latin/LC_MESSAGES/gtk20-properties.mo
share/locale/be@latin/LC_MESSAGES/gtk20.mo
share/locale/bg/LC_MESSAGES/gtk20-properties.mo
share/locale/bg/LC_MESSAGES/gtk20.mo
share/locale/bn/
share/locale/bn/LC_MESSAGES/
share/locale/bn/LC_MESSAGES/gtk20-properties.mo
share/locale/bn/LC_MESSAGES/gtk20.mo
share/locale/bn_IN/
share/locale/bn_IN/LC_MESSAGES/
share/locale/bn_IN/LC_MESSAGES/gtk20-properties.mo
share/locale/bn_IN/LC_MESSAGES/gtk20.mo
share/locale/br/
share/locale/br/LC_MESSAGES/
share/locale/br/LC_MESSAGES/gtk20-properties.mo
share/locale/br/LC_MESSAGES/gtk20.mo
share/locale/bs/
share/locale/bs/LC_MESSAGES/
share/locale/bs/LC_MESSAGES/gtk20-properties.mo
share/locale/bs/LC_MESSAGES/gtk20.mo
share/locale/ca/LC_MESSAGES/gtk20-properties.mo
share/locale/ca/LC_MESSAGES/gtk20.mo
share/locale/ca@valencia/
share/locale/ca@valencia/LC_MESSAGES/
share/locale/ca@valencia/LC_MESSAGES/gtk20-properties.mo
share/locale/ca@valencia/LC_MESSAGES/gtk20.mo
share/locale/crh/
@ -1088,26 +1064,18 @@ share/locale/crh/LC_MESSAGES/gtk20-properties.mo
share/locale/crh/LC_MESSAGES/gtk20.mo
share/locale/cs/LC_MESSAGES/gtk20-properties.mo
share/locale/cs/LC_MESSAGES/gtk20.mo
share/locale/cy/
share/locale/cy/LC_MESSAGES/
share/locale/cy/LC_MESSAGES/gtk20-properties.mo
share/locale/cy/LC_MESSAGES/gtk20.mo
share/locale/da/LC_MESSAGES/gtk20-properties.mo
share/locale/da/LC_MESSAGES/gtk20.mo
share/locale/de/LC_MESSAGES/gtk20-properties.mo
share/locale/de/LC_MESSAGES/gtk20.mo
share/locale/dz/
share/locale/dz/LC_MESSAGES/
share/locale/dz/LC_MESSAGES/gtk20-properties.mo
share/locale/dz/LC_MESSAGES/gtk20.mo
share/locale/el/LC_MESSAGES/gtk20-properties.mo
share/locale/el/LC_MESSAGES/gtk20.mo
share/locale/en_CA/
share/locale/en_CA/LC_MESSAGES/
share/locale/en_CA/LC_MESSAGES/gtk20-properties.mo
share/locale/en_CA/LC_MESSAGES/gtk20.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/gtk20-properties.mo
share/locale/en_GB/LC_MESSAGES/gtk20.mo
share/locale/eo/LC_MESSAGES/gtk20-properties.mo
@ -1118,8 +1086,6 @@ share/locale/et/LC_MESSAGES/gtk20-properties.mo
share/locale/et/LC_MESSAGES/gtk20.mo
share/locale/eu/LC_MESSAGES/gtk20-properties.mo
share/locale/eu/LC_MESSAGES/gtk20.mo
share/locale/fa/
share/locale/fa/LC_MESSAGES/
share/locale/fa/LC_MESSAGES/gtk20-properties.mo
share/locale/fa/LC_MESSAGES/gtk20.mo
share/locale/fi/LC_MESSAGES/gtk20-properties.mo
@ -1130,22 +1096,16 @@ share/locale/ga/LC_MESSAGES/gtk20-properties.mo
share/locale/ga/LC_MESSAGES/gtk20.mo
share/locale/gl/LC_MESSAGES/gtk20-properties.mo
share/locale/gl/LC_MESSAGES/gtk20.mo
share/locale/gu/
share/locale/gu/LC_MESSAGES/
share/locale/gu/LC_MESSAGES/gtk20-properties.mo
share/locale/gu/LC_MESSAGES/gtk20.mo
share/locale/he/LC_MESSAGES/gtk20-properties.mo
share/locale/he/LC_MESSAGES/gtk20.mo
share/locale/hi/
share/locale/hi/LC_MESSAGES/
share/locale/hi/LC_MESSAGES/gtk20-properties.mo
share/locale/hi/LC_MESSAGES/gtk20.mo
share/locale/hr/LC_MESSAGES/gtk20-properties.mo
share/locale/hr/LC_MESSAGES/gtk20.mo
share/locale/hu/LC_MESSAGES/gtk20-properties.mo
share/locale/hu/LC_MESSAGES/gtk20.mo
share/locale/hy/
share/locale/hy/LC_MESSAGES/
share/locale/hy/LC_MESSAGES/gtk20-properties.mo
share/locale/hy/LC_MESSAGES/gtk20.mo
share/locale/ia/
@ -1158,68 +1118,44 @@ share/locale/io/
share/locale/io/LC_MESSAGES/
share/locale/io/LC_MESSAGES/gtk20-properties.mo
share/locale/io/LC_MESSAGES/gtk20.mo
share/locale/is/
share/locale/is/LC_MESSAGES/
share/locale/is/LC_MESSAGES/gtk20-properties.mo
share/locale/is/LC_MESSAGES/gtk20.mo
share/locale/it/LC_MESSAGES/gtk20-properties.mo
share/locale/it/LC_MESSAGES/gtk20.mo
share/locale/ja/LC_MESSAGES/gtk20-properties.mo
share/locale/ja/LC_MESSAGES/gtk20.mo
share/locale/ka/
share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/gtk20-properties.mo
share/locale/ka/LC_MESSAGES/gtk20.mo
share/locale/kk/
share/locale/kk/LC_MESSAGES/
share/locale/kk/LC_MESSAGES/gtk20-properties.mo
share/locale/kk/LC_MESSAGES/gtk20.mo
share/locale/kn/
share/locale/kn/LC_MESSAGES/
share/locale/kn/LC_MESSAGES/gtk20-properties.mo
share/locale/kn/LC_MESSAGES/gtk20.mo
share/locale/ko/LC_MESSAGES/gtk20-properties.mo
share/locale/ko/LC_MESSAGES/gtk20.mo
share/locale/ku/
share/locale/ku/LC_MESSAGES/
share/locale/ku/LC_MESSAGES/gtk20-properties.mo
share/locale/ku/LC_MESSAGES/gtk20.mo
share/locale/li/
share/locale/li/LC_MESSAGES/
share/locale/li/LC_MESSAGES/gtk20-properties.mo
share/locale/li/LC_MESSAGES/gtk20.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/gtk20-properties.mo
share/locale/lt/LC_MESSAGES/gtk20.mo
share/locale/lv/LC_MESSAGES/gtk20-properties.mo
share/locale/lv/LC_MESSAGES/gtk20.mo
share/locale/mai/
share/locale/mai/LC_MESSAGES/
share/locale/mai/LC_MESSAGES/gtk20-properties.mo
share/locale/mai/LC_MESSAGES/gtk20.mo
share/locale/mi/
share/locale/mi/LC_MESSAGES/
share/locale/mi/LC_MESSAGES/gtk20-properties.mo
share/locale/mi/LC_MESSAGES/gtk20.mo
share/locale/mk/
share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/gtk20-properties.mo
share/locale/mk/LC_MESSAGES/gtk20.mo
share/locale/ml/
share/locale/ml/LC_MESSAGES/
share/locale/ml/LC_MESSAGES/gtk20-properties.mo
share/locale/ml/LC_MESSAGES/gtk20.mo
share/locale/mn/
share/locale/mn/LC_MESSAGES/
share/locale/mn/LC_MESSAGES/gtk20-properties.mo
share/locale/mn/LC_MESSAGES/gtk20.mo
share/locale/mr/
share/locale/mr/LC_MESSAGES/
share/locale/mr/LC_MESSAGES/gtk20-properties.mo
share/locale/mr/LC_MESSAGES/gtk20.mo
share/locale/ms/
share/locale/ms/LC_MESSAGES/
share/locale/ms/LC_MESSAGES/gtk20-properties.mo
share/locale/ms/LC_MESSAGES/gtk20.mo
share/locale/my/
@ -1228,12 +1164,8 @@ share/locale/my/LC_MESSAGES/gtk20-properties.mo
share/locale/my/LC_MESSAGES/gtk20.mo
share/locale/nb/LC_MESSAGES/gtk20-properties.mo
share/locale/nb/LC_MESSAGES/gtk20.mo
share/locale/nds/
share/locale/nds/LC_MESSAGES/
share/locale/nds/LC_MESSAGES/gtk20-properties.mo
share/locale/nds/LC_MESSAGES/gtk20.mo
share/locale/ne/
share/locale/ne/LC_MESSAGES/
share/locale/ne/LC_MESSAGES/gtk20-properties.mo
share/locale/ne/LC_MESSAGES/gtk20.mo
share/locale/nl/LC_MESSAGES/gtk20-properties.mo
@ -1244,20 +1176,14 @@ share/locale/nso/
share/locale/nso/LC_MESSAGES/
share/locale/nso/LC_MESSAGES/gtk20-properties.mo
share/locale/nso/LC_MESSAGES/gtk20.mo
share/locale/oc/
share/locale/oc/LC_MESSAGES/
share/locale/oc/LC_MESSAGES/gtk20-properties.mo
share/locale/oc/LC_MESSAGES/gtk20.mo
share/locale/or/
share/locale/or/LC_MESSAGES/
share/locale/or/LC_MESSAGES/gtk20-properties.mo
share/locale/or/LC_MESSAGES/gtk20.mo
share/locale/pa/LC_MESSAGES/gtk20-properties.mo
share/locale/pa/LC_MESSAGES/gtk20.mo
share/locale/pl/LC_MESSAGES/gtk20-properties.mo
share/locale/pl/LC_MESSAGES/gtk20.mo
share/locale/ps/
share/locale/ps/LC_MESSAGES/
share/locale/ps/LC_MESSAGES/gtk20-properties.mo
share/locale/ps/LC_MESSAGES/gtk20.mo
share/locale/pt/LC_MESSAGES/gtk20-properties.mo
@ -1268,44 +1194,28 @@ share/locale/ro/LC_MESSAGES/gtk20-properties.mo
share/locale/ro/LC_MESSAGES/gtk20.mo
share/locale/ru/LC_MESSAGES/gtk20-properties.mo
share/locale/ru/LC_MESSAGES/gtk20.mo
share/locale/rw/
share/locale/rw/LC_MESSAGES/
share/locale/rw/LC_MESSAGES/gtk20-properties.mo
share/locale/rw/LC_MESSAGES/gtk20.mo
share/locale/si/
share/locale/si/LC_MESSAGES/
share/locale/si/LC_MESSAGES/gtk20-properties.mo
share/locale/si/LC_MESSAGES/gtk20.mo
share/locale/sk/LC_MESSAGES/gtk20-properties.mo
share/locale/sk/LC_MESSAGES/gtk20.mo
share/locale/sl/LC_MESSAGES/gtk20-properties.mo
share/locale/sl/LC_MESSAGES/gtk20.mo
share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/gtk20-properties.mo
share/locale/sq/LC_MESSAGES/gtk20.mo
share/locale/sr/LC_MESSAGES/gtk20-properties.mo
share/locale/sr/LC_MESSAGES/gtk20.mo
share/locale/sr@ije/
share/locale/sr@ije/LC_MESSAGES/
share/locale/sr@ije/LC_MESSAGES/gtk20-properties.mo
share/locale/sr@ije/LC_MESSAGES/gtk20.mo
share/locale/sr@latin/
share/locale/sr@latin/LC_MESSAGES/
share/locale/sr@latin/LC_MESSAGES/gtk20-properties.mo
share/locale/sr@latin/LC_MESSAGES/gtk20.mo
share/locale/sv/LC_MESSAGES/gtk20-properties.mo
share/locale/sv/LC_MESSAGES/gtk20.mo
share/locale/ta/
share/locale/ta/LC_MESSAGES/
share/locale/ta/LC_MESSAGES/gtk20-properties.mo
share/locale/ta/LC_MESSAGES/gtk20.mo
share/locale/te/
share/locale/te/LC_MESSAGES/
share/locale/te/LC_MESSAGES/gtk20-properties.mo
share/locale/te/LC_MESSAGES/gtk20.mo
share/locale/th/
share/locale/th/LC_MESSAGES/
share/locale/th/LC_MESSAGES/gtk20-properties.mo
share/locale/th/LC_MESSAGES/gtk20.mo
share/locale/tk/
@ -1314,12 +1224,8 @@ share/locale/tk/LC_MESSAGES/gtk20-properties.mo
share/locale/tk/LC_MESSAGES/gtk20.mo
share/locale/tr/LC_MESSAGES/gtk20-properties.mo
share/locale/tr/LC_MESSAGES/gtk20.mo
share/locale/tt/
share/locale/tt/LC_MESSAGES/
share/locale/tt/LC_MESSAGES/gtk20-properties.mo
share/locale/tt/LC_MESSAGES/gtk20.mo
share/locale/ug/
share/locale/ug/LC_MESSAGES/
share/locale/ug/LC_MESSAGES/gtk20-properties.mo
share/locale/ug/LC_MESSAGES/gtk20.mo
share/locale/uk/LC_MESSAGES/gtk20-properties.mo
@ -1338,16 +1244,10 @@ share/locale/uz@cyrillic/LC_MESSAGES/gtk20-properties.mo
share/locale/uz@cyrillic/LC_MESSAGES/gtk20.mo
share/locale/vi/LC_MESSAGES/gtk20-properties.mo
share/locale/vi/LC_MESSAGES/gtk20.mo
share/locale/wa/
share/locale/wa/LC_MESSAGES/
share/locale/wa/LC_MESSAGES/gtk20-properties.mo
share/locale/wa/LC_MESSAGES/gtk20.mo
share/locale/xh/
share/locale/xh/LC_MESSAGES/
share/locale/xh/LC_MESSAGES/gtk20-properties.mo
share/locale/xh/LC_MESSAGES/gtk20.mo
share/locale/yi/
share/locale/yi/LC_MESSAGES/
share/locale/yi/LC_MESSAGES/gtk20-properties.mo
share/locale/yi/LC_MESSAGES/gtk20.mo
share/locale/zh_CN/LC_MESSAGES/gtk20-properties.mo