Update to 5.5.0

6 files changed, 32 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a653140b6850..fa3848c9468a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cura-bin
 	pkgdesc = State-of-the-art slicer app to prepare your 3D models for your 3D printer
-	pkgver = 5.4.0
+	pkgver = 5.5.0
 	pkgrel = 1
 	url = https://ultimaker.com/software/ultimaker-cura
 	arch = x86_64
@@ -11,11 +11,11 @@ pkgbase = cura-bin
 	provides = cura
 	conflicts = cura
 	options = !strip
-	source = https://github.com/Ultimaker/Cura/releases/download/5.4.0/UltiMaker-Cura-5.4.0-linux-modern.AppImage
-	source = AppRun-UltiMaker-Cura.patch
-	source = AppRun-CuraEngine.patch
-	sha512sums = e1a174f79b5b67359126b607aabbab57eba03cf265d443608cee884e2ed18d49ccd0ebfe4fa5178e0eeb7f831e732eaf9ebd39d2ff205f5d8104cb7d783ec43a
-	sha512sums = bf5fa289d8f4193e186a0d8d7e5dc5e902789674bf6c2a068655d639f1be1e7c9d9757c4709801f10c86501c6722a94a97051f662f6d1d85294d1cba16145f63
-	sha512sums = 5a005722d6b97abe9b8fce1aa74877b5be75ec58f03afb3049d4a4df431caf4e8aba825716696f010557ac1682bfecc9e4133297c3280528af4be2e30b560860
+	source = https://github.com/Ultimaker/Cura/releases/download/5.5.0/UltiMaker-Cura-5.5.0-linux-X64.AppImage
+	source = AppRun.env.patch
+	source = UltiMaker-Cura
+	sha512sums = e8f16496e862b8a4c20455fa24c250efdcf1f5b35f94859d187e02ca8d574b42287683d6919328a62c0d1d37ac2f078303b73714228b9f210245530a459e7700
+	sha512sums = f38418120edb77ae419f40998ad64f13dd3535e2b74580ce4e6a21dd04268834bb4a6932c49fa4adbf1b0ee8c127de10f331a7aa6ce889a861e8500288d747bc
+	sha512sums = 7840e0825d36bcc524f7ed8d10c94d545a276fe9772643e607fc4ca95f4b49a15c8f058add15bb3dbf134281d3b807fae0f76156623070dac1643e652f84bcae
 
 pkgname = cura-bin
diff --git a/AppRun-CuraEngine.patch b/AppRun-CuraEngine.patch
deleted file mode 100644
index d142f9267216..000000000000
--- a/AppRun-CuraEngine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/AppRun b/AppRun
-index fa2c73f..7466a54 100755
---- a/AppRun
-+++ b/AppRun
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
--scriptdir=$(dirname $0)
-+scriptdir='/opt/ultimaker-cura'
- 
- export PYTHONPATH="$scriptdir/lib/python3.10"
- export LD_LIBRARY_PATH=$scriptdir
-@@ -17,9 +17,4 @@ export OPENSSL_CONF="$scriptdir/openssl.cnf"
- # unset `QT_STYLE_OVERRIDE` as a precaution
- unset QT_STYLE_OVERRIDE
- 
--BIN=`basename "$ARGV0" .AppImage`
--if [ -f $scriptdir/$BIN ]; then
--    $scriptdir/$BIN "$@"
--else
--    $scriptdir/UltiMaker-Cura "$@"
--fi;
-+$scriptdir/CuraEngine "$@"
diff --git a/AppRun-UltiMaker-Cura.patch b/AppRun-UltiMaker-Cura.patch
deleted file mode 100644
index 576842cab6fb..000000000000
--- a/AppRun-UltiMaker-Cura.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/AppRun b/AppRun
-index 14ee0e4..3c12d02 100755
---- a/AppRun
-+++ b/AppRun
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
--scriptdir=$(dirname $0)
-+scriptdir='/opt/ultimaker-cura'
- 
- export PYTHONPATH="$scriptdir/lib/python3.10"
- export LD_LIBRARY_PATH=$scriptdir
diff --git a/AppRun.env.patch b/AppRun.env.patch
new file mode 100644
index 000000000000..b1ff2f5616bb
--- /dev/null
+++ b/AppRun.env.patch
@@ -0,0 +1,10 @@
+diff --git a/AppRun.env b/AppRun.env
+index 630c8bf1..446501b1 100644
+--- a/AppRun.env
++++ b/AppRun.env
+@@ -1,4 +1,4 @@
+-APPDIR=$ORIGIN
++APPDIR=/opt/ultimaker-cura
+ APPIMAGE_UUID=5AZDa8E
+ APPDIR_EXEC_PATH=$APPDIR/UltiMaker-Cura
+ APPDIR_EXEC_ARGS=$@
diff --git a/PKGBUILD b/PKGBUILD
index ccdf0fabaab8..f2e22c65f192 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 _pkgname=cura
 pkgname=$_pkgname-bin
