From c8185aec1d36df3aa60001a0b3a0fbd49d11df18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Sun, 8 Sep 2024 10:23:26 +0200 Subject: [PATCH] desktop: rename to foot{,client,-server}.desktop That is, skip the reverse DNS naming scheme suggested by the .desktop specification, and directly match our app-ids ("foot", and "footclient"). This simplifies .desktop -> window instance mapping, allowing DEs to match the filenames directly, without having to look at the StartupWMClass key in the .desktop files. These are the original names of the .desktop files. There were renamed (to use the reverse DNS syntax) to please the flathub people, who *required* this scheme to accept the foot package. But, since: * We don't package foot ourselves * We don't go out of our way to support non-distro packaging schemes * Flathub still hasn't merged the foot PR (it's now 2 years old) * There are no know issues in any known DE that prevents a non-reverse DNS .desktop filename from working * There are plenty of other applications that doesn't use reverse DNS names (a very clear majority, in my case) Let's just revert back to the simpler naming scheme. Closes #1607 --- CHANGELOG.md | 4 ++++ org.codeberg.dnkl.foot-server.desktop => foot-server.desktop | 0 org.codeberg.dnkl.foot.desktop => foot.desktop | 0 org.codeberg.dnkl.footclient.desktop => footclient.desktop | 0 meson.build | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) rename org.codeberg.dnkl.foot-server.desktop => foot-server.desktop (100%) rename org.codeberg.dnkl.foot.desktop => foot.desktop (100%) rename org.codeberg.dnkl.footclient.desktop => footclient.desktop (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fc84d4a..c155f362 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -78,8 +78,12 @@ * Sixel background color (when `P2=0|2`) is now set to the **sixel** color palette entry #0, instead of using the current ANSI background color. This is what a real VT340 does. +* The `.desktop` files no longer use the reverse DNS naming scheme, + and their names now match the default app-ids used by foot (`foot` + and `footclient`) ([#1607][1607]). [1822]: https://codeberg.org/dnkl/foot/issues/1822 +[1607]: https://codeberg.org/dnkl/foot/issues/1607 ### Deprecated diff --git a/org.codeberg.dnkl.foot-server.desktop b/foot-server.desktop similarity index 100% rename from org.codeberg.dnkl.foot-server.desktop rename to foot-server.desktop diff --git a/org.codeberg.dnkl.foot.desktop b/foot.desktop similarity index 100% rename from org.codeberg.dnkl.foot.desktop rename to foot.desktop diff --git a/org.codeberg.dnkl.footclient.desktop b/footclient.desktop similarity index 100% rename from org.codeberg.dnkl.footclient.desktop rename to footclient.desktop diff --git a/meson.build b/meson.build index 2fd1cb4a..c6e0e2ef 100644 --- a/meson.build +++ b/meson.build @@ -317,7 +317,7 @@ executable( install: true) install_data( - 'org.codeberg.dnkl.foot.desktop', 'org.codeberg.dnkl.foot-server.desktop', 'org.codeberg.dnkl.footclient.desktop', + 'foot.desktop', 'foot-server.desktop', 'footclient.desktop', install_dir: join_paths(get_option('datadir'), 'applications')) systemd = dependency('systemd', required: false)