Up to 5.6.0 beta2

4 files changed, 29 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 54acf23fea95..851ae7dcce10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cura-5-beta-bin
 	pkgdesc = Cura is an open source slicing application for 3D printers (include betaversion)
-	pkgver = 5.4.0
+	pkgver = 5.6.0
 	pkgrel = 0
 	url = https://ultimaker.com/software/ultimaker-cura
 	arch = x86_64
@@ -14,8 +14,8 @@ pkgbase = cura-5-beta-bin
 	conflicts = cura-5-modern-bin
 	conflicts = cura-5-modern-beta-bin
 	options = !strip
-	source = https://github.com/Ultimaker/Cura/releases/download/5.4.0/Ultimaker-Cura-5.4.0-linux.AppImage
-	source = https://raw.githubusercontent.com/Ultimaker/Cura/5.4.0/LICENSE
+	source = https://github.com/Ultimaker/Cura/releases/download/5.6.0-beta.2/Ultimaker-Cura-5.6.0-beta.2-linux-X64.AppImage
+	source = https://raw.githubusercontent.com/Ultimaker/Cura/5.6.0-beta.2/LICENSE
 	source = cura5.sh
 	source = cura.desktop.patch
 	sha256sums = 40fd262da99eab779d43d01034eac798c25f349cbbb82bfd21891479e5c1796e
diff --git a/PKGBUILD b/PKGBUILD
index c19d53d6d4a1..942d9ac74e9e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,8 @@
 pkgname=cura-5-beta-bin
 _pkgname=cura-5-beta-bin
 _shortname=cura5
-pkgver=5.4.0
-beta=
-#-beta.1
+pkgver=5.6.0
+beta=-beta.2
 subbeta=
 pkgrel=0
 pkgdesc='Cura is an open source slicing application for 3D printers (include betaversion)'
@@ -20,21 +19,21 @@ provides=('cura')
 options=(!strip)
 DLAGENTS=("https::/usr/bin/curl -A 'Mozilla' -fLC - --retry 3 --retry-delay 3 -o %o %u")
 source=(
-    "https://github.com/Ultimaker/Cura/releases/download/${pkgver}${beta}/Ultimaker-Cura-${pkgver}${beta}${subbeta}-linux.AppImage"
+    "https://github.com/Ultimaker/Cura/releases/download/${pkgver}${beta}/Ultimaker-Cura-${pkgver}${beta}${subbeta}-linux-X64.AppImage"
     "https://raw.githubusercontent.com/Ultimaker/Cura/${pkgver}${beta}${subbeta}/LICENSE"
     "${_shortname}.sh"
     "cura.desktop.patch"
 )
 
