Fixed mistakes with .desktop file patching

4 files changed, 21 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dad32b0d9622..f2b933a63d34 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freecad-appimage
 	pkgdesc = A general purpose 3D CAD modeler (binary AppImage version)
 	pkgver = 0.18_16110
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.freecadweb.org/
 	arch = x86_64
 	license = LGPL
@@ -9,10 +9,10 @@ pkgbase = freecad-appimage
 	conflicts = freecad
 	options = !strip
 	source = https://github.com/FreeCAD/FreeCAD/releases/download/0.18.1/FreeCAD_0.18-16110-Linux-Conda_Py3Qt5_glibc2.12-x86_64.AppImage
-	source = freecad.desktop.patch
+	source = freecad_conda.desktop.patch
 	source = freecad.sh
-	sha256sums = a22812f9ad66f22cae843998994f23d54191d623b4a7c7f05cc7fa0293e69f63
-	sha256sums = 7e3755f477d24f869408ac67ae75379b727464cc646b0a69ce86afe6e3ca9fef
+	sha256sums = e29dd21be9fb387ceb0196aa82255196240cbde27d4d87d0ca49b819e63ae244
+	sha256sums = c56c0d1fd1d795419e464e487bab5fe2f62edb3ce40f895079d8251a9f6ddd1b
 	sha256sums = 9bfca97e1e633601ddfbd74f32501050f50378cfd6b30f5bf91d978e7ce33436
 
 pkgname = freecad-appimage
diff --git a/PKGBUILD b/PKGBUILD
index bba20b04785c..39ce938d2213 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=freecad-appimage
 pkgver=0.18_16110
-pkgrel=1
+pkgrel=2
 pkgdesc="A general purpose 3D CAD modeler (binary AppImage version)"
 arch=('x86_64')
 url='http://www.freecadweb.org/'
@@ -10,10 +10,10 @@ license=('LGPL')
 provides=('freecad')
 conflicts=('freecad')
 source=("https://github.com/FreeCAD/FreeCAD/releases/download/0.18.1/FreeCAD_${pkgver//_/-}-Linux-Conda_Py3Qt5_glibc2.12-${arch}.AppImage"
-        freecad.desktop.patch
+        freecad_conda.desktop.patch
         freecad.sh)
-sha256sums=('a22812f9ad66f22cae843998994f23d54191d623b4a7c7f05cc7fa0293e69f63'
-         '7e3755f477d24f869408ac67ae75379b727464cc646b0a69ce86afe6e3ca9fef'
+sha256sums=('e29dd21be9fb387ceb0196aa82255196240cbde27d4d87d0ca49b819e63ae244'
+         'c56c0d1fd1d795419e464e487bab5fe2f62edb3ce40f895079d8251a9f6ddd1b'
          '9bfca97e1e633601ddfbd74f32501050f50378cfd6b30f5bf91d978e7ce33436')
 options=(!strip)
 _filename=./FreeCAD_${pkgver//_/-}-Linux-Conda_Py3Qt5_glibc2.12-${arch}.AppImage
@@ -22,7 +22,7 @@ prepare() {
   cd "${srcdir}"
   chmod +x ${_filename}
   ${_filename} --appimage-extract
-  patch -Np0 < ./freecad.desktop.patch
+  patch -Np0 < ./freecad_conda.desktop.patch
 }
 
 package() {
@@ -32,7 +32,7 @@ package() {
   install -dm755 "${pkgdir}/usr/share/"
   cp -r --no-preserve=mode,ownership "${srcdir}/squashfs-root/usr/share/icons" "${pkgdir}/usr/share/"
 
-  install -Dm644 "${srcdir}/squashfs-root/freecad.desktop" "${pkgdir}/usr/share/applications/freecad.desktop"
+  install -Dm644 "${srcdir}/squashfs-root/freecad_conda.desktop" "${pkgdir}/usr/share/applications/freecad_conda.desktop"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/freecad.desktop.patch b/freecad.desktop.patch
deleted file mode 100644
index 906ed14de299..000000000000
--- a/freecad.desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- squashfs-root/freecad.desktop
-+++ squashfs-root/freecad.desktop
-@@ -7,7 +7,7 @@
- GenericName=CAD Application
- GenericName[de_DE]=CAD-Anwendung
- GenericName[fr]=Application de CAO
--Exec=freecad.wrapper --single-instance %U
-+Exec=/usr/bin/freecad
- Terminal=false
- Type=Application
- Icon=freecad
diff --git a/freecad_conda.desktop.patch b/freecad_conda.desktop.patch
new file mode 100644
index 000000000000..d1694eae611c
--- /dev/null
+++ b/freecad_conda.desktop.patch
@@ -0,0 +1,11 @@
+--- squashfs-root/freecad_conda.desktop
++++ squashfs-root/freecad_conda.desktop
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Version=1.0
+ Name=FreeCAD Conda
+-Exec=AppRun
++Exec=/usr/bin/freecad
+ Icon=freecad_conda
+ Type=Application
+ Categories=Engineering;