From aa142c9ec9cd333b3efde9c65a6a44548c0bf6fc Mon Sep 17 00:00:00 2001
From: Syping <schiedelrafael@keppe.org>
Date: Fri, 28 Aug 2020 13:06:27 +0200
Subject: [PATCH] QMake: fix desktop entry installation, minor desktop entry
 fixes

---
 .ci/ci.sh                      |  6 +++---
 .ci/gta5view.desktop           | 12 ------------
 gta5view.pro                   |  4 ++--
 res/de.syping.gta5view.desktop |  4 +---
 4 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 .ci/gta5view.desktop

diff --git a/.ci/ci.sh b/.ci/ci.sh
index e87e19d..4021b51 100755
--- a/.ci/ci.sh
+++ b/.ci/ci.sh
@@ -29,9 +29,9 @@ cat ".ci/app.rc" | sed \
    -e "s/STR_BUILD_VER/$APPLICATION_BUILD_STR_VERSION/g" \
    > "res/app.rc"
 
-cat ".ci/gta5view.desktop" | sed \
-   -e "s/PKGAPP_VER/$PACKAGE_VERSION/g" \
-   > "res/gta5view.desktop"
+# cat ".ci/gta5view.desktop" | sed \
+#    -e "s/PKGAPP_VER/$PACKAGE_VERSION/g" \
+#    > "res/gta5view.desktop"
 
 if [ "${BUILD_TYPE}" == "ALPHA" ]; then
    export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_ALPHA"
diff --git a/.ci/gta5view.desktop b/.ci/gta5view.desktop
deleted file mode 100644
index ad1f023..0000000
--- a/.ci/gta5view.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=PKGAPP_VER
-Encoding=UTF-8
-Type=Application
-Name=gta5view
-Comment=Open and edit GTA V profiles
-Comment[de]=GTA V Profile öffnen und bearbeiten
-Categories=Qt;Application;Utility;
-Exec=gta5view
-Icon=gta5view
-Terminal=false
-StartupNotify=false
diff --git a/gta5view.pro b/gta5view.pro
index f802668..fa03a50 100644
--- a/gta5view.pro
+++ b/gta5view.pro
@@ -143,7 +143,7 @@ RESOURCES += \
     res/app_qmake.qrc
 
 DISTFILES += res/app.rc \
-    res/gta5view.desktop \
+    res/de.syping.gta5view.desktop \
     res/gta5sync_de.ts \
     res/gta5sync_en_US.ts \
     res/gta5sync_fr.ts \
@@ -214,7 +214,7 @@ QMAKE_EXTRA_TARGETS += depend
 isEmpty(GTA5SYNC_PREFIX): GTA5SYNC_PREFIX = /usr/local
 
 appfiles.path = $$GTA5SYNC_PREFIX/share/applications
-appfiles.files = $$PWD/res/gta5view.desktop
+appfiles.files = $$PWD/res/de.syping.gta5view.desktop
 pixmaps.path = $$GTA5SYNC_PREFIX/share/pixmaps
 pixmaps.files = $$PWD/res/gta5view.png
 target.path = $$GTA5SYNC_PREFIX/bin
diff --git a/res/de.syping.gta5view.desktop b/res/de.syping.gta5view.desktop
index 91ff4d5..270a03e 100644
--- a/res/de.syping.gta5view.desktop
+++ b/res/de.syping.gta5view.desktop
@@ -1,11 +1,9 @@
 [Desktop Entry]
-Version=1.8
-Encoding=UTF-8
 Type=Application
 Name=gta5view
 Comment=Open and edit GTA V profiles
 Comment[de]=GTA V Profile öffnen und bearbeiten
-Categories=Qt;Application;Utility;
+Categories=Qt;Utility
 Exec=gta5view
 Icon=gta5view
 Terminal=false