Improve Linux support

.gitignore

@@ -58,7 +58,7 @@ lib-src/soundtouch/include/soundtouch_config.h
 lib-src/twolame/doc/html/Doxyfile
 lib-src/twolame/libtwolame/config.h
 locale/POTFILES
-src/saucedacity.desktop
+src/io.github.saucedacity.Saucedacity.desktop
 src/RevisionIdent.h
 src/configunix.h
 src/configwin.h

CMakeLists.txt

@@ -450,8 +450,12 @@ if( CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows" )
    set( APP_NAME "Saucedacity" )
 else()
    set( APP_NAME "saucedacity" )
+   set( PROPER_NAME "Saucedacity" )
 endif()
 
+# Define Application ID
+set( APP_ID "io.github.saucedacity.Saucedacity" )
+
 # Create short and full version strings
 set( AUDACITY_DIST_VERSION ${AUDACITY_VERSION}.${AUDACITY_RELEASE}.${AUDACITY_REVISION} )
 set( AUDACITY_INFO_VERSION ${AUDACITY_VERSION}.${AUDACITY_RELEASE}.${AUDACITY_REVISION}.${AUDACITY_MODLEVEL} )

help/CMakeLists.txt

@@ -18,6 +18,7 @@ set( script_dir "${topdir}/scripts/mw2html_audacity" )
 set( script "mw2html.py" )
 set( out_dir "${_INTDIR}" )
 set( out "${out_dir}/${host}/index.html" )
+configure_file( ${APP_ID}.metainfo.xml.in ${_INTDIR}/${APP_ID}.metainfo.xml )
 
 add_custom_command(
    COMMENT
@@ -58,7 +59,7 @@ if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
                DESTINATION "${_DATADIR}/audacity/help" )
       install( FILES "${_SRCDIR}/audacity.1"
                DESTINATION "${_MANDIR}/man1" )
-      install( FILES "${_SRCDIR}/audacity.appdata.xml"
+      install( FILES "${_INTDIR}/${APP_ID}.metainfo.xml"
                DESTINATION "${_DATADIR}/metainfo" )
    endif()
 endif()

help/io.github.saucedacity.Saucedacity.metainfo.xml.in

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id>@APP_ID@</id>
+  <launchable type="desktop-id">@[email protected]</launchable>
+  <project_license>GPL-2.0 and CC-BY-3.0</project_license>
+  <metadata_license>CC0-1.0</metadata_license>
+  <name>@PROPER_NAME@</name>
+  <developer_name>@PROPER_NAME@ Community</developer_name>
+  <summary>Record and edit audio files</summary>
+  <description>
+    <p>@PROPER_NAME@ is a free, easy-to-use, multi-track audio editor and recorder for Windows, Mac OS X, GNU/Linux and other operating systems. The interface is translated into many languages.</p>
+    <p>You can use @PROPER_NAME@ to:</p>
+    <ul>
+      <li>Record live audio</li>
+      <li>Convert tapes and records into digital recordings or CDs</li>
+      <li>Edit WAV, AIFF, FLAC, MP2, MP3 or Ogg Vorbis sound files</li>
+      <li>Cut, copy, splice or mix sounds together</li>
+      <li>Change the speed or pitch of a recording</li>
+      <li>Apply a wide range of other effects to audio recordings</li>
+    </ul>
+  </description>
+  <categories>
+    <category>AudioVideo</category>
+    <category>Audio</category>
+  </categories>
+  <content_rating type="oars-1.1" />
+  <url type="homepage">https://saucedacity.github.io/</url>
+  <url type="bugtracker">https://github.com/saucedacity/saucedacity/issues</url>
+  <url type="help">https://matrix.to/#/#saucedacity:matrix.org</url>
+  <!-- <url type="translate">https://www.audacityteam.org/community/translators/</url> -->
+  <screenshots>
+    <screenshot type="default">
+      <image type="source">https://saucedacity.github.io/saucedacity.png</image>
+    </screenshot>
+  </screenshots>
+  <releases>
+    <release version="1.2" date="2022-08-03"/>
+  </releases>
+  <supports>
+    <control>pointing</control>
+    <control>keyboard</control>
+  </supports>
+</component>

images/CMakeLists.txt

@@ -10,15 +10,15 @@ def_vars()
 
 list( APPEND PIXMAPS
    ${_SRCDIR}/gnome-mime-application-x-audacity-project.xpm
-   ${_SRCDIR}/icons/16x16/saucedacity16.xpm
-   ${_SRCDIR}/icons/32x32/saucedacity32.xpm
-   ${_SRCDIR}/icons/48x48/saucedacity.xpm
+   ${_SRCDIR}/icons/16x16/${APP_ID}16.xpm
+   ${_SRCDIR}/icons/32x32/${APP_ID}32.xpm
+   ${_SRCDIR}/icons/48x48/${APP_ID}.xpm
 )
 
 if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
    if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
-      install( FILES "${_SRCDIR}/saucedacity.svg"
-               DESTINATION "${_DATADIR}/icons/hicolor/scalable/apps" )
+      install( FILES "${_SRCDIR}/${APP_ID}.svg"
+               DESTINATION "${_DATADIR}/icons/hicolor/scalable/apps/" )
       install( DIRECTORY "${_SRCDIR}/icons/"
                DESTINATION "${_DATADIR}/icons/hicolor"
                FILES_MATCHING PATTERN "*.png" )

src/CMakeLists.txt

@@ -1339,7 +1339,7 @@ else()
    endif()
 
    # Create the desktop file
-   configure_file( saucedacity.desktop.in ${_INTDIR}/saucedacity.desktop )
+   configure_file( ${APP_ID}.desktop.in ${_INTDIR}/${APP_ID}.desktop )
 
    # Copy the required wxWidgets libs into the bundle
    add_custom_command(
@@ -1424,7 +1424,7 @@ else()
                DESTINATION "${_LIBDIR}"
                USE_SOURCE_PERMISSIONS
                FILES_MATCHING PATTERN "*.so*" )
-      install( FILES "${_INTDIR}/saucedacity.desktop"
+      install( FILES "${_INTDIR}/${APP_ID}.desktop"
                DESTINATION "${_DATADIR}/applications" )
       install( FILES "${topdir}/LICENSE.txt" "${topdir}/README.md"
                DESTINATION "${_DATADIR}/doc/${APP_NAME}" )

src/saucedacity.desktop.in → src/io.github.saucedacity.Saucedacity.desktop.in

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Saucedacity
+Name=@PROPER_NAME@
 GenericName=Sound Editor
 GenericName[ar]=محرر أصوات
 GenericName[ca]=Editor d'àudio
@@ -45,12 +45,14 @@ Comment[uk]=Запис і редагування звукових файлів
 Comment[zh_CN]=录音和编辑音频文件
 Comment[zh_TW]=錄音和編輯音訊檔案
 
-Icon=@APP_NAME@
+Icon=@APP_ID@
+StartupWMClass=@APP_NAME@
 
 Type=Application
-Categories=AudioVideo;Audio;AudioVideoEditing;
+Categories=AudioVideo;Audio;AudioVideoEditing;Midi;Recorder;
+Keywords=audio;editor;audacity;sound;ton;wave;
 
-Exec=env UBUNTU_MENUPROXY=0 @APP_NAME@ %F
+Exec=env UBUNTU_MENUPROXY=0 @APP_ID@ %F
 StartupNotify=false
 Terminal=false
 MimeType=@MIMETYPES@;