diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix index db86a8c408151..7e5c1f48ccd42 100644 --- a/pkgs/applications/misc/bambu-studio/orca-slicer.nix +++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -5,23 +5,20 @@ }: bambu-studio.overrideAttrs ( finalAttrs: previousAttrs: { - version = "2.1.1"; + version = "2.2.0"; pname = "orca-slicer"; src = fetchFromGitHub { owner = "SoftFever"; repo = "OrcaSlicer"; rev = "v${finalAttrs.version}"; - hash = "sha256-7fusdSYpZb4sYl5L/+81PzMd42Nsejj+kCZsq0f7eIk="; + hash = "sha256-h+cHWhrp894KEbb3ic2N4fNTn13WlOSYoMsaof0RvRI="; }; - patches =[ - # FIXME: only required for 2.1.1, can be removed in the next version - ./patches/0002-fix-build-for-gcc-13.diff + patches = [ # Fix for webkitgtk linking ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch - # Fix build with cgal-5.6.1+ - ./patches/meshboolean-const.patch + ./patches/dont-link-opencv-world-orca.patch ]; diff --git a/pkgs/applications/misc/bambu-studio/patches/0002-fix-build-for-gcc-13.diff b/pkgs/applications/misc/bambu-studio/patches/0002-fix-build-for-gcc-13.diff deleted file mode 100644 index cc832bb107291..0000000000000 --- a/pkgs/applications/misc/bambu-studio/patches/0002-fix-build-for-gcc-13.diff +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp -index 11a36dfabc..77a44e699b 100644 ---- a/src/slic3r/Utils/Http.cpp -+++ b/src/slic3r/Utils/Http.cpp -@@ -88,9 +88,13 @@ std::mutex g_mutex; - - struct form_file - { -- fs::ifstream ifs; -+ fs::ifstream ifs; - boost::filesystem::ifstream::off_type init_offset; - size_t content_length; -+ -+ form_file(fs::path const& p, const boost::filesystem::ifstream::off_type offset, const size_t content_length) -+ : ifs(p, std::ios::in | std::ios::binary), init_offset(offset), content_length(content_length) -+ {} - }; - - struct Http::priv -@@ -314,7 +318,7 @@ void Http::priv::form_add_file(const char *name, const fs::path &path, const cha - filename = path.string().c_str(); - } - -- form_files.emplace_back(form_file{{path, std::ios::in | std::ios::binary}, offset, length}); -+ form_files.emplace_back(path, offset, length); - auto &f = form_files.back(); - size_t size = length; - if (length == 0) { -@@ -381,7 +385,7 @@ void Http::priv::set_put_body(const fs::path &path) - boost::system::error_code ec; - boost::uintmax_t filesize = file_size(path, ec); - if (!ec) { -- putFile = std::make_unique(form_file{{path, std::ios_base::binary | std::ios_base::in}, 0, 0}); -+ putFile = std::make_unique(path, 0, 0); - ::curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L); - ::curl_easy_setopt(curl, CURLOPT_READDATA, (void *) (putFile.get())); - ::curl_easy_setopt(curl, CURLOPT_INFILESIZE, filesize); -