diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-12-27 06:30:35 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-12-27 06:30:35 +0000 |
commit | 721e451ec418e1712f6962404e111f0ebd487389 (patch) | |
tree | aab5b35236af464349c2522312c63b664273465c /media-gfx/prusaslicer | |
parent | e80134587e8d959a88dba7dd3784895372e205c8 (diff) |
gentoo auto-resync : 27:12:2024 - 06:30:34
Diffstat (limited to 'media-gfx/prusaslicer')
-rw-r--r-- | media-gfx/prusaslicer/Manifest | 3 | ||||
-rw-r--r-- | media-gfx/prusaslicer/files/prusaslicer-2.8.1-boost-1.87.patch | 374 | ||||
-rw-r--r-- | media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild | 1 |
3 files changed, 377 insertions, 1 deletions
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest index 151d42f7feca..e89bfada9d22 100644 --- a/media-gfx/prusaslicer/Manifest +++ b/media-gfx/prusaslicer/Manifest @@ -1,6 +1,7 @@ AUX prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch 448 BLAKE2B 1d4a96762ed6da41e5f4322d6ac6019fb3894321da206ea354d1d9b57e1892155a109c329590bad4393cffd748f9e27542a7cc468803329c8f493789a2b497b1 SHA512 71a3eb2bbe3766be555e94f32219edfb908bdd5f86c74971c1c9b2586306d70724c45b06edbd4ade232017259fe4a99e504447cbbbdd5d5c91f4df03f4d52140 AUX prusaslicer-2.8.0-missing-includes.patch 575 BLAKE2B aef794b75d180176f6ba4b1ec05e4ddfe740ced6000225ce51e3a15bd1143209a340af28dc91660d3f07696f19ad525ef86f5e84f3ff4c96ad77c90940059352 SHA512 65c2c8a2046bf39a9d0f5c073998ec93906efbeb8b2d3b7d835f1a65b2edc00c473fb2bed7396e35e45d00b9420f3942f2e16af2e2c6a1405e90341e41b16cf2 AUX prusaslicer-2.8.0-wxwidgets-3.2.4.patch 1332 BLAKE2B a5e343f64e5f3c2150d170453579b87c3912b5bcb0a7cbd7d1076d2d1f1b10f4e586ed5237ef9faebdbfea23c0e8941a1d0c5f9c71fef2e0269c0120206f2155 SHA512 0fe1af19f8f55bbb11ca8b6685b73858f23b87e3785cb4babe4a8b5ae09694681df4d5f354af896ca1833be2d934da0cf8193285a25e8f28d588b52147ce96a2 +AUX prusaslicer-2.8.1-boost-1.87.patch 17579 BLAKE2B 4d5801287300d879f0fbb90ad05c613abbca76e2757d5d7e8a73d51f7cc61fb3e38e61b2bd9c151e6eff72715fc64d1ddaa43010e5ad56b78322510785f6a0e1 SHA512 0fcb9d0b470e7351b8a1cb91889bfb440009b36836990b4a2c87fe8fb007d5254b61078e21d42c37bb6c8b8d46493f3462a5b1e67262040c82ccfb34695b1998 AUX prusaslicer-2.8.1-cgal-6.0.patch 11183 BLAKE2B 3d0b7729fd0a64eb335b1bb8fd4af547c71ddbaec1e589dc4aba2f608073b394c44012d18b127cc17a3b2d5ef8eaad31b21c00623326cc818ec953103ea6dd1c SHA512 a8a3e7c9e7d39519ae93f78b1c6b220f419ef0141a11e9d68c8a3f599a57e164221a572b6989a5b5285b61419cc207ed091834b4de1a442db5806402524e9885 AUX prusaslicer-2.8.1-fix-libsoup-double-linking.patch 482 BLAKE2B 0b4f0ba5808ac3292609bcc9a503dce4fedbd6c7979ee4c8bc08d300ba248bae0a917e15a032b6ebc1b6ddc3fb372e09a6896b6aef4816a420839ade9a6bdd06 SHA512 9c657eab393d5552c1f37b57b564a38f69758a29f166471360fa93207c6c6b3eeed50a6471019a371db8f3f04dc419d9e035fca952a96a73d699f034eca32799 AUX prusaslicer-2.8.1-fixed-linking.patch 394 BLAKE2B bb4d6285ee9e199f4d8bed3ecf0a4e0ac814f311a5220958e8a6023a343954bc78454697704ce9ee8bc583a9a536cec249f42b8b3d28fff6515e2499c4de3442 SHA512 b84c966d22be5fda04c8a97421026855289038d69de11ac1a9b053381a35b2e5d3f3354ac51d37ad58f0ba4fec177894de67ef44360b050b9ca61cb06d5a178c @@ -12,6 +13,6 @@ AUX prusaslicer-2.9.0-missing-includes.patch 306 BLAKE2B 8b8de2ad9c7adee8cddaff2 AUX prusaslicer-2.9.0-slic3r-arrange-wrapper.patch 781 BLAKE2B 1698fcb533b05da902a82fd4aad8d96604e0dfa80404a6a55e6fe5a35447fa3c33d9a10f53911292c211fc33e4292de522dd67b7ed08026c26f4f7bf9bbaf2a8 SHA512 e8069d12b2063ddec8861b46e8767f702637e1ce9d6ece75cea8292d8a33e62c6ec52ae6730cdfd2af7d8113a2ddd18f99381837717839d1a34d1ff8a57f904c AUX prusaslicer-2.9.0-slic3r-arrange.patch 704 BLAKE2B 45088c902cd03af7f91c4ebc22d62b719e23f31b5bbd1f12fae06d70b6e7acebe5c0310a1369835ee111dae4865860ba64f3654295c54399211d1859243aa657 SHA512 4bb0b39b9e80faccd4f1f57d5829328b27c85d0b98e704ede5154ef1216651cf0d5afa68cd03a1c0e4b478203e4024b49e55a4539d6949433c7c8a94870252fd DIST prusaslicer-2.8.1.tar.gz 69409077 BLAKE2B dd3ee810ea00d03f1790386d1fe1fd044c038429700cd33f21299abdf5def12902f7a07c23aa3d2a6cfc5e18d1e2534080889d4a33beefb493a504978a742453 SHA512 0471fa579a494d66e6b49c0bc1a9fa91f3a5f9147d8b7fa8133c6f03391f8daddddb19ed222d1be44f6f22e2de3021f3fb839331e3c3ccdf5643caa8a61d6912 -EBUILD prusaslicer-2.8.1-r1.ebuild 2708 BLAKE2B 895f155bc49426f137807be45a3f2942d6255090cecc15657896e21f6fdb4ebc1c144ef474f69ae9487306b36cb83860dcebb09cef73e825e658206933b5d0cc SHA512 cf473a7b8978acffae92d579272ee69717b59e849a052422f0aaf66b6b82357ef85536025d8e6e1c32fada8e907be1ecb81ed19a16e14ade1b6fab132c636b3c +EBUILD prusaslicer-2.8.1-r1.ebuild 2752 BLAKE2B 43107bfa1a0026d7cf3eabd3b49dd43216997f99a0b56a27865e16406d80134a26f863fc8bbca5a2521e186c73059dfb9854554cbd7f904d1147b82efc296a92 SHA512 b0721b56b5ba73238b16e69a41e6c1effbe42c7ed38071591381880365891fcdac515a0f5a1a2a3eb3672c60565d1832d670af8d943b433f03b9785580f5446f EBUILD prusaslicer-9999.ebuild 2717 BLAKE2B 789583bedc9feb04d3a911ddfc036f12c11a8627fbf12b3086c89160c647ee285f717ffb1d0a4a0eabc59ec0632c3c038dcb4133989d12c034679d56ec28f945 SHA512 ae2adbdebec5ca00e529c5f34394fd3a134c2cd6dd0a448dae3e0c534443f91b5350ab0fad17723f8d6853ad53c92b6de42c3d129f6f2a60639ef6d95c369d70 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512 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 new file mode 100644 index 000000000000..7666c26800ae --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-boost-1.87.patch @@ -0,0 +1,374 @@ +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 +@@ -113,7 +113,7 @@ GCodeSender::connect(std::string devname + this->io.post(boost::bind(&GCodeSender::do_read, this)); + + // start reading in the background thread +- boost::thread t(boost::bind(&boost::asio::io_service::run, &this->io)); ++ boost::thread t(boost::bind(&boost::asio::io_context::run, &this->io)); + 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 +@@ -40,7 +40,7 @@ class GCodeSender : private boost::nonco + void reset(); + + private: +- asio::io_service io; ++ asio::io_context io; + 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 +@@ -429,7 +429,7 @@ void FirmwareDialog::priv::avr109_wait_f + + void FirmwareDialog::priv::avr109_reboot(const SerialPortInfo &port) + { +- asio::io_service io; ++ asio::io_context io; + 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 +@@ -624,11 +624,11 @@ UdpSession::UdpSession(Bonjour::ReplyFn + buffer.resize(DnsMessage::MAX_SIZE); + } + +-UdpSocket::UdpSocket( Bonjour::ReplyFn replyfn, const asio::ip::address& multicast_address, const asio::ip::address& interface_address, std::shared_ptr< boost::asio::io_service > io_service) ++UdpSocket::UdpSocket( Bonjour::ReplyFn replyfn, const asio::ip::address& multicast_address, const asio::ip::address& interface_address, std::shared_ptr< boost::asio::io_context > io_context) + : replyfn(replyfn) + , multicast_address(multicast_address) +- , socket(*io_service) +- , io_service(io_service) ++ , socket(*io_context) ++ , io_context(io_context) + { + try { + // open socket +@@ -658,11 +658,11 @@ UdpSocket::UdpSocket( Bonjour::ReplyFn r + } + + +-UdpSocket::UdpSocket( Bonjour::ReplyFn replyfn, const asio::ip::address& multicast_address, std::shared_ptr< boost::asio::io_service > io_service) ++UdpSocket::UdpSocket( Bonjour::ReplyFn replyfn, const asio::ip::address& multicast_address, std::shared_ptr< boost::asio::io_context > io_context) + : replyfn(replyfn) + , multicast_address(multicast_address) +- , socket(*io_service) +- , io_service(io_service) ++ , socket(*io_context) ++ , io_context(io_context) + { + try { + // open socket +@@ -714,7 +714,7 @@ void UdpSocket::receive_handler(SharedSe + // let io_service to handle the datagram on session + // from boost documentation io_service::post: + // The io_service guarantees that the handler will only be called in a thread in which the run(), run_one(), poll() or poll_one() member functions is currently being invoked. +- io_service->post(boost::bind(&UdpSession::handle_receive, session, error, bytes)); ++ boost::asio::post(*io_context, boost::bind(&UdpSession::handle_receive, session, error, bytes)); + // immediately accept new datagrams + async_receive(); + } +@@ -871,13 +871,13 @@ void Bonjour::priv::lookup_perform() + { + service_dn = (boost::format("_%1%._%2%.local") % service % protocol).str(); + +- std::shared_ptr< boost::asio::io_service > io_service(new boost::asio::io_service); ++ std::shared_ptr< boost::asio::io_context > io_context(new boost::asio::io_context); + + std::vector<LookupSocket*> sockets; + + // resolve intefaces - from PR#6646 + std::vector<boost::asio::ip::address> interfaces; +- asio::ip::udp::resolver resolver(*io_service); ++ asio::ip::udp::resolver resolver(*io_context); + boost::system::error_code ec; + // ipv4 interfaces + auto results = resolver.resolve(udp::v4(), asio::ip::host_name(), "", ec); +@@ -890,12 +890,12 @@ void Bonjour::priv::lookup_perform() + // create ipv4 socket for each interface + // each will send to querry to for both ipv4 and ipv6 + for (const auto& intrfc : interfaces) +- sockets.emplace_back(new LookupSocket(txt_keys, service, service_dn, protocol, replyfn, BonjourRequest::MCAST_IP4, intrfc, io_service)); ++ sockets.emplace_back(new LookupSocket(txt_keys, service, service_dn, protocol, replyfn, BonjourRequest::MCAST_IP4, intrfc, io_context)); + } else { + BOOST_LOG_TRIVIAL(info) << "Failed to resolve ipv4 interfaces: " << ec.message(); + } + if (sockets.empty()) +- sockets.emplace_back(new LookupSocket(txt_keys, service, service_dn, protocol, replyfn, BonjourRequest::MCAST_IP4, io_service)); ++ sockets.emplace_back(new LookupSocket(txt_keys, service, service_dn, protocol, replyfn, BonjourRequest::MCAST_IP4, io_context)); + // ipv6 interfaces + interfaces.clear(); + //udp::resolver::query query(host, PORT, boost::asio::ip::resolver_query_base::numeric_service); +@@ -910,9 +910,9 @@ void Bonjour::priv::lookup_perform() + // create ipv6 socket for each interface + // each will send to querry to for both ipv4 and ipv6 + for (const auto& intrfc : interfaces) +- sockets.emplace_back(new LookupSocket(txt_keys, service, service_dn, protocol, replyfn, BonjourRequest::MCAST_IP6, intrfc, io_service)); ++ sockets.emplace_back(new LookupSocket(txt_keys, service, service_dn, protocol, replyfn, BonjourRequest::MCAST_IP6, intrfc, io_context)); + if (interfaces.empty()) +- sockets.emplace_back(new LookupSocket(txt_keys, service, service_dn, protocol, replyfn, BonjourRequest::MCAST_IP6, io_service)); ++ sockets.emplace_back(new LookupSocket(txt_keys, service, service_dn, protocol, replyfn, BonjourRequest::MCAST_IP6, io_context)); + } else { + BOOST_LOG_TRIVIAL(info)<< "Failed to resolve ipv6 interfaces: " << ec.message(); + } +@@ -923,13 +923,13 @@ void Bonjour::priv::lookup_perform() + socket->send(); + + // timer settings +- asio::deadline_timer timer(*io_service); ++ asio::deadline_timer timer(*io_context); + retries--; + std::function<void(const error_code&)> timer_handler = [&](const error_code& error) { + // end + if (retries == 0 || error) { + // is this correct ending? +- io_service->stop(); ++ io_context->stop(); + if (completefn) { + completefn(); + } +@@ -947,7 +947,7 @@ void Bonjour::priv::lookup_perform() + timer.expires_from_now(boost::posix_time::seconds(timeout)); + timer.async_wait(timer_handler); + // start io_service, it will run until it has something to do - so in this case until stop is called in timer +- io_service->run(); ++ io_context->run(); + } + catch (std::exception& e) { + BOOST_LOG_TRIVIAL(error) << e.what(); +@@ -966,12 +966,12 @@ void Bonjour::priv::resolve_perform() + rpls.push_back(reply); + }; + +- std::shared_ptr< boost::asio::io_service > io_service(new boost::asio::io_service); ++ std::shared_ptr< boost::asio::io_context > io_context(new boost::asio::io_context); + std::vector<ResolveSocket*> sockets; + + // resolve interfaces - from PR#6646 + std::vector<boost::asio::ip::address> interfaces; +- asio::ip::udp::resolver resolver(*io_service); ++ asio::ip::udp::resolver resolver(*io_context); + boost::system::error_code ec; + // ipv4 interfaces + auto results = resolver.resolve(udp::v4(), asio::ip::host_name(), "", ec); +@@ -984,12 +984,12 @@ void Bonjour::priv::resolve_perform() + // create ipv4 socket for each interface + // each will send to querry to for both ipv4 and ipv6 + for (const auto& intrfc : interfaces) +- sockets.emplace_back(new ResolveSocket(hostname, reply_callback, BonjourRequest::MCAST_IP4, intrfc, io_service)); ++ sockets.emplace_back(new ResolveSocket(hostname, reply_callback, BonjourRequest::MCAST_IP4, intrfc, io_context)); + } else { + BOOST_LOG_TRIVIAL(info) << "Failed to resolve ipv4 interfaces: " << ec.message(); + } + if (sockets.empty()) +- sockets.emplace_back(new ResolveSocket(hostname, reply_callback, BonjourRequest::MCAST_IP4, io_service)); ++ sockets.emplace_back(new ResolveSocket(hostname, reply_callback, BonjourRequest::MCAST_IP4, io_context)); + + // ipv6 interfaces + interfaces.clear(); +@@ -1003,9 +1003,9 @@ void Bonjour::priv::resolve_perform() + // create ipv6 socket for each interface + // each will send to querry to for both ipv4 and ipv6 + for (const auto& intrfc : interfaces) +- sockets.emplace_back(new ResolveSocket(hostname, reply_callback, BonjourRequest::MCAST_IP6, intrfc, io_service)); ++ sockets.emplace_back(new ResolveSocket(hostname, reply_callback, BonjourRequest::MCAST_IP6, intrfc, io_context)); + if (interfaces.empty()) +- sockets.emplace_back(new ResolveSocket(hostname, reply_callback, BonjourRequest::MCAST_IP6, io_service)); ++ sockets.emplace_back(new ResolveSocket(hostname, reply_callback, BonjourRequest::MCAST_IP6, io_context)); + } else { + BOOST_LOG_TRIVIAL(info) << "Failed to resolve ipv6 interfaces: " << ec.message(); + } +@@ -1016,14 +1016,14 @@ void Bonjour::priv::resolve_perform() + socket->send(); + + // timer settings +- asio::deadline_timer timer(*io_service); ++ asio::deadline_timer timer(*io_context); + retries--; + std::function<void(const error_code&)> timer_handler = [&](const error_code& error) { + int replies_count = replies.size(); + // end + if (retries == 0 || error || replies_count > 0) { + // is this correct ending? +- io_service->stop(); ++ io_context->stop(); + if (replies_count > 0 && resolvefn) { + resolvefn(replies); + } +@@ -1041,7 +1041,7 @@ void Bonjour::priv::resolve_perform() + timer.expires_from_now(boost::posix_time::seconds(timeout)); + timer.async_wait(timer_handler); + // start io_service, it will run until it has something to do - so in this case until stop is called in timer +- io_service->run(); ++ io_context->run(); + } + 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 +@@ -155,11 +155,11 @@ public: + UdpSocket(Bonjour::ReplyFn replyfn + , const boost::asio::ip::address& multicast_address + , const boost::asio::ip::address& interface_address +- , std::shared_ptr< boost::asio::io_service > io_service); ++ , std::shared_ptr< boost::asio::io_context > io_context); + + UdpSocket(Bonjour::ReplyFn replyfn + , const boost::asio::ip::address& multicast_address +- , std::shared_ptr< boost::asio::io_service > io_service); ++ , std::shared_ptr< boost::asio::io_context > io_context); + + void send(); + void async_receive(); +@@ -172,7 +172,7 @@ protected: + boost::asio::ip::address multicast_address; + boost::asio::ip::udp::socket socket; + boost::asio::ip::udp::endpoint mcast_endpoint; +- std::shared_ptr< boost::asio::io_service > io_service; ++ std::shared_ptr< boost::asio::io_context > io_context; + std::vector<BonjourRequest> requests; + }; + +@@ -186,8 +186,8 @@ public: + , Bonjour::ReplyFn replyfn + , const boost::asio::ip::address& multicast_address + , const boost::asio::ip::address& interface_address +- , std::shared_ptr< boost::asio::io_service > io_service) +- : UdpSocket(replyfn, multicast_address, interface_address, io_service) ++ , std::shared_ptr< boost::asio::io_context > io_context) ++ : UdpSocket(replyfn, multicast_address, interface_address, io_context) + , txt_keys(txt_keys) + , service(service) + , service_dn(service_dn) +@@ -203,8 +203,8 @@ public: + , std::string protocol + , Bonjour::ReplyFn replyfn + , const boost::asio::ip::address& multicast_address +- , std::shared_ptr< boost::asio::io_service > io_service) +- : UdpSocket(replyfn, multicast_address, io_service) ++ , std::shared_ptr< boost::asio::io_context > io_context) ++ : UdpSocket(replyfn, multicast_address, io_context) + , txt_keys(txt_keys) + , service(service) + , service_dn(service_dn) +@@ -241,8 +241,8 @@ public: + , Bonjour::ReplyFn replyfn + , const boost::asio::ip::address& multicast_address + , const boost::asio::ip::address& interface_address +- , std::shared_ptr< boost::asio::io_service > io_service) +- : UdpSocket(replyfn, multicast_address, interface_address, io_service) ++ , std::shared_ptr< boost::asio::io_context > io_context) ++ : UdpSocket(replyfn, multicast_address, interface_address, io_context) + , hostname(hostname) + + { +@@ -253,8 +253,8 @@ public: + ResolveSocket(const std::string& hostname + , Bonjour::ReplyFn replyfn + , const boost::asio::ip::address& multicast_address +- , std::shared_ptr< boost::asio::io_service > io_service) +- : UdpSocket(replyfn, multicast_address, io_service) ++ , std::shared_ptr< boost::asio::io_context > io_context) ++ : UdpSocket(replyfn, multicast_address, io_context) + , 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 +@@ -282,12 +282,12 @@ std::vector<std::string> scan_serial_por + namespace asio = boost::asio; + using boost::system::error_code; + +-Serial::Serial(asio::io_service& io_service) : +- asio::serial_port(io_service) ++Serial::Serial(asio::io_context &io_context) : ++ asio::serial_port(io_context) + {} + +-Serial::Serial(asio::io_service& io_service, const std::string &name, unsigned baud_rate) : +- asio::serial_port(io_service, name) ++Serial::Serial(asio::io_context &io_context, const std::string &name, unsigned baud_rate) : ++ asio::serial_port(io_context, name) + { + set_baud_rate(baud_rate); + } +@@ -390,19 +390,19 @@ void Serial::reset_line_num() + + bool Serial::read_line(unsigned timeout, std::string &line, error_code &ec) + { +- auto& io_service = ++ auto& io_context = + #if BOOST_VERSION >= 107000 + //FIXME this is most certainly wrong! + (boost::asio::io_context&)this->get_executor().context(); + #else + this->get_io_service(); + #endif +- asio::deadline_timer timer(io_service); ++ asio::deadline_timer timer(io_context); + char c = 0; + bool fail = false; + + while (true) { +- io_service.reset(); ++ io_context.reset(); + + asio::async_read(*this, boost::asio::buffer(&c, 1), [&](const error_code &read_ec, size_t size) { + if (ec || size == 0) { +@@ -423,7 +423,7 @@ bool Serial::read_line(unsigned timeout, + }); + } + +- io_service.run(); ++ io_context.run(); + + 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 +@@ -43,8 +43,8 @@ extern std::vector<SerialPortInfo> scan + class Serial : public boost::asio::serial_port + { + public: +- Serial(boost::asio::io_service &io_service); +- Serial(boost::asio::io_service &io_service, const std::string &name, unsigned baud_rate); ++ Serial(boost::asio::io_context &io_context); ++ Serial(boost::asio::io_context &io_context, const std::string &name, unsigned baud_rate); + 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 +@@ -9,6 +9,7 @@ + #include <boost/asio/read_until.hpp> + #include <boost/asio/steady_timer.hpp> + #include <boost/asio/write.hpp> ++#include <boost/asio/connect.hpp> + #include <boost/bind/bind.hpp> + #include <boost/format.hpp> + #include <boost/log/trivial.hpp> +@@ -161,7 +162,7 @@ bool TCPConsole::run_queue() + + auto endpoints = m_resolver.resolve(m_host_name, m_port_name); + +- m_socket.async_connect(endpoints->endpoint(), ++ boost::asio::async_connect(m_socket, endpoints, + boost::bind(&TCPConsole::handle_connect, this, boost::placeholders::_1) + ); + + diff --git a/media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild index 6b3be9ea12e5..1b384bbdb9a9 100644 --- a/media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild @@ -68,6 +68,7 @@ PATCHES=( "${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch" "${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" ) src_prepare() { |