@BLumia casually fixing Gentoo packaging QA warning.0.8.8.1

4 files changed, 13 insertions, 11 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 467549d..4d0d9ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,7 @@ endif()
 
 option(USE_QT6 "Build with Qt 6" OFF)
 
+include(GNUInstallDirs)
 include(FindPkgConfig)
 if (USE_QT6)
     find_package(QT NAMES Qt6 REQUIRED)
diff --git a/qmidiplayer-desktop/CMakeLists.txt b/qmidiplayer-desktop/CMakeLists.txt
index b878ccc..2504750 100644
--- a/qmidiplayer-desktop/CMakeLists.txt
+++ b/qmidiplayer-desktop/CMakeLists.txt
@@ -102,14 +102,14 @@ else()
     qt_add_translations(qmidiplayer TS_FILES ${qmpdesktop_TS_FILES} QM_FILES_OUTPUT_VARIABLE qmpdesktop_QM_FILES)
 endif()
 
-install(TARGETS qmidiplayer)
+install(TARGETS qmidiplayer RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/doc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/qmidiplayer)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/img DESTINATION ${CMAKE_INSTALL_PREFIX}/share/qmidiplayer FILES_MATCHING PATTERN "*.png")
-install(FILES qmidiplayer.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata)
-install(FILES qmidiplayer.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
-install(FILES ${PROJECT_SOURCE_DIR}/img/qmidiplyr.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/64x64/apps)
-install(FILES ${PROJECT_SOURCE_DIR}/img/qmidiplyr.svg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps)
+install(FILES org.chrisoft.qmidiplayer.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo)
+install(FILES org.chrisoft.qmidiplayer.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+install(FILES ${PROJECT_SOURCE_DIR}/img/qmidiplyr.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps RENAME org.chrisoft.qmidiplayer.png)
+install(FILES ${PROJECT_SOURCE_DIR}/img/qmidiplyr.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps RENAME org.chrisoft.qmidiplayer.svg)
 install(FILES menu/qmidiplayer DESTINATION ${CMAKE_INSTALL_PREFIX}/share/menu)
 install(FILES qmidiplayer.mime DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mime/packages)
 install(FILES ${qmpdesktop_QM_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/qmidiplayer/translations)
diff --git a/qmidiplayer-desktop/qmidiplayer.appdata.xml b/qmidiplayer-desktop/org.chrisoft.qmidiplayer.appdata.xml
index c4afa10..0d22cec 100644
--- a/qmidiplayer-desktop/qmidiplayer.appdata.xml
+++ b/qmidiplayer-desktop/org.chrisoft.qmidiplayer.appdata.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
- <id>qmidiplayer.desktop</id>
- <metadata_license>GPL-3+</metadata_license>
- <project_license>GPL-3+</project_license>
+ <id>org.chrisoft.qmidiplayer.desktop</id>
+ <metadata_license>FSFAP</metadata_license>
+ <project_license>GPL-3.0+</project_license>
  <name>QMidiPlayer</name>
  <summary>A cross-platform midi file player based on libfluidsynth and Qt.</summary>
  <description>
   <p>QMidiPlayer is a cross-platform midi file player based on libfluidsynth and Qt.</p>
  </description>
+ <launchable type="desktop-id">org.chrisoft.qmidiplayer.desktop</launchable>
  <screenshots>
   <screenshot type="default">
    <image>https://chrisoft.org/QMidiPlayer/qmidiplyr.png</image>
@@ -15,7 +16,7 @@
   </screenshot>
  </screenshots>
  <url type="homepage">https://chrisoft.org/QMidiPlayer/</url>
- <updatecontact>chirs241097@gmail.com</updatecontact>
+ <update_contact>chirs241097@gmail.com</update_contact>
  <project_group>chrisoft.org</project_group>
  <kudos>
   <kudo>HiDpiIcon</kudo>
diff --git a/qmidiplayer-desktop/qmidiplayer.desktop b/qmidiplayer-desktop/org.chrisoft.qmidiplayer.desktop
index 2884d18..737c1ce 100644
--- a/qmidiplayer-desktop/qmidiplayer.desktop
+++ b/qmidiplayer-desktop/org.chrisoft.qmidiplayer.desktop
@@ -2,11 +2,11 @@
 [Desktop Entry]
 Type=Application
 Name=QMidiPlayer
-Version=0.8.1
+Version=1.5
 GenericName=MIDI Player
 Comment=QMidiPlayer is a midi file player based on Fluidsynth and Qt.
 Exec=/usr/bin/qmidiplayer
-Icon=qmidiplyr
+Icon=org.chrisoft.qmidiplayer
 Keywords=audio;sound;
 Categories=Audio;AudioVideo;Midi;X-Alsa;X-Jack;Qt;
 Terminal=false