From a02da356ba272e4041f1b8d77bd74d208de8fd1f Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Mon, 18 Apr 2022 20:10:10 +0200 Subject: Make Nheko discoverable using appdata --- CMakeLists.txt | 28 ++++++++----- io.github.NhekoReborn.Nheko.yaml | 3 -- resources/nheko.appdata.xml | 86 ------------------------------------- resources/nheko.appdata.xml.in | 91 ++++++++++++++++++++++++++++++++++++++++ resources/nheko.desktop | 2 + 5 files changed, 111 insertions(+), 99 deletions(-) delete mode 100644 resources/nheko.appdata.xml create mode 100644 resources/nheko.appdata.xml.in diff --git a/CMakeLists.txt b/CMakeLists.txt index eef3d829..a8b1f11b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -732,19 +732,27 @@ endif() set_target_properties(nheko PROPERTIES CMAKE_SKIP_INSTALL_RPATH TRUE) if(UNIX AND NOT APPLE) + if(FLATPAK) + set(APPID "io.github.NhekoReborn.Nheko") + else() + set(APPID "nheko") + endif() + install (TARGETS nheko RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") - install (FILES "resources/nheko-16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "nheko.png") - install (FILES "resources/nheko-32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "nheko.png") - install (FILES "resources/nheko-48.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps" RENAME "nheko.png") - install (FILES "resources/nheko-64.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps" RENAME "nheko.png") - install (FILES "resources/nheko-128.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps" RENAME "nheko.png") - install (FILES "resources/nheko-256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "nheko.png") - install (FILES "resources/nheko-512.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/512x512/apps" RENAME "nheko.png") - install (FILES "resources/nheko.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "nheko.svg") - install (FILES "resources/nheko.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") - install (FILES "resources/nheko.appdata.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo") + install (FILES "resources/nheko-16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "${APPID}.png") + install (FILES "resources/nheko-32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "${APPID}.png") + install (FILES "resources/nheko-48.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps" RENAME "${APPID}.png") + install (FILES "resources/nheko-64.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps" RENAME "${APPID}.png") + install (FILES "resources/nheko-128.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps" RENAME "${APPID}.png") + install (FILES "resources/nheko-256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "${APPID}.png") + install (FILES "resources/nheko-512.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/512x512/apps" RENAME "${APPID}.png") + install (FILES "resources/nheko.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "${APPID}.svg") + install (FILES "resources/nheko.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications" RENAME "${APPID}.desktop") install (FILES "resources/_nheko" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/zsh/site-functions") + configure_file("resources/nheko.appdata.xml.in" "resources/nheko.appdata.xml" @ONLY) + install (FILES "resources/nheko.appdata.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo" RENAME "${APPID}.appdata.xml") + if(NOT TARGET uninstall) configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" diff --git a/io.github.NhekoReborn.Nheko.yaml b/io.github.NhekoReborn.Nheko.yaml index d634a9a2..ac16be72 100644 --- a/io.github.NhekoReborn.Nheko.yaml +++ b/io.github.NhekoReborn.Nheko.yaml @@ -3,9 +3,6 @@ command: nheko runtime: org.kde.Platform runtime-version: '5.15-21.08' sdk: org.kde.Sdk -rename-icon: nheko -rename-desktop-file: nheko.desktop -rename-appdata-file: nheko.appdata.xml finish-args: - --device=dri # needed for webcams, see #517 diff --git a/resources/nheko.appdata.xml b/resources/nheko.appdata.xml deleted file mode 100644 index 5aafdc6d..00000000 --- a/resources/nheko.appdata.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - nheko.desktop - CC0-1.0 - GPL-3.0-or-later - nheko - Desktop client for the Matrix protocol - -

The motivation behind the project is to provide a native - desktop app for Matrix that feels more like a mainstream - chat app.

- - - - cs - de - el - en - eo - et - fi - fr - hu - it - ja - ml - nl - pl - ro - ru - sv - zh_CN - - - intense - intense - - - - https://nheko-reborn.github.io/images/screenshots/chat.png - - - https://nheko-reborn.github.io/images/screenshots/Start.png - - - https://nheko-reborn.github.io/images/screenshots/settings.png - - - https://nheko-reborn.github.io/images/screenshots/login.png - - - https://nheko-reborn.github.io/images/screenshots/mobile.png - - - https://github.com/Nheko-Reborn/nheko - https://github.com/Nheko-Reborn - - - - - - - - - - - - - - - - - - - - - - Nheko Reborn - https://github.com/Nheko-Reborn/nheko/issues - https://github.com/Nheko-Reborn/nheko/ - https://weblate.nheko.im/projects/nheko/ - - - - diff --git a/resources/nheko.appdata.xml.in b/resources/nheko.appdata.xml.in new file mode 100644 index 00000000..ff572752 --- /dev/null +++ b/resources/nheko.appdata.xml.in @@ -0,0 +1,91 @@ + + + + @APPID@.desktop + @APPID@.desktop + CC0-1.0 + GPL-3.0-or-later + nheko + Desktop client for the Matrix protocol + +

The motivation behind the project is to provide a native + desktop app for Matrix that feels more like a mainstream + chat app.

+ + + + cs + de + el + en + eo + et + fi + fr + hu + it + ja + ml + nl + pl + ro + ru + sv + zh_CN + + + intense + intense + + + workstation + mobile + + + + https://nheko-reborn.github.io/images/screenshots/chat.png + + + https://nheko-reborn.github.io/images/screenshots/Start.png + + + https://nheko-reborn.github.io/images/screenshots/settings.png + + + https://nheko-reborn.github.io/images/screenshots/login.png + + + https://nheko-reborn.github.io/images/screenshots/mobile.png + + + https://github.com/Nheko-Reborn/nheko + https://github.com/Nheko-Reborn + + + + + + + + + + + + + + + + + + + + + + Nheko Reborn + https://github.com/Nheko-Reborn/nheko/issues + https://github.com/Nheko-Reborn/nheko/ + https://weblate.nheko.im/projects/nheko/ + + + + diff --git a/resources/nheko.desktop b/resources/nheko.desktop index 4f454a74..90489a94 100644 --- a/resources/nheko.desktop +++ b/resources/nheko.desktop @@ -10,3 +10,5 @@ StartupWMClass=nheko Terminal=false MimeType=x-scheme-handler/matrix; X-GNOME-UsesNotifications=true +Keywords=Matrix;matrix.org;chat;irc;communications;talk;riot;element;fractal;voip; +X-KDE-Keywords=Matrix,matrix.org,chat,irc,communications,talk,riot,element,fractal,voip, -- cgit 1.5.1