diff options
| author | abs <abs@pkgsrc.org> | 2022-08-19 22:05:10 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2022-08-19 22:05:10 +0000 |
| commit | 0ed150e0b96d542069190e829fb1a08ff4790708 (patch) | |
| tree | 8329133af7ae9093d5456bbc59d4320fd4cf3a04 | |
| parent | 6ae6294b137261116a97ad5e954cd303da36bc01 (diff) | |
| download | pkgsrc-0ed150e0b96d542069190e829fb1a08ff4790708.tar.gz | |
Switch desktopdb.mk to not depend on desktop-file-utils
Consumers of desktop entries still register a full dependency
on desktop-file-utils, but apps that install a .desktop file
in share/applications do not. They still have a POST-INSTALL
step to call UPDATE_DESKTOPDB, but only if it is already
installed.
Should be not functional difference for any system with a
consumer of desktop entries installed, but for an app
with a .desktop entry the build of python, meson & glib2
may be deferred. Helpful for small apps and lower power
systems
| -rw-r--r-- | sysutils/desktop-file-utils/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/desktop-file-utils/desktopdb.mk | 8 | ||||
| -rw-r--r-- | sysutils/desktop-file-utils/files/install.tmpl | 7 |
3 files changed, 10 insertions, 9 deletions
diff --git a/sysutils/desktop-file-utils/Makefile b/sysutils/desktop-file-utils/Makefile index 436ac46c1f5..efc47d46397 100644 --- a/sysutils/desktop-file-utils/Makefile +++ b/sysutils/desktop-file-utils/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.47 2022/08/09 12:08:33 jperkin Exp $ +# $NetBSD: Makefile,v 1.48 2022/08/19 22:05:10 abs Exp $ DISTNAME= desktop-file-utils-0.26 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils gnome MASTER_SITES= http://freedesktop.org/software/desktop-file-utils/releases/ EXTRACT_SUFX= .tar.xz diff --git a/sysutils/desktop-file-utils/desktopdb.mk b/sysutils/desktop-file-utils/desktopdb.mk index 603a8b72c1f..04baac473ca 100644 --- a/sysutils/desktop-file-utils/desktopdb.mk +++ b/sysutils/desktop-file-utils/desktopdb.mk @@ -1,8 +1,8 @@ -# $NetBSD: desktopdb.mk,v 1.5 2006/06/15 22:13:59 jlam Exp $ +# $NetBSD: desktopdb.mk,v 1.6 2022/08/19 22:05:10 abs Exp $ # # This Makefile fragment is intended to be included by packages that install -# desktop entries. It takes care of registering them in the global database. -# +# desktop entries. It takes care of registering them in the global database +# if desktop-file-utils is installed. It does not add a dependency. .if !defined(DESKTOP_FILE_UTILS_MIMEDB_MK) DESKTOP_FILE_UTILS_MIMEDB_MK= # defined @@ -17,6 +17,4 @@ FILES_SUBST+= UPDATE_DESKTOPDB="${BUILDLINK_PREFIX.desktop-file-utils}/bin/upda PRINT_PLIST_AWK+= /^share\/applications\/mimeinfo.cache$$/ { next } -.include "../../sysutils/desktop-file-utils/buildlink3.mk" - .endif # DESKTOP_FILE_UTILS_MIMEDB_MK diff --git a/sysutils/desktop-file-utils/files/install.tmpl b/sysutils/desktop-file-utils/files/install.tmpl index 9082e780580..9d1e7c394a0 100644 --- a/sysutils/desktop-file-utils/files/install.tmpl +++ b/sysutils/desktop-file-utils/files/install.tmpl @@ -1,10 +1,13 @@ -# $NetBSD: install.tmpl,v 1.1.1.1 2004/09/21 17:03:54 jmmv Exp $ +# $NetBSD: install.tmpl,v 1.2 2022/08/19 22:05:10 abs Exp $ APPLICATIONS_PATH="@APPLICATIONS_PATH@" UPDATE_DESKTOPDB="@UPDATE_DESKTOPDB@" case ${STAGE} in POST-INSTALL|DEINSTALL) - ${UPDATE_DESKTOPDB} ${APPLICATIONS_PATH} + # desktop-file-utils may not be installed + if [ -x ${UPDATE_DESKTOPDB} ] ; then + ${UPDATE_DESKTOPDB} ${APPLICATIONS_PATH} + fi ;; esac |