diff mbox series

[scarthgap] vim: add PACKAGECONFIG option for desktop files

Message ID 20260724061324.1541029-1-shinucha@cisco.com
State New
Headers show
Series [scarthgap] vim: add PACKAGECONFIG option for desktop files | expand

Commit Message

Shinu Chandran July 24, 2026, 6:13 a.m. UTC 
The recipe currently always inherits mime-xdg and keeps the installed desktop
files. Add a desktop PACKAGECONFIG option so configurations can disable that
desktop integration while preserving the current default behavior.

When desktop support is disabled, remove the generated desktop files during
do_install and avoid inheriting mime-xdg.

Signed-off-by: Shinu Chandran <shinucha@cisco.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 942813bf3f249f80f3154ba8137d172c406bf319)
---
 meta/recipes-support/vim/vim.inc | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc
index d69a337b4e..f97062aede 100644
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -50,7 +50,7 @@  S = "${WORKDIR}/git"
 
 VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}"
 
-inherit autotools-brokensep update-alternatives mime-xdg pkgconfig
+inherit autotools-brokensep update-alternatives pkgconfig
 
 CLEANBROKEN = "1"
 
@@ -76,9 +76,11 @@  do_configure () {
 PACKAGECONFIG ??= "\
     ${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} \
+    desktop \
     nls \
 "
 
+PACKAGECONFIG[desktop] = ""
 PACKAGECONFIG[gtkgui] = "--enable-gui=gtk3,--enable-gui=no,gtk+3"
 PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
 PACKAGECONFIG[x11] = "--with-x,--without-x,xt,"
@@ -88,6 +90,8 @@  PACKAGECONFIG[elfutils] = "--enable-elf-check,,elfutils,"
 PACKAGECONFIG[nls] = "--enable-nls,--disable-nls,,"
 PACKAGECONFIG[sound] = "--enable-canberra,--disable-canberra,canberra,"
 
+inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'desktop', 'mime-xdg', '', d)}
+
 EXTRA_OECONF = " \
     --disable-gpm \
     --disable-gtktest \
@@ -134,6 +138,11 @@  do_install() {
 	# delete the block.
 	sed -i '/the mouse works just fine/,+4d' ${D}/${datadir}/${BPN}/vimrc
     fi
+
+    if ${@bb.utils.contains('PACKAGECONFIG', 'desktop', 'false', 'true', d)}; then
+        rm -f ${D}${datadir}/applications/vim.desktop
+        rm -f ${D}${datadir}/applications/gvim.desktop
+    fi
 }
 
 PARALLEL_MAKEINST = ""