-sha256sums=('40fd262da99eab779d43d01034eac798c25f349cbbb82bfd21891479e5c1796e'
+sha256sums=('80065af26cf989c336baa29d676b2acb91c7391cbcc6063e808d4c748cdb38dd'
             'f361bfaa2b63576ba829b3fb608f3f8baf5c25df51ebaba8c3554a7f3108e87d'
-            'abd972fa450409625bd54122de8a3cbb5848054afe4fc2e70e99444233037e12'
-            '82a420ff977222150fb25e6b3dafe6ab5694a958666330297e10a1b02a2a69b9')
+            'e91141376dfd6781b4704d42fcb9d9eb7683fe583ac57ecaf0a1796311413b0e'
+            'ee7ace053a8d8b6ae0fa1be2cc7c9dca9a352d8b190a5e27098acbdc65f0eb8e')
    
 prepare() {
     cd "${srcdir}"
-    chmod +x ${srcdir}/Ultimaker-Cura-${pkgver}${beta}${subbeta}-linux.AppImage
-    ${srcdir}/Ultimaker-Cura-${pkgver}${beta}${subbeta}-linux.AppImage --appimage-extract 1>>/dev/null 2>>/dev/null
+    chmod +x ${srcdir}/Ultimaker-Cura-${pkgver}${beta}${subbeta}-linux-X64.AppImage
+    ${srcdir}/Ultimaker-Cura-${pkgver}${beta}${subbeta}-linux-X64.AppImage --appimage-extract 1>>/dev/null 2>>/dev/null
     mv squashfs-root ${_shortname}
     cd ${_shortname}
     patch -Np0 < ${srcdir}/cura.desktop.patch
@@ -47,6 +46,6 @@ package() {
     install -d "${pkgdir}/usr/bin/"
     install -Dm 755 "${srcdir}/cura5.sh" "${pkgdir}/usr/bin/${_shortname}"
     install -Dm 755 "${srcdir}/cura5/cura-icon.png" "${pkgdir}/usr/share/pixmaps/cura5-icon.png"
-    install -Dm 644 "${srcdir}/cura5/cura.desktop" "${pkgdir}/usr/share/applications/cura5.desktop"
+    install -Dm 644 "${srcdir}/cura5/com.ultimaker.cura.desktop" "${pkgdir}/usr/share/applications/cura5.desktop"
     install -Dm 644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/cura.desktop.patch b/cura.desktop.patch
index 606e5d3cb047..041d50761373 100644
--- a/cura.desktop.patch
+++ b/cura.desktop.patch
@@ -1,10 +1,12 @@
---- cura.desktop
-+++ cura.desktop
-@@ -1,15 +1,57 @@
--[Desktop Entry]
+--- com.ultimaker.cura.desktop
++++ com.ultimaker.cura.desktop
+@@ -2,10 +2,58 @@
+ X-AppImage-Arch=x86_64
+ X-AppImage-Version=5.5.0
+ X-AppImage-Name=UltiMaker Cura
 -Name=UltiMaker Cura
--Name[de]=UltiMaker Cura
-+ [Desktop Entry]
+-Exec=UltiMaker-Cura
+-Icon=cura-icon.png
 +Name=UltiMaker Cura 5
 +Name[cs]=UltiMaker Cura 5
 +Name[de]=UltiMaker Cura 5
@@ -21,9 +23,9 @@
 +Name[ru]=Ультимейкер Кура 5
 +Name[tr]=UltiMaker Cura 5
 +Name[zh]=UltiMaker Cura 5
- GenericName=3D Printing Software
++GenericName=3D Printing Software
 +GenericName[cs]=3D-Tiskový Software
- GenericName[de]=3D-Druck-Software
++GenericName[de]=3D-Druck-Software
 +GenericName[es]=Software de Druck 3D
 +GenericName[fi]=3D-tulostusohjelmisto
 +GenericName[fr]=Logiciel d'impression 3D
@@ -31,15 +33,13 @@
 +GenericName[it]=Software di stampa 3D
 +GenericName[ja]=3D プリント ソフトウェア
 +GenericName[ko]=3D 프린팅 소프트웨어
- GenericName[nl]=3D-Print Software
++GenericName[nl]=3D-Print Software
 +GenericName[pl]=Oprogramowanie do drukowania 3D
 +GenericName[pt]=Software de impressão 3D
 +GenericName[ru]=Программное обеспечение для 3D-печати
 +GenericName[tr]=3D Baskı Yazılımı
 +GenericName[zh]=3D打印软件
- Comment=Cura converts 3D models into paths for a 3D printer. It prepares your print for maximum accuracy, minimum printing time and good reliability with many extra features that make your print come out great.
--Exec=UltiMaker-Cura %F
--Icon=cura-icon
++Comment=Cura converts 3D models into paths for a 3D printer. It prepares your print for maximum accuracy, minimum printing time and good reliability with many extra features that make your print come out great.
 +Comment[cs]=Cura převádí 3D modely na cesty pro 3D tiskárnu. Připraví váš tisk na maximální přesnost, minimální dobu tisku a dobrou spolehlivost s mnoha dalšími funkcemi, díky nimž bude váš tisk skvělý.
 +Comment[de]=Cura wandelt 3D-Modelle in Pfade für einen 3D-Drucker um. Es bereitet Ihren Druck auf maximale Genauigkeit, minimale Druckzeit und hohe Zuverlässigkeit mit vielen zusätzlichen Funktionen vor, die Ihren Druck großartig machen.
 +Comment[es]=Cura convierte modelos 3D en rutas para una impresora 3D. Prepara su impresión para obtener la máxima precisión, el tiempo de impresión mínimo y una buena confiabilidad con muchas características adicionales que hacen que su impresión salga genial.
@@ -57,12 +57,11 @@
 +Comment[zh]=Cura 将 3D 模型转换为 3D 打印机的路径。 它为您的打印做好准备，以实现最大的准确性、最短的打印时间和良好的可靠性，并具有许多使您的打印效果出色的额外功能。
 +Exec=/usr/bin/cura5 %F
 +Icon=cura5-icon
- Terminal=false
  Type=Application
- MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;image/bmp;image/gif;image/jpeg;image/png;text/x-gcode;application/x-amf;application/x-ply;application/x-ctm;model/vnd.collada+xml;model/gltf-binary;model/gltf+json;model/vnd.collada+xml+zip;
--Categories=Graphics;
--Keywords=3D;Printing;
+ Terminal=false
+-Categories=Utility;
+-Comment=
++MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;image/bmp;image/gif;image/jpeg;image/png;text/x-gcode;application/x-amf;application/x-ply;application/x-ctm;model/vnd.collada+xml;model/gltf-binary;model/gltf+json;model/vnd.collada+xml+zip;
 +Categories=Graphics;3DGraphics;Engineering;
 +Keywords=3D;Printing;Slicer;
- X-AppImage-Version=5.3.1
 
diff --git a/cura5.sh b/cura5.sh
index 5b53cd61284e..d8f715a71fa5 100755
--- a/cura5.sh
+++ b/cura5.sh
@@ -2,5 +2,5 @@
 export QT_QPA_PLATAFORM=xdgdesktopportal
 export QT_QPA_PLATFORMTHEME=xdgdesktopportal
 cd /opt/cura5/
-LD_PRELOAD=/usr/lib/libstdc++.so.6 QT_QPA_PLATFORMTHEME=xdgdesktopportal QT_QPA_PLATAFORM=xdgdesktopportal ./UltiMaker-Cura $@
+LD_PRELOAD=/usr/lib/libstdc++.so.6 QT_QPA_PLATFORMTHEME=xdgdesktopportal QT_QPA_PLATAFORM=xdgdesktopportal ./AppRun $@