pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

prusaslicer: Fixed to build with pkgsrc-2025Q4 release.



Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Thu Jan 1 12:28:36 2026 +1100
Changeset:	5cb4b45a981c34f822fb002668d7308bb265f186

Modified Files:
	prusaslicer/distinfo
	prusaslicer/patches/patch-CMakeLists.txt
	prusaslicer/patches/patch-cmake_modules_FindOpenVDB.cmake
	prusaslicer/patches/patch-src_slic3r_GUI_RemovableDriveManager.cpp
	prusaslicer/patches/patch-src_slic3r_Utils_Bonjour.cpp
Added Files:
	prusaslicer/patches/patch-src_libslic3r_GCode_PostProcessor.cpp

Log Message:
prusaslicer: Fixed to build with pkgsrc-2025Q4 release.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5cb4b45a981c34f822fb002668d7308bb265f186

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 prusaslicer/distinfo                               |  9 +++--
 prusaslicer/patches/patch-CMakeLists.txt           | 17 +++++---
 .../patches/patch-cmake_modules_FindOpenVDB.cmake  | 14 ++++---
 .../patch-src_libslic3r_GCode_PostProcessor.cpp    | 24 ++++++++++++
 .../patch-src_slic3r_GUI_RemovableDriveManager.cpp | 45 +++++++++++++++++++++-
 .../patches/patch-src_slic3r_Utils_Bonjour.cpp     | 40 ++++++++++++-------
 6 files changed, 118 insertions(+), 31 deletions(-)

diffs:
diff --git a/prusaslicer/distinfo b/prusaslicer/distinfo
index a121fd27e6..72ff196c6c 100644
--- a/prusaslicer/distinfo
+++ b/prusaslicer/distinfo
@@ -3,17 +3,18 @@ $NetBSD$
 BLAKE2s (PrusaSlicer-2.9.4.tar.gz) = a4afc25d424b72b39a8a17e3d04a689ca3caf8940bdfe7df803cd0502b13bba9
 SHA512 (PrusaSlicer-2.9.4.tar.gz) = 777b1fb3e2a6ce0f233c34749dc351b9ded2a9900a0e4b7ebc0c8c9cb2d7b2a4eec5da49772da16cdb317ecb2fba319166bb3da113e46d9ac5e6c2d5d4ca430e
 Size (PrusaSlicer-2.9.4.tar.gz) = 79411287 bytes
-SHA1 (patch-CMakeLists.txt) = 293c5116b1ec1c4fa733bf18f6e9ab8c19f7bad4
+SHA1 (patch-CMakeLists.txt) = 12f45e04b2cf7a5fb7a2ff9b37e51025c066a180
 SHA1 (patch-bundled__deps_CMakeLists.txt) = 9fad4b02132498a6bf06e0e53ed7626fa8b60b67
 SHA1 (patch-bundled__deps_avrdude_avrdude_arduino.c) = c03d11e4648054fc8e5028da3838400d61c27a95
 SHA1 (patch-bundled__deps_avrdude_avrdude_libavrdude.h) = a0d56b68dba55d58202352e0b7979fb722cc3777
 SHA1 (patch-bundled__deps_localesutils_LocalesUtils.cpp) = 18cbf76d545828bc97bb765b470f2aa4ef5e8a8e
 SHA1 (patch-bundled__deps_localesutils_LocalesUtils.hpp) = 9c6228e2db7bf4aedb29dec656c1995305afd8a2
-SHA1 (patch-cmake_modules_FindOpenVDB.cmake) = 4f2afc423a70fe60617b33ff7f26859b39775faa
+SHA1 (patch-cmake_modules_FindOpenVDB.cmake) = 55227aab441180bfef46db84e70c4446b253c9f5
 SHA1 (patch-src_libseqarrange_CMakeLists.txt) = ece7856a15a6e24c5a918ced85d7379558e89d47
 SHA1 (patch-src_libslic3r_CutSurface.cpp) = a6a702e0fe32bc9b37136299e14c715f62943ab7
 SHA1 (patch-src_libslic3r_GCodeSender.cpp) = de2e506662aae4383f1230409e6d5efac1cfae3a
 SHA1 (patch-src_libslic3r_GCodeSender.hpp) = e069f3c596e102e5f3f1339f29cd1d12a7c82dfb