-pkgver=5.4.0
+pkgver=5.5.0
 pkgrel=1
 pkgdesc='State-of-the-art slicer app to prepare your 3D models for your 3D printer'
 url='https://ultimaker.com/software/ultimaker-cura'
@@ -17,32 +17,30 @@ conflicts=($_pkgname)
 options=('!strip')
 
 source=(
-  "https://github.com/Ultimaker/Cura/releases/download/${pkgver}/UltiMaker-Cura-${pkgver}-linux-modern.AppImage"
-  'AppRun-UltiMaker-Cura.patch'
-  'AppRun-CuraEngine.patch'
+  "https://github.com/Ultimaker/Cura/releases/download/${pkgver}/UltiMaker-Cura-${pkgver}-linux-X64.AppImage"
+  'AppRun.env.patch'
+  'UltiMaker-Cura'
 )
 
 sha512sums=(
-  'e1a174f79b5b67359126b607aabbab57eba03cf265d443608cee884e2ed18d49ccd0ebfe4fa5178e0eeb7f831e732eaf9ebd39d2ff205f5d8104cb7d783ec43a'
-  'bf5fa289d8f4193e186a0d8d7e5dc5e902789674bf6c2a068655d639f1be1e7c9d9757c4709801f10c86501c6722a94a97051f662f6d1d85294d1cba16145f63'
-  '5a005722d6b97abe9b8fce1aa74877b5be75ec58f03afb3049d4a4df431caf4e8aba825716696f010557ac1682bfecc9e4133297c3280528af4be2e30b560860'
+  'e8f16496e862b8a4c20455fa24c250efdcf1f5b35f94859d187e02ca8d574b42287683d6919328a62c0d1d37ac2f078303b73714228b9f210245530a459e7700'
+  'f38418120edb77ae419f40998ad64f13dd3535e2b74580ce4e6a21dd04268834bb4a6932c49fa4adbf1b0ee8c127de10f331a7aa6ce889a861e8500288d747bc'
+  '7840e0825d36bcc524f7ed8d10c94d545a276fe9772643e607fc4ca95f4b49a15c8f058add15bb3dbf134281d3b807fae0f76156623070dac1643e652f84bcae'
 )
 
 prepare() {
   [[ -d squashfs-root ]] && rm -rf squashfs-root
-  chmod 755 UltiMaker-Cura-${pkgver}-linux-modern.AppImage
-  ./UltiMaker-Cura-${pkgver}-linux-modern.AppImage --appimage-extract
-  patch -Np1 -F5 -o UltiMaker-Cura squashfs-root/AppRun AppRun-UltiMaker-Cura.patch
-  patch -Np1 -F5 -o CuraEngine squashfs-root/AppRun AppRun-CuraEngine.patch
+  chmod 755 UltiMaker-Cura-${pkgver}-linux-X64.AppImage
+  ./UltiMaker-Cura-${pkgver}-linux-X64.AppImage --appimage-extract
   hardlink --content --maximize squashfs-root
+  cd squashfs-root
+  patch -p1 < ../AppRun.env.patch
 }
 
 package() {
   install -Dm755 UltiMaker-Cura "$pkgdir/usr/bin/UltiMaker-Cura"
   ln -s /usr/bin/UltiMaker-Cura "$pkgdir/usr/bin/cura"
-  install -Dm755 CuraEngine "$pkgdir/usr/bin/CuraEngine"
-  ln -s /usr/bin/CuraEngine "$pkgdir/usr/bin/cura-engine"
-  install -Dm644 squashfs-root/cura.desktop "$pkgdir/usr/share/applications/cura.desktop"
+  install -Dm644 squashfs-root/com.ultimaker.cura.desktop "$pkgdir/usr/share/applications/com.ultimaker.cura.desktop"
   install -Dm644 squashfs-root/cura-icon.png "$pkgdir/usr/share/pixmaps/cura-icon.png"
   install -dm755 "$pkgdir/opt"
   mv squashfs-root "$pkgdir/opt/ultimaker-cura"
diff --git a/UltiMaker-Cura b/UltiMaker-Cura
new file mode 100755
index 000000000000..2ddcc00bf086
--- /dev/null
+++ b/UltiMaker-Cura
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+/opt/ultimaker-cura/AppRun "$@"