PKGBUILD.patch

diff --git a/0001-Fix-format-string.patch b/0001-Fix-format-string.patch
deleted file mode 100644
index 37ab10c..0000000
--- a/0001-Fix-format-string.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0bd5f4f6e6548a63a60356f09c533f5ddada8990 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
-Date: Sat, 11 Mar 2023 12:20:58 +0100
-Subject: [PATCH] Fix format string
-
----
- src/slic3r/GUI/ImGuiWrapper.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp
-index 6b85af966..d48b91522 100644
---- a/src/slic3r/GUI/ImGuiWrapper.cpp
-+++ b/src/slic3r/GUI/ImGuiWrapper.cpp
-@@ -460,7 +460,7 @@ bool ImGuiWrapper::button(const wxString &label, const wxString& tooltip)
- 
-     if (!tooltip.IsEmpty() && ImGui::IsItemHovered()) {
-         auto tooltip_utf8 = into_u8(tooltip);
--        ImGui::SetTooltip(tooltip_utf8.c_str());
-+        ImGui::SetTooltip("%s", tooltip_utf8.c_str());
-     }
- 
-     return ret;
--- 
-2.39.2
-
diff --git a/0001-pr-10499.patch b/0001-pr-10499.patch
new file mode 100644
index 0000000..a47cc4d
--- /dev/null
+++ b/0001-pr-10499.patch
@@ -0,0 +1,85 @@
+diff --git a/deps/OpenEXR/OpenEXR.cmake b/deps/OpenEXR/OpenEXR.cmake
+index 046223fed9..094965d042 100644
+--- a/deps/OpenEXR/OpenEXR.cmake
++++ b/deps/OpenEXR/OpenEXR.cmake
+@@ -4,6 +4,7 @@ prusaslicer_add_cmake_project(OpenEXR
+     URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de
+     DEPENDS ${ZLIB_PKG}
+     GIT_TAG v2.5.5
++    PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_LIST_DIR}/OpenEXR.patch
+     CMAKE_ARGS
+         -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+         -DBUILD_TESTING=OFF 
+@@ -14,4 +15,4 @@ prusaslicer_add_cmake_project(OpenEXR
+ 
+ if (MSVC)
+     add_debug_dep(dep_OpenEXR)
+-endif ()
+\ No newline at end of file
++endif ()
+diff --git a/deps/OpenEXR/OpenEXR.patch b/deps/OpenEXR/OpenEXR.patch
+new file mode 100644
+index 0000000000..22adbd2778
+--- /dev/null
++++ b/deps/OpenEXR/OpenEXR.patch
+@@ -0,0 +1,36 @@
++diff --git a/OpenEXR/IlmImf/ImfDwaCompressor.cpp b/OpenEXR/IlmImf/ImfDwaCompressor.cpp
++index 59d1d5d1..585a3e65 100644
++--- a/OpenEXR/IlmImf/ImfDwaCompressor.cpp
+++++ b/OpenEXR/IlmImf/ImfDwaCompressor.cpp
++@@ -159,6 +159,7 @@
++ #include <limits>
++ 
++ #include <cstddef>
+++#include <cstdint>
++ 
++ 
++ // Windows specific addition to prevent the indirect import of the redefined min/max macros
++diff --git a/OpenEXR/IlmImf/ImfHuf.cpp b/OpenEXR/IlmImf/ImfHuf.cpp
++index 271849b7..165fac58 100644
++--- a/OpenEXR/IlmImf/ImfHuf.cpp
+++++ b/OpenEXR/IlmImf/ImfHuf.cpp
++@@ -53,6 +53,7 @@
++ #include <cstring>
++ #include <cassert>
++ #include <algorithm>
+++#include <cstdint>
++ 
++ 
++ using namespace std;
++diff --git a/OpenEXR/IlmImf/ImfMisc.cpp b/OpenEXR/IlmImf/ImfMisc.cpp
++index d2c84787..4b487940 100644
++--- a/OpenEXR/IlmImf/ImfMisc.cpp
+++++ b/OpenEXR/IlmImf/ImfMisc.cpp
++@@ -40,6 +40,7 @@
++ //
++ //-----------------------------------------------------------------------------
++ 
+++#include <cstdint>
++ #include <ImfMisc.h>
++ #include <ImfHeader.h>
++ #include <ImfAttribute.h>
+diff --git a/src/libslic3r/ExtrusionRole.hpp b/src/libslic3r/ExtrusionRole.hpp
+index 5952d3fc56..986c139a24 100644
+--- a/src/libslic3r/ExtrusionRole.hpp
++++ b/src/libslic3r/ExtrusionRole.hpp
+@@ -5,6 +5,7 @@
+ 
+ #include <string>
+ #include <string_view>
++#include <cstdint>
+ 
+ namespace Slic3r {
+ 
+diff --git a/src/libslic3r/PNGReadWrite.hpp b/src/libslic3r/PNGReadWrite.hpp
+index 01e1f47450..399c622438 100644
+--- a/src/libslic3r/PNGReadWrite.hpp
++++ b/src/libslic3r/PNGReadWrite.hpp
+@@ -4,6 +4,7 @@
+ #include <vector>
+ #include <string>
+ #include <istream>
++#include <cstdint>
+ 
+ namespace Slic3r { namespace png {
+ 
diff --git a/PKGBUILD b/PKGBUILD
index e10113d..b7b2d34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Salamandar <felix@piedallu.me>
 
 pkgname=prusa-slicer-git
-pkgver=2.6.0.alpha5
+pkgver=2.6.0.beta2
 pkgrel=1
 pkgdesc='G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)'
 arch=('i686' 'x86_64' 'armv6' 'armv6h' 'armv7h')
@@ -34,11 +34,11 @@ depends=(
 
 source=(
     "git+${url}"
-    '0001-Fix-format-string.patch'
+    "0001-pr-10499.patch"
 )
 sha256sums=(
     'SKIP'
-    'b78fa23a5bccf0a1064f20786bfaede97f0691b6ebb882a698bedc0b3421ec72'
+    'SKIP'
 )
 conflicts=('prusa-slicer')
 
@@ -49,7 +49,7 @@ pkgver() {
 prepare() {
     cd "PrusaSlicer"
     # Fix build
-    patch -p1 < "$srcdir/0001-Fix-format-string.patch"
+    patch -p1 < "$srcdir/0001-pr-10499.patch"
 
     rm "$srcdir/PrusaSlicer/cmake/modules/FindEXPAT.cmake"
 }
@@ -107,6 +107,9 @@ check() {
 package () {
     DESTDIR="$pkgdir" cmake --install build
 
+    # This is provided by slicer-udev
+    rm "${pkgdir}/usr/lib/udev/rules.d/90-3dconnexion.rules"
+
     # Patch desktop files
     for i in PrusaGcodeviewer PrusaSlicer; do
         sed -i '/^Name=/ s/$/ (Git version)/' "${pkgdir}/usr/share/applications/$i.desktop"