+SHA1 (patch-src_libslic3r_GCode_PostProcessor.cpp) = 4b080e5f3cdd2918103f99f3401d36b840aa3fa3
 SHA1 (patch-src_libslic3r_Platform.cpp) = 3066585efc98ba4963e41bda5952df38a7b095a0
 SHA1 (patch-src_libslic3r_Platform.hpp) = 5626058616d04396bff6c8550951d04fe03249e4
 SHA1 (patch-src_libslic3r_SupportSpotsGenerator.cpp) = b1080470f18e873ad7b39a5e56b4aabd8be87011
@@ -50,7 +51,7 @@ SHA1 (patch-src_slic3r_GUI_Preferences.cpp) = 37459f9fa37751e0b72ba8538eb44c286a
 SHA1 (patch-src_slic3r_GUI_PresetComboBoxes.cpp) = ae083491bb2b1228c0f666fdc36b1b3ca4008c3c
 SHA1 (patch-src_slic3r_GUI_PresetComboBoxes.hpp) = 0c84c1b706a1f4e00f60c1677c7edf53845d4467
 SHA1 (patch-src_slic3r_GUI_PrintHostDialogs.cpp) = fb83c21579d675c8459431e429e2e2d0c41fc623
-SHA1 (patch-src_slic3r_GUI_RemovableDriveManager.cpp) = 413499908128be48106d5fd6aea5d413bb959b35
+SHA1 (patch-src_slic3r_GUI_RemovableDriveManager.cpp) = 987d9d34fd7088e4ea7282a602a575076c6ebb2e
 SHA1 (patch-src_slic3r_GUI_Tab.cpp) = 148ba19a624036acc0c7aa3d0d121998e5246569
 SHA1 (patch-src_slic3r_GUI_TopBar.cpp) = 89025abe1622ae57a84429c65ae1402a503e1ad1
 SHA1 (patch-src_slic3r_GUI_UnsavedChangesDialog.cpp) = 1594eb7521f23c42700b0fbed7c039b62e9d4029
@@ -60,7 +61,7 @@ SHA1 (patch-src_slic3r_GUI_UserAccountCommunication.cpp) = 1467c25ad13aae19bf6e1
 SHA1 (patch-src_slic3r_GUI_WipeTowerDialog.cpp) = fc6fd1bfee7001c268bf50209bcfd1cb96f6a9ad
 SHA1 (patch-src_slic3r_GUI_wxExtensions.cpp) = d6e807f3dd1f18fa9c703798067fa1e808112891
 SHA1 (patch-src_slic3r_GUI_wxExtensions.hpp) = 356da6dbd7ca7f60fa8a73c51533a1c1ad1530c1
-SHA1 (patch-src_slic3r_Utils_Bonjour.cpp) = cae6032d0ec4a7975dae82c14d6d1f969ac74ac3
+SHA1 (patch-src_slic3r_Utils_Bonjour.cpp) = 88971521ac0b197ba7e7defd590b9b9fb9d5df28
 SHA1 (patch-src_slic3r_Utils_Bonjour.hpp) = 698bfb239d07da387846c64f42e671d1df71e36f
 SHA1 (patch-src_slic3r_Utils_FontConfigHelp.hpp) = 807c71e904bb5b5c882bc6a72161a5276d1ab4d3
 SHA1 (patch-src_slic3r_Utils_Serial.cpp) = 797684a2f75e99fe9de32ab89fc45afd67945f8e
diff --git a/prusaslicer/patches/patch-CMakeLists.txt b/prusaslicer/patches/patch-CMakeLists.txt
index 9915f81076..d63a700c48 100644
--- a/prusaslicer/patches/patch-CMakeLists.txt
+++ b/prusaslicer/patches/patch-CMakeLists.txt
@@ -4,9 +4,12 @@ Use GTK3, since that's how we build wxWidgets.
 
 Define additional macro to OpenGL ES builds.
 
