integrate Riven-Spell chamges

4 files changed, 18 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 134473adb230..f8bb9e044e46 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bambustudio-git
 	pkgdesc = PC Software for BambuLab's 3D printers
-	pkgver = 01.04.00.17.0.gd472eb7a
+	pkgver = 01.04.00.17.35.ge32792c3
 	pkgrel = 1
 	url = https://github.com/bambulab/BambuStudio
 	arch = x86_64
@@ -26,13 +26,13 @@ pkgbase = bambustudio-git
 	conflicts = BambuStudio
 	source = git+https://github.com/bambulab/BambuStudio.git
 	source = BambuStudio.cpp.patch
-	source = TreeSupport.cpp.patch
 	source = CMakeLists.txt.patch
+	source = wxWidgets.cmake.patch
 	source = bambu-studio.sh
 	sha512sums = SKIP
 	sha512sums = 419e7ffb8044531a1c78cd191a96c11f719b439afce674f7e31d1d2e0dc57ecc03cea27ab4ad5ee6522606630fd59ac1745b9a1b787db14893561a4495806117
-	sha512sums = 674fc00a73b2e5997e5f3dcf74299a2ab5dfac5114247f8b6b0c87bf14f289413ec668a39063ef10a557cc2c45ca08e52a7b1714a1f9f69763edf3a7faa1d01c
-	sha512sums = 8682e3b11271ae09587298f4737b987a589db05e049c3f4699951d710c6263e6016ee2287b050143336b9b24d70d206a1d7c5396bf74a5ccf092af6e1491ff54
+	sha512sums = 04d46a8b3ffe459ff19e94a2545f1e7b2cca336d3a3688b7aefbafbfe341301009cf61b59c1901629bbc9919e0a5e0462fb3346d5b72d3264b03e9175fa54c5a
+	sha512sums = 4dea14df6ced2f6d0038b003f845057ef37e3be9de39f505d96bdeb3082b91aeb8fb349207554d2c7074f0f1a2b9c7285f59ecff7938ed164b57e486b43bf835
 	sha512sums = e3cb1b072754ae6443fa136fffa263761b5e4e3da5dca1e91b7c4d577daaf01afa0affde04f1355fc404fcd336852db4ce8dc57938833f864346a0b17c12d6d6
 
 pkgname = bambustudio-git
diff --git a/CMakeLists.txt.patch b/CMakeLists.txt.patch
index 712cc5cdb757..3f1c5ae703c8 100644
--- a/CMakeLists.txt.patch
+++ b/CMakeLists.txt.patch
@@ -13,12 +13,3 @@
          PATTERN "*/udev" EXCLUDE
      )
      install(FILES src/platform/unix/BambuStudio.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
-@@ -701,7 +703,7 @@
-             DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME BambuStudio.png
-         )
-     endforeach()
--    install(DIRECTORY ${SLIC3R_RESOURCES_DIR}/udev/ DESTINATION lib/udev/rules.d)
-+    # install(DIRECTORY ${SLIC3R_RESOURCES_DIR}/udev/ DESTINATION lib/udev/rules.d)
- elseif (CMAKE_MACOSX_BUNDLE)
-     install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/BambuStudio.app/Contents/resources")
- else ()
diff --git a/PKGBUILD b/PKGBUILD
index 2edc67a60042..055e1b6992bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexander Jacocks <alexander@redhat.com>
 
 pkgname="bambustudio-git"
-pkgver=01.04.00.17.0.gd472eb7a
+pkgver=01.04.00.17.35.ge32792c3
 pkgrel=1
 pkgdesc="PC Software for BambuLab's 3D printers"
 arch=('x86_64')
@@ -14,14 +14,14 @@ conflicts=("BambuStudio")
 source=(
   'git+https://github.com/bambulab/BambuStudio.git'
   'BambuStudio.cpp.patch'
-  'TreeSupport.cpp.patch'
   'CMakeLists.txt.patch'
+  'wxWidgets.cmake.patch'
   'bambu-studio.sh'
   )
 sha512sums=('SKIP'
             '419e7ffb8044531a1c78cd191a96c11f719b439afce674f7e31d1d2e0dc57ecc03cea27ab4ad5ee6522606630fd59ac1745b9a1b787db14893561a4495806117'
-            '674fc00a73b2e5997e5f3dcf74299a2ab5dfac5114247f8b6b0c87bf14f289413ec668a39063ef10a557cc2c45ca08e52a7b1714a1f9f69763edf3a7faa1d01c'
-            '8682e3b11271ae09587298f4737b987a589db05e049c3f4699951d710c6263e6016ee2287b050143336b9b24d70d206a1d7c5396bf74a5ccf092af6e1491ff54'
+            '04d46a8b3ffe459ff19e94a2545f1e7b2cca336d3a3688b7aefbafbfe341301009cf61b59c1901629bbc9919e0a5e0462fb3346d5b72d3264b03e9175fa54c5a'
+            '4dea14df6ced2f6d0038b003f845057ef37e3be9de39f505d96bdeb3082b91aeb8fb349207554d2c7074f0f1a2b9c7285f59ecff7938ed164b57e486b43bf835'
             'e3cb1b072754ae6443fa136fffa263761b5e4e3da5dca1e91b7c4d577daaf01afa0affde04f1355fc404fcd336852db4ce8dc57938833f864346a0b17c12d6d6')
 
 pkgver() {
@@ -33,8 +33,6 @@ pkgver() {
 prepare() {
   # 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/wxWidgets.cmake.patch b/wxWidgets.cmake.patch
new file mode 100644
index 000000000000..11180598a57d
--- /dev/null
+++ b/wxWidgets.cmake.patch
@@ -0,0 +1,10 @@
+--- BambuStudio/deps/wxWidgets/wxWidgets.cmake	2022-12-21 18:44:27.746440442 -0800
++++ BambuStudio/deps/wxWidgets/wxWidgets.cmake.new	2022-12-21 18:37:24.393095747 -0800
+@@ -49,6 +49,7 @@
+         -DwxUSE_LIBJPEG=sys
+         -DwxUSE_LIBTIFF=sys
+         -DwxUSE_EXPAT=sys
++	-DwxUSE_GLCANVAS_EGL=OFF
+ )
+ 
+ if (MSVC)