Fix the error caused by the new structure of the appimage

4 files changed, 19 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ee8fb9bf173..6c24ed652480 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freecad-weekly-appimage
 	pkgdesc = A general purpose 3D CAD modeler
 	pkgver = 0.22_33981
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.freecadweb.org/
 	arch = x86_64
 	license = LGPL
@@ -12,9 +12,9 @@ pkgbase = freecad-weekly-appimage
 	options = !strip
 	source = freecad-0.22_33981.AppImage::https://github.com/FreeCAD/FreeCAD-Bundle/releases/download/weekly-builds/FreeCAD_weekly-builds-33981-2023-08-24-conda-Linux-x86_64-py310.AppImage
 	source = freecad.sh
-	source = freecad_weekly.desktop.patch
+	source = org.freecad.FreeCAD.desktop.patch
 	sha256sums = SKIP
 	sha256sums = 0c5e634ad825f6eba37151fd1a12e496772874caad587fb009aa391984b87674
-	sha256sums = 601666ea0b03f29bdae4dd43cfa8510d1beab10ce1f3f0a2f8eda0d5391f3fe8
+	sha256sums = 52085d2850053db11009365ebdc164e7764f52c3b0d00add4a3d8d8c82860174
 
 pkgname = freecad-weekly-appimage
diff --git a/PKGBUILD b/PKGBUILD
index 41a96f7b473d..f0b940fba373 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Original work by: Igor Moura <imp2@cin.ufpe.br>
 pkgname=freecad-weekly-appimage
 pkgver=0.22_33981
-pkgrel=1
+pkgrel=2
 pkgdesc="A general purpose 3D CAD modeler"
 arch=('x86_64')
 url="https://www.freecadweb.org/"
@@ -14,18 +14,18 @@ options=('!strip')
 noextract=("freecad-${pkgver}.AppImage")
 source=("freecad-0.22_33981.AppImage::https://github.com/FreeCAD/FreeCAD-Bundle/releases/download/weekly-builds/FreeCAD_weekly-builds-33981-2023-08-24-conda-Linux-x86_64-py310.AppImage"
   "freecad.sh"
-  "freecad_weekly.desktop.patch")
+  "org.freecad.FreeCAD.desktop.patch")
 
 sha256sums=("SKIP"
   "0c5e634ad825f6eba37151fd1a12e496772874caad587fb009aa391984b87674"
-  "601666ea0b03f29bdae4dd43cfa8510d1beab10ce1f3f0a2f8eda0d5391f3fe8")
+  "52085d2850053db11009365ebdc164e7764f52c3b0d00add4a3d8d8c82860174")
 prepare() {
   cd "${srcdir}"
   chmod +x freecad-${pkgver}.AppImage
-  ./freecad-${pkgver}.AppImage --appimage-extract freecad_weekly.desktop
+  ./freecad-${pkgver}.AppImage --appimage-extract org.freecad.FreeCAD.desktop
   ./freecad-${pkgver}.AppImage --appimage-extract usr/share/icons
   ./freecad-${pkgver}.AppImage --appimage-extract usr/share/mime/packages
-  patch -Np0 <./freecad_weekly.desktop.patch
+  patch -Np0 <./org.freecad.FreeCAD.desktop.patch
 }
 
 package() {
diff --git a/freecad_weekly.desktop.patch b/freecad_weekly.desktop.patch
deleted file mode 100644
index 70973f40412c..000000000000
--- a/freecad_weekly.desktop.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- squashfs-root/freecad_weekly.desktop
-+++ squashfs-root/freecad_weekly.desktop
-@@ -1,10 +1,10 @@
- [Desktop Entry]
- Version=1.0
- Name=FreeCAD Weekly
--Exec=AppRun
--Icon=freecad_weekly
-+Exec=/usr/bin/freecad %F
-+Icon=freecad
- Type=Application
--Categories=Engineering;
-+Categories=Engineering;Construction;Development;
- Comment=Feature based Parametric Modeler
- Terminal=false
- StartupNotify=true
diff --git a/org.freecad.FreeCAD.desktop.patch b/org.freecad.FreeCAD.desktop.patch
new file mode 100644
index 000000000000..3fc7b6534dcd
--- /dev/null
+++ b/org.freecad.FreeCAD.desktop.patch
@@ -0,0 +1,11 @@
+--- squashfs-root/org.freecad.FreeCAD.desktop	2023-08-25 09:18:01.234247485 +0300
++++ squashfs-root/org.freecad.FreeCAD.desktop	2023-08-25 09:12:28.571381769 +0300
+@@ -14,7 +14,7 @@
+ GenericName[ko]=CAD 응용프로그램
+ GenericName[pl]=Aplikacja CAD
+ GenericName[ru]=Система автоматизированного проектирования
+-Exec=AppRun - --single-instance %F
++Exec=freecad
+ Terminal=false
+ Type=Application
+ Icon=org.freecad.FreeCAD