---- CMakeLists.txt.orig	2024-09-18 13:39:04.000000000 +0000
+Drop boost_system component, dropped upstream, from:
+https://github.com/prusa3d/PrusaSlicer/issues/14899
+
+--- CMakeLists.txt.orig	2025-11-06 09:19:38.000000000 +0000
 +++ CMakeLists.txt
-@@ -53,7 +53,7 @@ CMAKE_DEPENDENT_OPTION(SLIC3R_DESKTOP_IN
+@@ -52,7 +52,7 @@ CMAKE_DEPENDENT_OPTION(SLIC3R_DESKTOP_IN
  
  set(OPENVDB_FIND_MODULE_PATH "" CACHE PATH "Path to OpenVDB installation's find modules.")
  
@@ -15,7 +18,7 @@ Define additional macro to OpenGL ES builds.
  
  set(IS_CROSS_COMPILE FALSE)
  
-@@ -112,6 +112,7 @@ endif ()
+@@ -111,6 +111,7 @@ endif ()
  
  if (SLIC3R_OPENGL_ES)
      add_definitions(-DSLIC3R_OPENGL_ES)
@@ -23,8 +26,12 @@ Define additional macro to OpenGL ES builds.
  endif()
  
  if(SLIC3R_DESKTOP_INTEGRATION)
-@@ -374,7 +375,8 @@ set(MINIMUM_BOOST_VERSION "1.66.0")
- set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time;iostreams;nowide")
+@@ -370,10 +371,11 @@ endif()
+ # boost::process was introduced first in version 1.64.0,
+ # boost::beast::detail::base64 was introduced first in version 1.66.0
+ set(MINIMUM_BOOST_VERSION "1.83.0")
+-set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time;iostreams;nowide")
++set(_boost_components "filesystem;thread;log;locale;regex;chrono;atomic;date_time;iostreams;nowide")
  find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS ${_boost_components})
  
 -find_package(Eigen3 3.3.7 REQUIRED)
diff --git a/prusaslicer/patches/patch-cmake_modules_FindOpenVDB.cmake b/prusaslicer/patches/patch-cmake_modules_FindOpenVDB.cmake
index bc2e52ddd6..50e3758bd0 100644
--- a/prusaslicer/patches/patch-cmake_modules_FindOpenVDB.cmake
+++ b/prusaslicer/patches/patch-cmake_modules_FindOpenVDB.cmake
@@ -3,7 +3,9 @@ $NetBSD$
 cmake file copied from OpenVDB 8.1.0 distribution, with unknown cmake
 function OPENVDB_GET_VERSION_DEFINE commented out.
 
---- cmake/modules/FindOpenVDB.cmake.orig	2021-12-17 14:00:02.000000000 +0000
+Fixed boost 1.89 compatibility, which removed boost_system component.
+
+--- cmake/modules/FindOpenVDB.cmake.orig	2025-11-06 09:19:38.000000000 +0000
 +++ cmake/modules/FindOpenVDB.cmake
 @@ -1,28 +1,5 @@
 -# Copyright (c) DreamWorks Animation LLC
@@ -531,7 +533,7 @@ function OPENVDB_GET_VERSION_DEFINE commented out.
    if(NOT OpenVDB_ABI)
      message(WARNING "Unable to determine OpenVDB ABI version from OpenVDB "
        "installation. The library major version \"${OpenVDB_MAJOR_VERSION}\" "
-@@ -332,166 +446,209 @@ if(NOT OpenVDB_FIND_QUIETLY)
+@@ -332,166 +446,208 @@ if(NOT OpenVDB_FIND_QUIETLY)
  endif()
  
  # ------------------------------------------------------------------------
@@ -609,7 +611,7 @@ function OPENVDB_GET_VERSION_DEFINE commented out.
 +  set(Boost_USE_STATIC_LIBS OFF)
 +endif()
 +
-+find_package(Boost REQUIRED COMPONENTS iostreams system)
++find_package(Boost REQUIRED COMPONENTS iostreams)
 +
 +# Add deps for pyopenvdb
 +# @todo track for numpy
@@ -830,7 +832,7 @@ function OPENVDB_GET_VERSION_DEFINE commented out.
  
  set(_OPENVDB_VISIBLE_DEPENDENCIES
    Boost::iostreams
-   Boost::system
+-  Boost::system
 -  IlmBase::Half
  )
  
@@ -858,7 +860,7 @@ function OPENVDB_GET_VERSION_DEFINE commented out.
  endif()
  
  list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
-@@ -505,34 +662,26 @@ endif()
+@@ -505,34 +661,26 @@ endif()
  
  set(_OPENVDB_HIDDEN_DEPENDENCIES)
  
@@ -902,7 +904,7 @@ function OPENVDB_GET_VERSION_DEFINE commented out.
  set(OpenVDB_LIBRARY_DIRS "")
  foreach(LIB ${OpenVDB_LIB_COMPONENTS})
    get_filename_component(_OPENVDB_LIBDIR ${LIB} DIRECTORY)
-@@ -540,49 +689,102 @@ foreach(LIB ${OpenVDB_LIB_COMPONENTS})
+@@ -540,49 +688,102 @@ foreach(LIB ${OpenVDB_LIB_COMPONENTS})
  endforeach()
  list(REMOVE_DUPLICATES OpenVDB_LIBRARY_DIRS)
  
diff --git a/prusaslicer/patches/patch-src_libslic3r_GCode_PostProcessor.cpp b/prusaslicer/patches/patch-src_libslic3r_GCode_PostProcessor.cpp
new file mode 100644
index 0000000000..3dabec6d9b
--- /dev/null
+++ b/prusaslicer/patches/patch-src_libslic3r_GCode_PostProcessor.cpp
@@ -0,0 +1,24 @@
+$NetBSD$
+
+--- src/libslic3r/GCode/PostProcessor.cpp.orig	2025-12-31 12:41:53.543628241 +0000
++++ src/libslic3r/GCode/PostProcessor.cpp
+@@ -152,7 +152,7 @@ static int run_script(const std::string 
+ 
+ #include <cstdlib>   // getenv()
+ #include <sstream>
+-#include <boost/process.hpp>
++#include <boost/process/v1.hpp>
+ 
+ namespace process = boost::process;
+ 
+@@ -173,8 +173,8 @@ static int run_script(const std::string 
+ 
+     BOOST_LOG_TRIVIAL(debug) << boost::format("Executing script, shell: %1%, command: %2%") % shell % command;
+ 
+-    process::ipstream istd_err;
+-    process::child child(shell, "-c", command, process::std_err > istd_err);
++    process::v1::ipstream istd_err;
++    process::v1::child child(shell, "-c", command, process::v1::std_err > istd_err);
+ 
+     std_err.clear();
+     std::string line;
diff --git a/prusaslicer/patches/patch-src_slic3r_GUI_RemovableDriveManager.cpp b/prusaslicer/patches/patch-src_slic3r_GUI_RemovableDriveManager.cpp
index 34db9065ae..5c75faa77b 100644
--- a/prusaslicer/patches/patch-src_slic3r_GUI_RemovableDriveManager.cpp
+++ b/prusaslicer/patches/patch-src_slic3r_GUI_RemovableDriveManager.cpp
@@ -2,9 +2,21 @@ $NetBSD$
 
 Treat NetBSD like Linux.
 
---- src/slic3r/GUI/RemovableDriveManager.cpp.orig	2021-12-17 14:00:02.000000000 +0000
+Fix boost 1.88 compatibility.
+https://github.com/prusa3d/PrusaSlicer/issues/14534
+
+--- src/slic3r/GUI/RemovableDriveManager.cpp.orig	2025-11-06 09:19:38.000000000 +0000
 +++ src/slic3r/GUI/RemovableDriveManager.cpp
-@@ -187,7 +187,7 @@ namespace search_for_drives_internal 
+@@ -35,7 +35,7 @@
+ #include <pwd.h>
+ #include <boost/filesystem.hpp>
+ #include <boost/system/error_code.hpp>
+-#include <boost/process.hpp>
++#include <boost/process/v1.hpp>
+ #endif
+ 
+ namespace Slic3r {
+@@ -743,7 +743,7 @@ namespace search_for_drives_internal 
  		//confirms if the file is removable drive and adds it to vector
  
  		if (
@@ -13,3 +25,32 @@ Treat NetBSD like Linux.
  			// Chromium mounts removable drives in a way that produces the same device ID.
  			platform_flavor() == PlatformFlavor::LinuxOnChromium ||
  #endif
+@@ -859,15 +859,15 @@ void RemovableDriveManager::eject_drive(
+ 		// but neither triggers "succesful safe removal messege"
+ 		
+ 		BOOST_LOG_TRIVIAL(info) << "Ejecting started";
+-		boost::process::ipstream istd_err;
+-    	boost::process::child child(
++		boost::process::v1::ipstream istd_err;
++    	boost::process::v1::child child(
+ #if __APPLE__		
+-			boost::process::search_path("diskutil"), "eject", correct_path.c_str(), (boost::process::std_out & boost::process::std_err) > istd_err);
++			boost::process::v1::search_path("diskutil"), "eject", correct_path.c_str(), (boost::process::v1::std_out & boost::process::v1::std_err) > istd_err);
+ 		//Another option how to eject at mac. Currently not working.
+ 		//used insted of system() command;
+ 		//this->eject_device(correct_path);
+ #else
+-    		boost::process::search_path("umount"), correct_path.c_str(), (boost::process::std_out & boost::process::std_err) > istd_err);
++    		boost::process::v1::search_path("umount"), correct_path.c_str(), (boost::process::v1::std_out & boost::process::v1::std_err) > istd_err);
+ #endif
+ 		std::string line;
+ 		while (child.running() && std::getline(istd_err, line)) {
+@@ -881,7 +881,7 @@ void RemovableDriveManager::eject_drive(
+             // The wait call can fail, as it did in https://github.com/prusa3d/PrusaSlicer/issues/5507
+             // It can happen even in cases where the eject is sucessful, but better report it as failed.
+             // We did not find a way to reliably retrieve the exit code of the process.
+-			BOOST_LOG_TRIVIAL(error) << "boost::process::child::wait() failed during Ejection. State of Ejection is unknown. Error code: " << ec.value();
++			BOOST_LOG_TRIVIAL(error) << "boost::process::v1::child::wait() failed during Ejection. State of Ejection is unknown. Error code: " << ec.value();
+ 		} else {
+ 			int err = child.exit_code();
+ 	    	if (err) {
diff --git a/prusaslicer/patches/patch-src_slic3r_Utils_Bonjour.cpp b/prusaslicer/patches/patch-src_slic3r_Utils_Bonjour.cpp
index b2069c342d..f7441bc7d0 100644
--- a/prusaslicer/patches/patch-src_slic3r_Utils_Bonjour.cpp
+++ b/prusaslicer/patches/patch-src_slic3r_Utils_Bonjour.cpp
@@ -3,9 +3,21 @@ $NetBSD$
 Fix boost 1.87 compatibility.
 https://github.com/prusa3d/PrusaSlicer/issues/13799
 
---- src/slic3r/Utils/Bonjour.cpp.orig	2025-03-10 13:20:54.000000000 +0000
+Fix boost 1.88 compatibility.
+https://github.com/prusa3d/PrusaSlicer/issues/14534
+
+--- src/slic3r/Utils/Bonjour.cpp.orig	2025-11-06 09:19:38.000000000 +0000
 +++ src/slic3r/Utils/Bonjour.cpp
-@@ -624,11 +624,11 @@ UdpSession::UdpSession(Bonjour::ReplyFn 
+@@ -17,6 +17,8 @@
+ #include <boost/log/trivial.hpp>
+ #include <boost/bind/bind.hpp>
+ 
++#include <boost/asio/deadline_timer.hpp>
++
+ using boost::optional;
+ using boost::system::error_code;
+ namespace endian = boost::endian;
+@@ -624,11 +626,11 @@ UdpSession::UdpSession(Bonjour::ReplyFn 
  	buffer.resize(DnsMessage::MAX_SIZE);
  }
  
@@ -20,7 +32,7 @@ https://github.com/prusa3d/PrusaSlicer/issues/13799
  {
  	try {
  		// open socket
-@@ -658,11 +658,11 @@ UdpSocket::UdpSocket( Bonjour::ReplyFn r
+@@ -658,11 +660,11 @@ UdpSocket::UdpSocket( Bonjour::ReplyFn r
  }
  
  
@@ -35,7 +47,7 @@ https://github.com/prusa3d/PrusaSlicer/issues/13799
  {
  	try {
  		// open socket
-@@ -714,7 +714,7 @@ void UdpSocket::receive_handler(SharedSe
+@@ -714,7 +716,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.
@@ -44,7 +56,7 @@ https://github.com/prusa3d/PrusaSlicer/issues/13799
  	// immediately accept new datagrams
  	async_receive();
  }
-@@ -871,13 +871,13 @@ void Bonjour::priv::lookup_perform()
+@@ -871,13 +873,13 @@ void Bonjour::priv::lookup_perform()
  {
  	service_dn = (boost::format("_%1%._%2%.local") % service % protocol).str();
  
@@ -60,7 +72,7 @@ https://github.com/prusa3d/PrusaSlicer/issues/13799
  	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()
+@@ -890,12 +892,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) 		
@@ -75,7 +87,7 @@ https://github.com/prusa3d/PrusaSlicer/issues/13799
  	// 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()
+@@ -910,9 +912,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)
@@ -87,7 +99,7 @@ https://github.com/prusa3d/PrusaSlicer/issues/13799
  	} else {
  		BOOST_LOG_TRIVIAL(info)<< "Failed to resolve ipv6 interfaces: " << ec.message();
  	}
-@@ -923,13 +923,13 @@ void Bonjour::priv::lookup_perform()
+@@ -923,13 +925,13 @@ void Bonjour::priv::lookup_perform()
  			socket->send();
  
  		// timer settings
@@ -103,7 +115,7 @@ https://github.com/prusa3d/PrusaSlicer/issues/13799
  				if (completefn) {
  					completefn();
  				}
-@@ -947,7 +947,7 @@ void Bonjour::priv::lookup_perform()
+@@ -947,7 +949,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
@@ -112,7 +124,7 @@ https://github.com/prusa3d/PrusaSlicer/issues/13799
  	}
  	catch (std::exception& e) {
  		BOOST_LOG_TRIVIAL(error) << e.what();
-@@ -966,12 +966,12 @@ void Bonjour::priv::resolve_perform()
+@@ -966,12 +968,12 @@ void Bonjour::priv::resolve_perform()
  			rpls.push_back(reply);
  	};
  
@@ -127,7 +139,7 @@ https://github.com/prusa3d/PrusaSlicer/issues/13799
  	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()
+@@ -984,12 +986,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)
@@ -142,7 +154,7 @@ https://github.com/prusa3d/PrusaSlicer/issues/13799
  
  	// ipv6 interfaces
  	interfaces.clear();
-@@ -1003,9 +1003,9 @@ void Bonjour::priv::resolve_perform()
+@@ -1003,9 +1005,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) 
@@ -154,7 +166,7 @@ https://github.com/prusa3d/PrusaSlicer/issues/13799
  	} else {
  		BOOST_LOG_TRIVIAL(info) << "Failed to resolve ipv6 interfaces: " << ec.message();
  	}
-@@ -1016,14 +1016,14 @@ void Bonjour::priv::resolve_perform()
+@@ -1016,14 +1018,14 @@ void Bonjour::priv::resolve_perform()
  			socket->send();
  
  		// timer settings
@@ -171,7 +183,7 @@ https://github.com/prusa3d/PrusaSlicer/issues/13799
  				if (replies_count > 0 && resolvefn) {
  					resolvefn(replies);
  				}
-@@ -1041,7 +1041,7 @@ void Bonjour::priv::resolve_perform()
+@@ -1041,7 +1043,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


Home | Main Index | Thread Index | Old Index