From: Mo 森 <rmnscnce@ya.ru>
Date: Mon, 28 Mar 2022 14:08:33 +0000 (+0700)
Subject: packaging: install icons to xdg icons resource path, and get the .desktop file to... 
X-Git-Tag: 1.4.0~11
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/commitdiff_plain/574405d?hp=72aa95b191fa72055a57c57cc79a68c3a6ebec4b

packaging: install icons to xdg icons resource path, and get the .desktop file to use relative icon name
---

diff --git a/Makefile b/Makefile
index 67e74fa..dc54740 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ WAYDROID_DIR := $(PREFIX)/lib/waydroid
 BIN_DIR := $(PREFIX)/bin
 APPS_DIR := $(PREFIX)/share/applications
 METAINFO_DIR := $(PREFIX)/share/metainfo
+ICONS_DIR := $(PREFIX)/share/icons
 SYSD_DIR := $(PREFIX)/lib/systemd/system
 DBUS_DIR := $(PREFIX)/share/dbus-1
 POLKIT_DIR := $(PREFIX)/share/polkit-1
@@ -17,6 +18,7 @@ INSTALL_WAYDROID_DIR := $(DESTDIR)$(WAYDROID_DIR)
 INSTALL_BIN_DIR := $(DESTDIR)$(BIN_DIR)
 INSTALL_APPS_DIR := $(DESTDIR)$(APPS_DIR)
 INSTALL_METAINFO_DIR := $(DESTDIR)$(METAINFO_DIR)
+INSTALL_ICONS_DIR := $(DESTDIR)$(ICONS_DIR)
 INSTALL_SYSD_DIR := $(DESTDIR)$(SYSD_DIR)
 INSTALL_DBUS_DIR := $(DESTDIR)$(DBUS_DIR)
 INSTALL_POLKIT_DIR := $(DESTDIR)$(POLKIT_DIR)
@@ -26,9 +28,11 @@ build:
 	@echo "Nothing to build, run 'make install' to copy the files!"
 
 install:
-	install -d $(INSTALL_WAYDROID_DIR) $(INSTALL_BIN_DIR) $(INSTALL_APPS_DIR) $(INSTALL_METAINFO_DIR) $(INSTALL_DBUS_DIR)/system.d $(INSTALL_POLKIT_DIR)/actions
+	install -d $(INSTALL_WAYDROID_DIR) $(INSTALL_BIN_DIR) $(INSTALL_DBUS_DIR)/system.d $(INSTALL_POLKIT_DIR)/actions
+	install -d $(INSTALL_APPS_DIR) $(INSTALL_METAINFO_DIR) $(INSTALL_ICONS_DIR)/hicolor/512x512/apps
 	cp -a data tools waydroid.py $(INSTALL_WAYDROID_DIR)
 	ln -sf $(WAYDROID_DIR)/waydroid.py $(INSTALL_BIN_DIR)/waydroid
+	ln -sf $(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/*.metainfo.xml $(INSTALL_METAINFO_DIR)
 	cp dbus/id.waydro.Container.conf $(INSTALL_DBUS_DIR)/system.d/
diff --git a/data/Waydroid.desktop b/data/Waydroid.desktop
index 551fef2..5a54453 100644
--- a/data/Waydroid.desktop
+++ b/data/Waydroid.desktop
@@ -2,5 +2,5 @@
 Type=Application
 Name=Waydroid
 Exec=waydroid first-launch
-Icon=/usr/lib/waydroid/data/AppIcon.png
+Icon=waydroid
 X-Purism-FormFactor=Workstation;Mobile;
diff --git a/tools/services/user_manager.py b/tools/services/user_manager.py
index b8d1df5..5e03d25 100644
--- a/tools/services/user_manager.py
+++ b/tools/services/user_manager.py
@@ -45,7 +45,7 @@ def start(args, session, unlocked_cb=None):
         lines.append("X-Purism-FormFactor=Workstation;Mobile;")
         if hide:
             lines.append("NoDisplay=true")
-        lines.append("Icon=" + tools.config.tools_src + "/data/AppIcon.png")
+        lines.append("Icon=waydroid")
         desktop_file = open(desktop_file_path, "w")
         for line in lines:
             desktop_file.write(line + "\n")