From 7d4bd31e9db87ed62405ce7c2e0746769540c51d Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Tue, 27 Oct 2020 21:46:34 +0000 Subject: [PATCH] terminology - use icon name not full path ao icon themes can override desktop file modification - simpler now too. --- data/desktop/meson.build | 14 ++------------ ...{terminology.desktop.in => terminology.desktop} | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) rename data/desktop/{terminology.desktop.in => terminology.desktop} (95%) diff --git a/data/desktop/meson.build b/data/desktop/meson.build index 8c16dbea..1eb40192 100644 --- a/data/desktop/meson.build +++ b/data/desktop/meson.build @@ -1,12 +1,2 @@ -icon_sed = 's~%ICON_PATH%~@0@~'.format(join_paths(get_option('prefix'), - get_option('datadir'), - 'icons/hicolor/128x128/apps')) - -custom_target( - 'terminology.desktop', - input : 'terminology.desktop.in', - output: 'terminology.desktop', - command : [sed, icon_sed, '@INPUT@'], - capture : true, - install : true, - install_dir : join_paths(get_option('datadir'), 'applications')) +install_data('terminology.desktop', + install_dir: join_paths(get_option('datadir'), 'applications')) diff --git a/data/desktop/terminology.desktop.in b/data/desktop/terminology.desktop similarity index 95% rename from data/desktop/terminology.desktop.in rename to data/desktop/terminology.desktop index 5fcfa403..b1067069 100644 --- a/data/desktop/terminology.desktop.in +++ b/data/desktop/terminology.desktop @@ -20,6 +20,6 @@ Comment[ru]=Эмулятор терминала Comment[ko]=터미널 에뮬레이터 Keywords=shell;prompt;command;commandline; Exec=terminology -Icon=%ICON_PATH%/terminology.png +Icon=terminology Categories=System;TerminalEmulator; StartupWMClass=terminology