Page MenuHomeFreeBSD
Files F156754859

D31960.id95154.diff
No OneTemporary
Actions

D31960.id95154.diff
View Options

Index: Mk/Uses/gnome.mk
===================================================================
--- Mk/Uses/gnome.mk
+++ Mk/Uses/gnome.mk
@@ -46,12 +46,6 @@
# file and add apropriate @postexec/@postunexec directives for
# each .omf file found to track OMF registration database.
#
-# INSTALLS_ICONS - If a GTK+ port installs Freedesktop-style icons to
-# ${LOCALBASE}/share/icons, then you should use this
-# macro. Using this macro ensures that icons are cached
-# and will display correctly. This macro isn't needed
-# for QT based applications, which use a different method.
-#
# MAINTAINER: gnome@FreeBSD.org
.if !defined(_INCLUDE_USES_GNOME_MK)
@@ -458,24 +452,5 @@
done
.endif
-.if defined(INSTALLS_ICONS)
-_USES_install+= 690:gnome-post-icons
-gnome-post-icons:
- @${RM} ${TMPPLIST}.icons1
- @for i in `${GREP} "^share/icons/.*/" ${TMPPLIST} | ${CUT} -d / -f 1-3 | ${SORT} -u`; do \
- ${ECHO_CMD} "@rmtry $${i}/icon-theme.cache" \
- >> ${TMPPLIST}.icons1; \
- ${ECHO_CMD} "@postexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/$${i} 2>/dev/null || /usr/bin/true" \
- >> ${TMPPLIST}; \
- ${ECHO_CMD} "@postunexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/$${i} 2>/dev/null || /usr/bin/true" \
- >> ${TMPPLIST}; \
- done
- @if test -f ${TMPPLIST}.icons1; then \
- ${CAT} ${TMPPLIST}.icons1 ${TMPPLIST} > ${TMPPLIST}.icons2; \
- ${RM} ${TMPPLIST}.icons1; \
- ${MV} -f ${TMPPLIST}.icons2 ${TMPPLIST}; \
- fi
-.endif
-
.endif
# End of use part.
Index: Mk/Uses/trigger.mk
===================================================================
--- /dev/null
+++ Mk/Uses/trigger.mk
@@ -0,0 +1,29 @@
+# Feature: trigger
+# Usage: USES=trigger
+# Valid ARGS: none
+#
+# Variables:
+# TRIGGERS: list of triggers to package
+#
+# MAINTAINER= portmgr@FreeBSD.org
+
+.if !defined(_INCLUDE_USES_TRIGGER_MK)
+_INCLUDE_USES_TRIGGER_MK= yes
+
+.if !empty(trigger_ARGS)
+IGNORE= Incorrect 'USES+= trigger:${trigger_ARGS}' trigger takes no arguments
+.endif
+
+TRIGGERS?= ${PORTNAME}
+.for t in ${TRIGGERS}
+SUB_FILES+= ${t}.ucl
+PLIST_FILES+= ${LOCALBASE}/share/pkg/triggers/$t.ucl
+.endfor
+
+_USES_install+= 601:trigger-post-install
+trigger-post-install:
+ ${MKDIR} ${STAGEDIR}${LOCALBASE}/share/pkg/triggers
+.for t in ${TRIGGERS}
+ ${INSTALL_DATA} ${WRKDIR}/$t.ucl ${STAGEDIR}${LOCALBASE}/share/pkg/triggers/
+.endfor
+.endif
Index: graphics/gtk-update-icon-cache/Makefile
===================================================================
--- graphics/gtk-update-icon-cache/Makefile
+++ graphics/gtk-update-icon-cache/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gtk-update-icon-cache
PORTVERSION= 3.24.26
+PORTREVISION= 1
CATEGORIES= graphics
DIST_SUBDIR= gnome
@@ -11,7 +12,7 @@
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gettext gnome meson pkgconfig
+USES= gettext gnome meson pkgconfig trigger
USE_GNOME= gdkpixbuf2
USE_GITLAB= yes
GL_SITE= https://gitlab.gnome.org
Index: graphics/gtk-update-icon-cache/files/gtk-update-icon-cache.ucl.in
===================================================================
--- /dev/null
+++ graphics/gtk-update-icon-cache/files/gtk-update-icon-cache.ucl.in
@@ -0,0 +1,18 @@
+path_glob: "*/share/icons/*"
+trigger: {
+ type: lua
+ sandbox: false
+ script: <<EOS
+-- make sure we only get the path one level after share/icons
+-- Ensure each path is uniq
+local hash = {}
+for _,path in ipairs(arg) do
+ path = string.match(path, ".*share/icons/[^/]*")
+ if (not hash[path]) and pkg.stat(path) then
+ print("Generating GTK icon cache for " .. path)
+ pkg.exec({"%%PREFIX%%/bin/gtk-update-icon-cache", "-q", "-t", "-f", path})
+ hash[path] = true
+ end
+end
+EOS
+}

File Metadata

Mime Type
text/plain
Expires
Sun, May 17, 3:15 AM (11 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33170970
Default Alt Text
D31960.id95154.diff (3 KB)

Event Timeline