Version 0.21.1

4 files changed, 29 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1259ca236d27..e889ec556a3f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freecad-appimage
 	pkgdesc = A general purpose 3D CAD modeler (AppImage version)
-	pkgver = 0.21.0
+	pkgver = 0.21.1
 	pkgrel = 1
 	url = https://www.freecad.org/
 	arch = x86_64
@@ -8,13 +8,13 @@ pkgbase = freecad-appimage
 	depends = fuse2
 	provides = freecad
 	conflicts = freecad
-	noextract = freecad-0.21.0.AppImage
+	noextract = freecad-0.21.1.AppImage
 	options = !strip
-	source = freecad-0.21.0.AppImage::https://github.com/FreeCAD/FreeCAD/releases/download/0.21.0/FreeCAD_0.21.0-Linux-x86_64.AppImage
+	source = freecad-0.21.1.AppImage::https://github.com/FreeCAD/FreeCAD/releases/download/0.21.1/FreeCAD_0.21.1-Linux-x86_64.AppImage
 	source = freecad.sh
-	source = freecad_weekly.desktop.patch
-	sha256sums = 7ac2970c201bae4eb31459b9c7788b521aa3df468291b4b169a3c04132853e9b
+	source = freecad-desktop.patch
+	sha256sums = 9b8a991934e9d1edd7aa61b7ae938339e15b253ed612fe1f554abc1db9b6ee6f
 	sha256sums = 0c5e634ad825f6eba37151fd1a12e496772874caad587fb009aa391984b87674
-	sha256sums = bec9eeb54790ebcd3c9954bf014ab24c5eaabcdb1ed6a9b4043b8acc6b3762c2
+	sha256sums = 63df64b9a480434b007e297e01f12ebbe49d8227c87de574110d8bf19f97f415
 
 pkgname = freecad-appimage
diff --git a/PKGBUILD b/PKGBUILD
index d6dbb8afd1ed..aa78cb1860b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Igor Moura <hi@igor.mp>
 
 pkgname=freecad-appimage
-pkgver=0.21.0
+pkgver=0.21.1
 pkgrel=1
 pkgdesc="A general purpose 3D CAD modeler (AppImage version)"
 arch=('x86_64')
@@ -14,26 +14,26 @@ provides=('freecad')
 conflicts=('freecad')
 options=('!strip')
 noextract=("freecad-${pkgver}.AppImage")
-source=("freecad-${pkgver}.AppImage::https://github.com/FreeCAD/FreeCAD/releases/download/0.21.0/FreeCAD_0.21.0-Linux-x86_64.AppImage"
+source=("freecad-${pkgver}.AppImage::https://github.com/FreeCAD/FreeCAD/releases/download/${pkgver}/FreeCAD_${pkgver}-Linux-x86_64.AppImage"
         "freecad.sh"
-        "freecad_weekly.desktop.patch")
-sha256sums=('7ac2970c201bae4eb31459b9c7788b521aa3df468291b4b169a3c04132853e9b'
+        "freecad-desktop.patch")
+sha256sums=('9b8a991934e9d1edd7aa61b7ae938339e15b253ed612fe1f554abc1db9b6ee6f'
             '0c5e634ad825f6eba37151fd1a12e496772874caad587fb009aa391984b87674'
-            'bec9eeb54790ebcd3c9954bf014ab24c5eaabcdb1ed6a9b4043b8acc6b3762c2')
+            '63df64b9a480434b007e297e01f12ebbe49d8227c87de574110d8bf19f97f415')
 
 prepare() {
   cd "${srcdir}"
   chmod +x freecad-${pkgver}.AppImage
-  ./freecad-${pkgver}.AppImage --appimage-extract freecad_weekly.desktop
+  ./freecad-${pkgver}.AppImage --appimage-extract org.freecadweb.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 <./freecad-desktop.patch
 }
 
 package() {
   install -Dm755 "${srcdir}/freecad-${pkgver}.AppImage" "${pkgdir}/opt/appimages/freecad.AppImage"
   install -Dm755 "${srcdir}/freecad.sh" "${pkgdir}/usr/bin/freecad"
-  install -Dm644 "${srcdir}/squashfs-root/freecad_weekly.desktop" "${pkgdir}/usr/share/applications/freecad.desktop"
+  install -Dm644 "${srcdir}/squashfs-root/org.freecadweb.FreeCAD.desktop" "${pkgdir}/usr/share/applications/freecad.desktop"
   install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/64x64/apps/freecad.png" "${pkgdir}/usr/share/pixmaps/freecad.png"
   install -Dm644 "${srcdir}/squashfs-root/usr/share/mime/packages/org.freecadweb.FreeCAD.xml" "${pkgdir}/usr/share/mime/packages/freecad.xml"
 }
diff --git a/freecad-desktop.patch b/freecad-desktop.patch
new file mode 100644
index 000000000000..f93af32bb915
--- /dev/null
+++ b/freecad-desktop.patch
@@ -0,0 +1,15 @@
+--- squashfs-root/org.freecadweb.FreeCAD.desktop
++++ squashfs-root/org.freecadweb.FreeCAD.desktop
+@@ -14,10 +14,10 @@
+ GenericName[ko]=CAD 응용프로그램
+ GenericName[pl]=Aplikacja CAD
+ GenericName[ru]=Система автоматизированного проектирования
+-Exec=AppRun %F
++Exec=/usr/bin/freecad %F
+ Terminal=false
+ Type=Application
+-Icon=org.freecadweb.FreeCAD
++Icon=freecad
+ Categories=Graphics;Science;Education;Engineering;
+ StartupNotify=true
+ MimeType=application/x-extension-fcstd;model/obj;model/iges;image/vnd.dwg;image/vnd.dxf;model/vnd.collada+xml;application/iges;model/iges;model/step;model/step+zip;model/stl;application/vnd.shp;model/vrml;
diff --git a/freecad_weekly.desktop.patch b/freecad_weekly.desktop.patch
deleted file mode 100644
index 9bb8256fa8b6..000000000000
--- a/freecad_weekly.desktop.patch
+++ /dev/null
@@ -1,17 +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
-+Name=FreeCAD
-+Exec=/usr/bin/freecad %F
-+Icon=freecad
- Type=Application
--Categories=Engineering;
-+Categories=Engineering;Construction;Development;
- Comment=Feature based Parametric Modeler
- Terminal=false
- StartupNotify=true