commit: e59e228b984a90eb27691d00d21a5abfe540576e Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Sun May 18 09:11:52 2025 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun May 18 09:12:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e59e228b
media-gfx/prusaslicer: fixed compilation with boost 1.88 Closes: https://bugs.gentoo.org/955553 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../files/prusaslicer-2.8.1-boost-1.87.patch | 40 +++++++++------------- .../files/prusaslicer-2.9.0-arrange-static.patch | 9 ----- .../files/prusaslicer-2.9.2-boost-1.88.patch | 39 +++++++++++++++++++++ media-gfx/prusaslicer/prusaslicer-2.8.1-r2.ebuild | 1 + media-gfx/prusaslicer/prusaslicer-2.9.2-r1.ebuild | 1 + media-gfx/prusaslicer/prusaslicer-9999.ebuild | 1 + 6 files changed, 58 insertions(+), 33 deletions(-) diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-boost-1.87.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-boost-1.87.patch index 7666c26800ae..3dae923d06a5 100644 --- a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-boost-1.87.patch +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-boost-1.87.patch @@ -1,9 +1,8 @@ https://bugs.gentoo.org/946495 https://github.com/prusa3d/PrusaSlicer/issues/13799 -diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.cpp PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.cpp ---- PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.cpp 2024-12-21 11:52:03.612595066 +0100 -+++ PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.cpp 2024-12-21 12:34:03.859507724 +0100 +--- PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.cpp ++++ PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.cpp @@ -113,7 +113,7 @@ GCodeSender::connect(std::string devname this->io.post(boost::bind(&GCodeSender::do_read, this)); @@ -13,9 +12,8 @@ diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSend this->background_thread.swap(t); // always send a M105 to check for connection because firmware might be silent on connect -diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.hpp PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.hpp ---- PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.hpp 2024-12-21 11:52:03.612595066 +0100 -+++ PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.hpp 2024-12-21 12:34:26.163427521 +0100 +--- PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.hpp ++++ PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.hpp @@ -40,7 +40,7 @@ class GCodeSender : private boost::nonco void reset(); @@ -25,9 +23,8 @@ diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSend asio::serial_port serial; boost::thread background_thread; boost::asio::streambuf read_buffer, write_buffer; -diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/slic3r/GUI/FirmwareDialog.cpp PrusaSlicer-version_2.8.1-dwok/src/slic3r/GUI/FirmwareDialog.cpp ---- PrusaSlicer-version_2.8.1-orig/src/slic3r/GUI/FirmwareDialog.cpp 2024-12-21 11:52:03.632594994 +0100 -+++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/GUI/FirmwareDialog.cpp 2024-12-21 12:33:40.507591681 +0100 +--- PrusaSlicer-version_2.8.1-orig/src/slic3r/GUI/FirmwareDialog.cpp ++++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/GUI/FirmwareDialog.cpp @@ -429,7 +429,7 @@ void FirmwareDialog::priv::avr109_wait_f void FirmwareDialog::priv::avr109_reboot(const SerialPortInfo &port) @@ -37,9 +34,8 @@ diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/slic3r/GUI/Firmware Serial serial(io, port.port, 1200); std::this_thread::sleep_for(std::chrono::milliseconds(50)); } -diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjour.cpp PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Bonjour.cpp ---- PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjour.cpp 2024-12-21 11:52:03.644594950 +0100 -+++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Bonjour.cpp 2024-12-21 12:47:16.560667015 +0100 +--- PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjour.cpp ++++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Bonjour.cpp @@ -624,11 +624,11 @@ UdpSession::UdpSession(Bonjour::ReplyFn buffer.resize(DnsMessage::MAX_SIZE); } @@ -215,9 +211,8 @@ diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjou } catch (std::exception& e) { BOOST_LOG_TRIVIAL(error) << e.what(); -diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjour.hpp PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Bonjour.hpp ---- PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjour.hpp 2024-12-21 11:52:03.644594950 +0100 -+++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Bonjour.hpp 2024-12-21 12:23:16.573836269 +0100 +--- PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjour.hpp ++++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Bonjour.hpp @@ -155,11 +155,11 @@ public: UdpSocket(Bonjour::ReplyFn replyfn , const boost::asio::ip::address& multicast_address @@ -285,9 +280,8 @@ diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjou , hostname(hostname) { -diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Serial.cpp PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Serial.cpp ---- PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Serial.cpp 2024-12-21 11:52:03.644594950 +0100 -+++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Serial.cpp 2024-12-21 11:59:40.018945840 +0100 +--- PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Serial.cpp ++++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Serial.cpp @@ -282,12 +282,12 @@ std::vector<std::string> scan_serial_por namespace asio = boost::asio; using boost::system::error_code; @@ -337,9 +331,8 @@ diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Serial if (fail) { return false; -diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Serial.hpp PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Serial.hpp ---- PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Serial.hpp 2024-12-21 11:52:03.644594950 +0100 -+++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Serial.hpp 2024-12-21 11:55:33.283837413 +0100 +--- PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Serial.hpp ++++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Serial.hpp @@ -43,8 +43,8 @@ extern std::vector<SerialPortInfo> scan class Serial : public boost::asio::serial_port { @@ -351,9 +344,8 @@ diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Serial Serial(const Serial &) = delete; Serial &operator=(const Serial &) = delete; ~Serial(); -diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/TCPConsole.cpp PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/TCPConsole.cpp ---- PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/TCPConsole.cpp 2024-12-21 11:52:03.644594950 +0100 -+++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/TCPConsole.cpp 2024-12-21 13:00:56.377754763 +0100 +--- PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/TCPConsole.cpp ++++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/TCPConsole.cpp @@ -9,6 +9,7 @@ #include <boost/asio/read_until.hpp> #include <boost/asio/steady_timer.hpp> diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-arrange-static.patch b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-arrange-static.patch index 6bc8af73d03a..d7f006f527fb 100644 --- a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-arrange-static.patch +++ b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-arrange-static.patch @@ -13,13 +13,6 @@ only). https://github.com/prusa3d/PrusaSlicer/issues/13694), which would still result in broken behavior (duplicate static initialization crashing on startup). ---- - src/slic3r-arrange-wrapper/CMakeLists.txt | 2 +- - src/slic3r-arrange/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/slic3r-arrange-wrapper/CMakeLists.txt b/src/slic3r-arrange-wrapper/CMakeLists.txt -index 3f723e5aed1..34b64fc2969 100644 --- a/src/slic3r-arrange-wrapper/CMakeLists.txt +++ b/src/slic3r-arrange-wrapper/CMakeLists.txt @@ -1,7 +1,7 @@ @@ -31,8 +24,6 @@ index 3f723e5aed1..34b64fc2969 100644 include/arrange-wrapper/Arrange.hpp include/arrange-wrapper/ArrangeSettingsDb_AppCfg.hpp include/arrange-wrapper/ArrangeSettingsView.hpp -diff --git a/src/slic3r-arrange/CMakeLists.txt b/src/slic3r-arrange/CMakeLists.txt -index 98ab2470535..36a54ca5985 100644 --- a/src/slic3r-arrange/CMakeLists.txt +++ b/src/slic3r-arrange/CMakeLists.txt @@ -1,7 +1,7 @@ diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.9.2-boost-1.88.patch b/media-gfx/prusaslicer/files/prusaslicer-2.9.2-boost-1.88.patch new file mode 100644 index 000000000000..ad712c49618c --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.9.2-boost-1.88.patch @@ -0,0 +1,39 @@ +Bug: https://bugs.gentoo.org/955553 +Based on: https://gitlab.archlinux.org/archlinux/packaging/packages/prusa-slicer/-/blob/main/boost-1.88.patch + +--- a/src/libslic3r/GCode/PostProcessor.cpp ++++ b/src/libslic3r/GCode/PostProcessor.cpp +@@ -152,7 +152,14 @@ static int run_script(const std::string &script, const std::string &gcode, std:: + + #include <cstdlib> // getenv() + #include <sstream> ++#if BOOST_VERSION >= 108800 // v2 is now default ++#define BOOST_PROCESS_VERSION 1 ++#include <boost/process/v1/child.hpp> ++#include <boost/process/v1/io.hpp> ++#include <boost/process/v1/pipe.hpp> ++#else + #include <boost/process.hpp> ++#endif + + namespace process = boost::process; + +--- a/src/slic3r/GUI/RemovableDriveManager.cpp ++++ b/src/slic3r/GUI/RemovableDriveManager.cpp +@@ -35,8 +35,16 @@ + #include <pwd.h> + #include <boost/filesystem.hpp> + #include <boost/system/error_code.hpp> ++#if BOOST_VERSION >= 108800 // v2 is now default ++#define BOOST_PROCESS_VERSION 1 ++#include <boost/process/v1/child.hpp> ++#include <boost/process/v1/io.hpp> ++#include <boost/process/v1/pipe.hpp> ++#include <boost/process/v1/search_path.hpp> ++#else + #include <boost/process.hpp> + #endif ++#endif + + namespace Slic3r { + namespace GUI { diff --git a/media-gfx/prusaslicer/prusaslicer-2.8.1-r2.ebuild b/media-gfx/prusaslicer/prusaslicer-2.8.1-r2.ebuild index f4fd79172f51..130231486423 100644 --- a/media-gfx/prusaslicer/prusaslicer-2.8.1-r2.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-2.8.1-r2.ebuild @@ -69,6 +69,7 @@ PATCHES=( "${FILESDIR}/${PN}-2.8.1-fstream.patch" "${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch" "${FILESDIR}/${PN}-2.8.1-boost-1.87.patch" + "${FILESDIR}/${PN}-2.9.2-boost-1.88.patch" ) src_prepare() { diff --git a/media-gfx/prusaslicer/prusaslicer-2.9.2-r1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.9.2-r1.ebuild index 5c0a5c28e744..d679a8fb8cf1 100644 --- a/media-gfx/prusaslicer/prusaslicer-2.9.2-r1.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-2.9.2-r1.ebuild @@ -67,6 +67,7 @@ PATCHES=( "${FILESDIR}/${PN}-2.8.1-fstream.patch" "${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch" "${FILESDIR}/${PN}-2.8.1-boost-1.87.patch" + "${FILESDIR}/${PN}-2.9.2-boost-1.88.patch" ) src_prepare() { diff --git a/media-gfx/prusaslicer/prusaslicer-9999.ebuild b/media-gfx/prusaslicer/prusaslicer-9999.ebuild index 5c0a5c28e744..d679a8fb8cf1 100644 --- a/media-gfx/prusaslicer/prusaslicer-9999.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-9999.ebuild @@ -67,6 +67,7 @@ PATCHES=( "${FILESDIR}/${PN}-2.8.1-fstream.patch" "${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch" "${FILESDIR}/${PN}-2.8.1-boost-1.87.patch" + "${FILESDIR}/${PN}-2.9.2-boost-1.88.patch" ) src_prepare() {
