bump to new v1.4

3 files changed, 27 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8206787fc0d7..7be7932e427b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bambustudio
 	pkgdesc = PC Software for BambuLab's 3D printers
-	pkgver = 1.3.0.12
+	pkgver = 01.04.00.17
 	pkgrel = 1
 	url = https://github.com/bambulab/BambuStudio
 	arch = x86_64
@@ -24,12 +24,14 @@ pkgbase = bambustudio
 	depends = harmonyos-sans-git
 	provides = BambuStudio
 	conflicts = BambuStudio
-	source = https://github.com/bambulab/BambuStudio/archive/refs/tags/v1.3.0.12.tar.gz
+	source = https://github.com/bambulab/BambuStudio/archive/refs/tags/v01.04.00.17.tar.gz
 	source = BambuStudio.cpp.patch
+	source = TreeSupport.cpp.patch
 	source = CMakeLists.txt.patch
 	source = bambu-studio.sh
-	sha512sums = 09b7f84a2bb670e2645711850d7ea33a7e09855cfb180aae88208247142217ce222df1773a42fffc876f66b3a7468a33ad99786727f32692827e8025ffeb8af0
+	sha512sums = f4ef1212163e11373eca317eafafcc324a5fdb41a8cba3da17fb166bbea1a27a55a8aa1f3810648131c1235b681f8b1e8c8cf784bccf144620a67fe467f77689
 	sha512sums = 419e7ffb8044531a1c78cd191a96c11f719b439afce674f7e31d1d2e0dc57ecc03cea27ab4ad5ee6522606630fd59ac1745b9a1b787db14893561a4495806117
+	sha512sums = 674fc00a73b2e5997e5f3dcf74299a2ab5dfac5114247f8b6b0c87bf14f289413ec668a39063ef10a557cc2c45ca08e52a7b1714a1f9f69763edf3a7faa1d01c
 	sha512sums = 8682e3b11271ae09587298f4737b987a589db05e049c3f4699951d710c6263e6016ee2287b050143336b9b24d70d206a1d7c5396bf74a5ccf092af6e1491ff54
 	sha512sums = e3cb1b072754ae6443fa136fffa263761b5e4e3da5dca1e91b7c4d577daaf01afa0affde04f1355fc404fcd336852db4ce8dc57938833f864346a0b17c12d6d6
 
diff --git a/PKGBUILD b/PKGBUILD
index a80c0cd689a0..c4e54cb06423 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexander Jacocks <alexander@redhat.com>
 
 pkgname="bambustudio"
-pkgver=1.3.0.12
+pkgver=01.04.00.17
 pkgrel=1
 pkgdesc="PC Software for BambuLab's 3D printers"
 arch=('x86_64')
@@ -14,11 +14,13 @@ conflicts=("BambuStudio")
 source=(
   "https://github.com/bambulab/BambuStudio/archive/refs/tags/v${pkgver}.tar.gz"
   'BambuStudio.cpp.patch'
+  'TreeSupport.cpp.patch'
   'CMakeLists.txt.patch'
   'bambu-studio.sh'
   )
-sha512sums=('09b7f84a2bb670e2645711850d7ea33a7e09855cfb180aae88208247142217ce222df1773a42fffc876f66b3a7468a33ad99786727f32692827e8025ffeb8af0'
+sha512sums=('f4ef1212163e11373eca317eafafcc324a5fdb41a8cba3da17fb166bbea1a27a55a8aa1f3810648131c1235b681f8b1e8c8cf784bccf144620a67fe467f77689'
             '419e7ffb8044531a1c78cd191a96c11f719b439afce674f7e31d1d2e0dc57ecc03cea27ab4ad5ee6522606630fd59ac1745b9a1b787db14893561a4495806117'
+            '674fc00a73b2e5997e5f3dcf74299a2ab5dfac5114247f8b6b0c87bf14f289413ec668a39063ef10a557cc2c45ca08e52a7b1714a1f9f69763edf3a7faa1d01c'
             '8682e3b11271ae09587298f4737b987a589db05e049c3f4699951d710c6263e6016ee2287b050143336b9b24d70d206a1d7c5396bf74a5ccf092af6e1491ff54'
             'e3cb1b072754ae6443fa136fffa263761b5e4e3da5dca1e91b7c4d577daaf01afa0affde04f1355fc404fcd336852db4ce8dc57938833f864346a0b17c12d6d6')
 
@@ -27,6 +29,8 @@ prepare() {
   ln -sf BambuStudio-${pkgver} BambuStudio
   # fix broken udev install reference
   patch -p0 < "$srcdir/CMakeLists.txt.patch"
+  # remove invalid UTF-8 chars
+  patch -p0 < "$srcdir/TreeSupport.cpp.patch"
 }
 
 build() {
diff --git a/TreeSupport.cpp.patch b/TreeSupport.cpp.patch
new file mode 100644
index 000000000000..5951fbc990c1
--- /dev/null
+++ b/TreeSupport.cpp.patch
@@ -0,0 +1,16 @@
+--- BambuStudio/src/libslic3r/TreeSupport.cpp.orig	2022-12-15 10:33:19.000000000 -0500
++++ BambuStudio/src/libslic3r/TreeSupport.cpp	2022-12-16 16:16:11.261961293 -0500
+@@ -2057,10 +2057,10 @@
+ 
+                     const Node& node = *p_node;
+                     ExPolygon area;
+-                    // 直接从overhang多边形生成，如果�?
++                    // 直接从overhang多边形生成，如果?
+                     // 1) 是混合支撑里的普通部分，
+-                    // 2) 启用了顶部接触层�?
+-                    // 3) 是顶部空�?
++                    // 2) 启用了顶部接触层?
++                    // 3) 是顶部空?
+                     if (node.type == ePolygon || (top_interface_layers>0 &&node.support_roof_layers_below > 0) || node.distance_to_top<0) {
+                         if (node.overhang->contour.size() > 100 || node.overhang->holes.size()>1)
+                             area = *node.overhang;