From 34e1b934c9732a930d42f6e9df9f0a28997d202f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Lo=C3=AFc=20Corbasson?= <loic.devel@corbasson.fr>
Date: Tue, 31 Oct 2023 15:08:34 +0100
Subject: [PATCH] Add an XDG menu directory (#1149)

Add XDG directory and menu files

to have a Waydroid menu directory with all Waydroid apps,
and avoid having them in a 'Lost & Found' menu directory

---------

Co-authored-by: Taha <62564400+inspectorgadget03@users.noreply.github.com>
---
 Makefile                |  6 ++++++
 data/waydroid.directory |  4 ++++
 data/waydroid.menu      | 12 ++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 data/waydroid.directory
 create mode 100644 data/waydroid.menu

diff --git a/Makefile b/Makefile
index cc62595..9e7af76 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,8 @@ USE_NFTABLES ?= 0
 WAYDROID_DIR := $(PREFIX)/lib/waydroid
 BIN_DIR := $(PREFIX)/bin
 APPS_DIR := $(PREFIX)/share/applications
+APPS_DIRECTORY_DIR := $(PREFIX)/share/desktop-directories
+APPS_MENU_DIR := /etc/xdg/menus/applications-merged
 METAINFO_DIR := $(PREFIX)/share/metainfo
 ICONS_DIR := $(PREFIX)/share/icons
 SYSD_DIR := $(PREFIX)/lib/systemd/system
@@ -17,6 +19,8 @@ APPARMOR_DIR := /etc/apparmor.d
 INSTALL_WAYDROID_DIR := $(DESTDIR)$(WAYDROID_DIR)
 INSTALL_BIN_DIR := $(DESTDIR)$(BIN_DIR)
 INSTALL_APPS_DIR := $(DESTDIR)$(APPS_DIR)
+INSTALL_APPS_DIRECTORY_DIR := $(DESTDIR)$(APPS_DIRECTORY_DIR)
+INSTALL_APPS_MENU_DIR := $(DESTDIR)$(APPS_MENU_DIR)
 INSTALL_METAINFO_DIR := $(DESTDIR)$(METAINFO_DIR)
 INSTALL_ICONS_DIR := $(DESTDIR)$(ICONS_DIR)
 INSTALL_SYSD_DIR := $(DESTDIR)$(SYSD_DIR)
@@ -34,6 +38,8 @@ install:
 	ln -sf $(WAYDROID_DIR)/waydroid.py $(INSTALL_BIN_DIR)/waydroid
 	mv $(INSTALL_WAYDROID_DIR)/data/AppIcon.png $(INSTALL_ICONS_DIR)/hicolor/512x512/apps/waydroid.png
 	mv $(INSTALL_WAYDROID_DIR)/data/*.desktop $(INSTALL_APPS_DIR)
+	mv $(INSTALL_WAYDROID_DIR)/data/*.menu $(INSTALL_APPS_MENU_DIR)
+	mv $(INSTALL_WAYDROID_DIR)/data/*.directory $(INSTALL_APPS_DIRECTORY_DIR)
 	mv $(INSTALL_WAYDROID_DIR)/data/*.metainfo.xml $(INSTALL_METAINFO_DIR)
 	cp dbus/id.waydro.Container.conf $(INSTALL_DBUS_DIR)/system.d/
 	cp dbus/id.waydro.Container.policy $(INSTALL_POLKIT_DIR)/actions/
diff --git a/data/waydroid.directory b/data/waydroid.directory
new file mode 100644
index 0000000..3f3a2d6
--- /dev/null
+++ b/data/waydroid.directory
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Name=Waydroid
+Icon=waydroid
+Type=Directory
diff --git a/data/waydroid.menu b/data/waydroid.menu
new file mode 100644
index 0000000..55f7f36
--- /dev/null
+++ b/data/waydroid.menu
@@ -0,0 +1,12 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+"http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
+<Menu>
+	<Name>Applications</Name>
+	<Menu>
+		<Name>Waydroid</Name>
+		<Directory>waydroid.directory</Directory>
+		<Include>
+			<Category>X-WayDroid-App</Category>
+		</Include>
+	</Menu>
+</Menu>
-- 
2.47.3