up version 5.4.0-beta.1

5 files changed, 33 insertions, 197 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 988f76f403a5..0fca74a0ff5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cura-5-beta-bin
 	pkgdesc = Cura is an open source slicing application for 3D printers (include betaversion)
-	pkgver = 5.2.1
-	pkgrel = 2
+	pkgver = 5.4.0
+	pkgrel = 0
 	url = https://ultimaker.com/software/ultimaker-cura
 	arch = x86_64
 	license = LGPL3
@@ -14,13 +14,13 @@ 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.2.1/Ultimaker-Cura-5.2.1-linux.AppImage
-	source = https://raw.githubusercontent.com/Ultimaker/Cura/5.2.1/LICENSE
+	source = https://github.com/Ultimaker/Cura/releases/download/5.4.0-beta.1/Ultimaker-Cura-5.4.0-beta.1-linux.AppImage
+	source = https://raw.githubusercontent.com/Ultimaker/Cura/5.4.0/LICENSE
 	source = cura5.sh
 	source = cura.desktop.patch
-	sha256sums = 0da9e05892492763f6aa056cb470c7d07658920020ad1322655c44e4fccbe7fa
+	sha256sums = fe02756c5c79fa58e63f7a50aab0074534ca9f87ea79f897c2381198bb69315c
 	sha256sums = f361bfaa2b63576ba829b3fb608f3f8baf5c25df51ebaba8c3554a7f3108e87d
-	sha256sums = e74fde4eda76fdc3c7f3f3ffdc2190c9b2d686ae1c49f0e11ce85c6161658685
-	sha256sums = 076fee81d82b5ae55e44d230adef79cf944f51befb76f30074195ac18dd7e16a
+	sha256sums = abd972fa450409625bd54122de8a3cbb5848054afe4fc2e70e99444233037e12
+	sha256sums = 82a420ff977222150fb25e6b3dafe6ab5694a958666330297e10a1b02a2a69b9
 
 pkgname = cura-5-beta-bin
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 07b1d92c0e9e..000000000000
--- a/LICENSE
+++ /dev/null
@@ -1,165 +0,0 @@
-    GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 3c4b11f0a452..adbae82ec9f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,10 @@
 pkgname=cura-5-beta-bin
 _pkgname=cura-5-beta-bin
 _shortname=cura5
-pkgver=5.2.1
-beta=
+pkgver=5.4.0
+beta=-beta.1
 subbeta=
-pkgrel=2
+pkgrel=0
 pkgdesc='Cura is an open source slicing application for 3D printers (include betaversion)'
 arch=('x86_64')
 url="https://ultimaker.com/software/ultimaker-cura"
@@ -25,10 +25,10 @@ source=(
     "cura.desktop.patch"
 )
 
-sha256sums=('0da9e05892492763f6aa056cb470c7d07658920020ad1322655c44e4fccbe7fa'
+sha256sums=('fe02756c5c79fa58e63f7a50aab0074534ca9f87ea79f897c2381198bb69315c'
             'f361bfaa2b63576ba829b3fb608f3f8baf5c25df51ebaba8c3554a7f3108e87d'
-            'e74fde4eda76fdc3c7f3f3ffdc2190c9b2d686ae1c49f0e11ce85c6161658685'
-            '076fee81d82b5ae55e44d230adef79cf944f51befb76f30074195ac18dd7e16a')
+            'abd972fa450409625bd54122de8a3cbb5848054afe4fc2e70e99444233037e12'
+            '82a420ff977222150fb25e6b3dafe6ab5694a958666330297e10a1b02a2a69b9')
    
 prepare() {
     cd "${srcdir}"
diff --git a/cura.desktop.patch b/cura.desktop.patch
index a0d18dcedeac..606e5d3cb047 100644
--- a/cura.desktop.patch
+++ b/cura.desktop.patch
@@ -1,25 +1,26 @@
 --- cura.desktop
 +++ cura.desktop
 @@ -1,15 +1,57 @@
- [Desktop Entry]
--Name=Ultimaker Cura
--Name[de]=Ultimaker Cura
-+Name=Ultimaker Cura 5
-+Name[cs]=Ultimaker Cura 5
-+Name[de]=Ultimaker Cura 5
-+Name[es]=Ultimaker Cura 5
-+Name[fi]=Ultimaker Cura 5
-+Name[fr]=Ultimaker Cura 5
-+Name[hu]=Ultimaker Cura 5
-+Name[it]=Ultimaker Cura 5
+-[Desktop Entry]
+-Name=UltiMaker Cura
+-Name[de]=UltiMaker Cura
++ [Desktop Entry]
++Name=UltiMaker Cura 5
++Name[cs]=UltiMaker Cura 5
++Name[de]=UltiMaker Cura 5
++Name[es]=UltiMaker Cura 5
++Name[fi]=UltiMaker Cura 5
++Name[fr]=UltiMaker Cura 5
++Name[hu]=UltiMaker Cura 5
++Name[it]=UltiMaker Cura 5
 +Name[ja]=アルティメーカーキュラ5
 +Name[ko]=얼티메이커 큐라 5
-+Name[nl]=Ultimaker Cura 5
-+Name[pl]=Ultimaker Cura 5
-+Name[pt]=Ultimaker Cura 5
++Name[nl]=UltiMaker Cura 5
++Name[pl]=UltiMaker Cura 5
++Name[pt]=UltiMaker Cura 5
 +Name[ru]=Ультимейкер Кура 5
-+Name[tr]=Ultimaker Cura 5
-+Name[zh]=Ultimaker Cura 5
++Name[tr]=UltiMaker Cura 5
++Name[zh]=UltiMaker Cura 5
  GenericName=3D Printing Software
 +GenericName[cs]=3D-Tiskový Software
  GenericName[de]=3D-Druck-Software
@@ -37,7 +38,7 @@
 +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
+-Exec=UltiMaker-Cura %F
 -Icon=cura-icon
 +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.
@@ -63,5 +64,5 @@
 -Keywords=3D;Printing;
 +Categories=Graphics;3DGraphics;Engineering;
 +Keywords=3D;Printing;Slicer;
- X-AppImage-Version=5.1.1
+ X-AppImage-Version=5.3.1
 
diff --git a/cura5.sh b/cura5.sh
index a9eca0db52f4..5b53cd61284e 100755
--- a/cura5.sh
+++ b/cura5.sh
@@ -2,5 +2,5 @@
 export QT_QPA_PLATAFORM=xdgdesktopportal
 export QT_QPA_PLATFORMTHEME=xdgdesktopportal
 cd /opt/cura5/
-QT_QPA_PLATFORM=xcb 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 ./UltiMaker-Cura $@