Fri Aug 19 22:05:10 2022 UTC ()
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


(abs)
diff -r1.47 -r1.48 pkgsrc/sysutils/desktop-file-utils/Makefile
diff -r1.5 -r1.6 pkgsrc/sysutils/desktop-file-utils/desktopdb.mk
diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/desktop-file-utils/files/install.tmpl
cvs diff -r1.47 -r1.48 pkgsrc/sysutils/desktop-file-utils/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/desktop-file-utils/Makefile 2022/08/09 12:08:33 1.47
+++ pkgsrc/sysutils/desktop-file-utils/Makefile 2022/08/19 22:05:10 1.48
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.47 2022/08/09 12:08:33 jperkin Exp $ 1# $NetBSD: Makefile,v 1.48 2022/08/19 22:05:10 abs Exp $
2 2
3DISTNAME= desktop-file-utils-0.26 3DISTNAME= desktop-file-utils-0.26
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= sysutils gnome 5CATEGORIES= sysutils gnome
6MASTER_SITES= http://freedesktop.org/software/desktop-file-utils/releases/ 6MASTER_SITES= http://freedesktop.org/software/desktop-file-utils/releases/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.freedesktop.org/wiki/Software/desktop-file-utils 10HOMEPAGE= https://www.freedesktop.org/wiki/Software/desktop-file-utils
11COMMENT= Utilities to manage desktop entries 11COMMENT= Utilities to manage desktop entries
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14# cc1: error: unrecognized command line option "-std=gnu11" 14# cc1: error: unrecognized command line option "-std=gnu11"
15GCC_REQD+= 4.7 15GCC_REQD+= 4.7
16 16
17USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/desktop-file-utils/desktopdb.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/desktop-file-utils/desktopdb.mk 2006/06/15 22:13:59 1.5
+++ pkgsrc/sysutils/desktop-file-utils/desktopdb.mk 2022/08/19 22:05:10 1.6
@@ -1,22 +1,20 @@ @@ -1,22 +1,20 @@
1# $NetBSD: desktopdb.mk,v 1.5 2006/06/15 22:13:59 jlam Exp $ 1# $NetBSD: desktopdb.mk,v 1.6 2022/08/19 22:05:10 abs Exp $
2# 2#
3# This Makefile fragment is intended to be included by packages that install 3# This Makefile fragment is intended to be included by packages that install
4# desktop entries. It takes care of registering them in the global database. 4# desktop entries. It takes care of registering them in the global database
5# 5# if desktop-file-utils is installed. It does not add a dependency.
6 6
7.if !defined(DESKTOP_FILE_UTILS_MIMEDB_MK) 7.if !defined(DESKTOP_FILE_UTILS_MIMEDB_MK)
8DESKTOP_FILE_UTILS_MIMEDB_MK= # defined 8DESKTOP_FILE_UTILS_MIMEDB_MK= # defined
9 9
10.include "../../mk/bsd.prefs.mk" 10.include "../../mk/bsd.prefs.mk"
11 11
12INSTALL_TEMPLATES+= ${.CURDIR}/../../sysutils/desktop-file-utils/files/install.tmpl 12INSTALL_TEMPLATES+= ${.CURDIR}/../../sysutils/desktop-file-utils/files/install.tmpl
13DEINSTALL_TEMPLATES+= ${.CURDIR}/../../sysutils/desktop-file-utils/files/install.tmpl 13DEINSTALL_TEMPLATES+= ${.CURDIR}/../../sysutils/desktop-file-utils/files/install.tmpl
14 14
15FILES_SUBST+= APPLICATIONS_PATH="${BUILDLINK_PREFIX.desktop-file-utils}/share/applications" 15FILES_SUBST+= APPLICATIONS_PATH="${BUILDLINK_PREFIX.desktop-file-utils}/share/applications"
16FILES_SUBST+= UPDATE_DESKTOPDB="${BUILDLINK_PREFIX.desktop-file-utils}/bin/update-desktop-database" 16FILES_SUBST+= UPDATE_DESKTOPDB="${BUILDLINK_PREFIX.desktop-file-utils}/bin/update-desktop-database"
17 17
18PRINT_PLIST_AWK+= /^share\/applications\/mimeinfo.cache$$/ { next } 18PRINT_PLIST_AWK+= /^share\/applications\/mimeinfo.cache$$/ { next }
19 19
20.include "../../sysutils/desktop-file-utils/buildlink3.mk" 
21 
22.endif # DESKTOP_FILE_UTILS_MIMEDB_MK 20.endif # DESKTOP_FILE_UTILS_MIMEDB_MK
cvs diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/desktop-file-utils/files/install.tmpl (expand / switch to unified diff)

--- pkgsrc/sysutils/desktop-file-utils/files/install.tmpl 2004/09/21 17:03:54 1.1.1.1
+++ pkgsrc/sysutils/desktop-file-utils/files/install.tmpl 2022/08/19 22:05:10 1.2
@@ -1,10 +1,13 @@ @@ -1,10 +1,13 @@
1# $NetBSD: install.tmpl,v 1.1.1.1 2004/09/21 17:03:54 jmmv Exp $ 1# $NetBSD: install.tmpl,v 1.2 2022/08/19 22:05:10 abs Exp $
2 2
3APPLICATIONS_PATH="@APPLICATIONS_PATH@" 3APPLICATIONS_PATH="@APPLICATIONS_PATH@"
4UPDATE_DESKTOPDB="@UPDATE_DESKTOPDB@" 4UPDATE_DESKTOPDB="@UPDATE_DESKTOPDB@"
5 5
6case ${STAGE} in 6case ${STAGE} in
7POST-INSTALL|DEINSTALL) 7POST-INSTALL|DEINSTALL)
8 ${UPDATE_DESKTOPDB} ${APPLICATIONS_PATH} 8 # desktop-file-utils may not be installed
 9 if [ -x ${UPDATE_DESKTOPDB} ] ; then
 10 ${UPDATE_DESKTOPDB} ${APPLICATIONS_PATH}
 11 fi
9 ;; 12 ;;
10esac 13esac