[rpms/OpenSceneGraph] rawhide: Update OpenSceneGraph_asio.patch for asio-1.36.0

[rpms/OpenSceneGraph] rawhide: Update OpenSceneGraph_asio.patch for asio-1.36.0

[Sandro Mani]

A new commit has been pushed.

Repo   : rpms/OpenSceneGraph
Branch : rawhide
Commit : 20ad65ae2f4f42b74ddf06eb73e41f33e2763954
Author : Sandro Mani <manisandro@gmail.com>
Date   : 2026-06-12T15:44:13+02:00
Stats  : +100/-11 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/OpenSceneGraph/c/20ad65ae2f4f42b74ddf06eb73e41f33e2763954?branch=rawhide

Log:
Update OpenSceneGraph_asio.patch for asio-1.36.0

---
diff --git a/OpenSceneGraph.spec b/OpenSceneGraph.spec
index ef62627..bc6f7f6 100644
--- a/OpenSceneGraph.spec
+++ b/OpenSceneGraph.spec
@@ -42,7 +42,7 @@
 
 Name:           OpenSceneGraph
 Version:        3.6.5
-Release:        45%{?dist}
+Release:        46%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 # The OSGPL is just the wxWidgets license.
@@ -794,6 +794,9 @@ mkdir -p %{buildroot}%{_datadir}/OpenSceneGraph
 %endif
 
 %changelog
+* Fri Jun 12 2026 Sandro Mani <manisandro@gmail.com> - 3.6.5-46
+- Update OpenSceneGraph_asio.patch for asio-1.36.0
+
 * Sat Jan 24 2026 Richard Shaw <hobbes1069@gmail.com> - 3.6.5-45
 - Rebuild with fltk 1.4.
 

diff --git a/OpenSceneGraph_asio.patch b/OpenSceneGraph_asio.patch
index 79684e9..06ba64d 100644
--- a/OpenSceneGraph_asio.patch
+++ b/OpenSceneGraph_asio.patch
@@ -1,7 +1,7 @@
 diff -rupN --no-dereference OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/connection.cpp OpenSceneGraph-OpenSceneGraph-3.6.5-new/src/osgPlugins/RestHttpDevice/connection.cpp
 --- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/connection.cpp	2020-01-31 12:03:07.000000000 +0100
-+++ OpenSceneGraph-OpenSceneGraph-3.6.5-new/src/osgPlugins/RestHttpDevice/connection.cpp	2025-07-20 16:14:39.961907340 +0200
-@@ -10,7 +10,6 @@
++++ OpenSceneGraph-OpenSceneGraph-3.6.5-new/src/osgPlugins/RestHttpDevice/connection.cpp	2026-06-12 15:17:01.938892943 +0200
+@@ -10,14 +10,13 @@
  
  #include "connection.hpp"
  #include <vector>
@@ -9,6 +9,14 @@ diff -rupN --no-dereference OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/R
  #include "request_handler.hpp"
  #include <osg/Notify>
  
+ namespace http {
+ namespace server {
+ 
+-connection::connection(asio::io_service& io_service,
++connection::connection(asio::io_context& io_service,
+     request_handler& handler)
+   : socket_(io_service),
+     request_handler_(handler)
 @@ -39,9 +38,9 @@ void connection::start()
    OSG_DEBUG << "RestHttpDevice :: connection::start" << std::endl;
    
@@ -52,9 +60,82 @@ diff -rupN --no-dereference OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/R
      }
    }
  
+diff -rupN --no-dereference OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/connection.hpp OpenSceneGraph-OpenSceneGraph-3.6.5-new/src/osgPlugins/RestHttpDevice/connection.hpp
+--- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/connection.hpp	2020-01-31 12:03:07.000000000 +0100
++++ OpenSceneGraph-OpenSceneGraph-3.6.5-new/src/osgPlugins/RestHttpDevice/connection.hpp	2026-06-12 15:17:01.939232905 +0200
+@@ -31,7 +31,7 @@ class connection
+ {
+ public:
+   /// Construct a connection with the given io_service.
+-  explicit connection(asio::io_service& io_service,
++  explicit connection(asio::io_context& io_service,
+       request_handler& handler);
+ 
+   /// Get the socket associated with the connection.
+diff -rupN --no-dereference OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_service_pool.cpp OpenSceneGraph-OpenSceneGraph-3.6.5-new/src/osgPlugins/RestHttpDevice/io_service_pool.cpp
+--- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_service_pool.cpp	2020-01-31 12:03:07.000000000 +0100
++++ OpenSceneGraph-OpenSceneGraph-3.6.5-new/src/osgPlugins/RestHttpDevice/io_service_pool.cpp	2026-06-12 15:17:01.939466630 +0200
+@@ -26,8 +26,8 @@ io_service_pool::io_service_pool(std::si
+   // exit until they are explicitly stopped.
+   for (std::size_t i = 0; i < pool_size; ++i)
+   {
+-    io_service_ptr io_service(new asio::io_service);
+-    work_ptr work(new asio::io_service::work(*io_service));
++    io_service_ptr io_service(new asio::io_context);
++    work_guard_ptr work(new asio::executor_work_guard<asio::io_context::executor_type>(io_service->get_executor()));
+     io_services_.push_back(io_service);
+     work_.push_back(work);
+   }
+@@ -40,7 +40,7 @@ void io_service_pool::run()
+   for (std::size_t i = 0; i < io_services_.size(); ++i)
+   {
+     boost::shared_ptr<asio::thread> thread(new asio::thread(
+-          boost::bind(&asio::io_service::run, io_services_[i])));
++          boost::bind(&asio::io_context::run, io_services_[i])));
+     threads.push_back(thread);
+   }
+ 
+@@ -56,10 +56,10 @@ void io_service_pool::stop()
+     io_services_[i]->stop();
+ }
+ 
+-asio::io_service& io_service_pool::get_io_service()
++asio::io_context& io_service_pool::get_io_service()
+ {
+   // Use a round-robin scheme to choose the next io_service to use.
+-  asio::io_service& io_service = *io_services_[next_io_service_];
++  asio::io_context& io_service = *io_services_[next_io_service_];
+   ++next_io_service_;
+   if (next_io_service_ == io_services_.size())
+     next_io_service_ = 0;
+diff -rupN --no-dereference OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_service_pool.hpp OpenSceneGraph-OpenSceneGraph-3.6.5-new/src/osgPlugins/RestHttpDevice/io_service_pool.hpp
+--- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_service_pool.hpp	2020-01-31 12:03:07.000000000 +0100
++++ OpenSceneGraph-OpenSceneGraph-3.6.5-new/src/osgPlugins/RestHttpDevice/io_service_pool.hpp	2026-06-12 15:17:01.939711610 +0200
+@@ -34,17 +34,17 @@ public:
+   void stop();
+ 
+   /// Get an io_service to use.
+-  asio::io_service& get_io_service();
++  asio::io_context& get_io_service();
+ 
+ private:
+-  typedef boost::shared_ptr<asio::io_service> io_service_ptr;
+-  typedef boost::shared_ptr<asio::io_service::work> work_ptr;
++  typedef boost::shared_ptr<asio::io_context> io_service_ptr;
++  typedef boost::shared_ptr<asio::executor_work_guard<asio::io_context::executor_type>> work_guard_ptr;
+ 
+   /// The pool of io_services.
+   std::vector<io_service_ptr> io_services_;
+ 
+   /// The work that keeps the io_services running.
+-  std::vector<work_ptr> work_;
++  std::vector<work_guard_ptr> work_;
+ 
+   /// The next io_service to use for a connection.
+   std::size_t next_io_service_;
 diff -rupN --no-dereference OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/server.cpp OpenSceneGraph-OpenSceneGraph-3.6.5-new/src/osgPlugins/RestHttpDevice/server.cpp
 --- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/server.cpp	2020-01-31 12:03:07.000000000 +0100
-+++ OpenSceneGraph-OpenSceneGraph-3.6.5-new/src/osgPlugins/RestHttpDevice/server.cpp	2025-07-20 16:14:39.962242498 +0200
++++ OpenSceneGraph-OpenSceneGraph-3.6.5-new/src/osgPlugins/RestHttpDevice/server.cpp	2026-06-12 15:17:01.940229602 +0200
 @@ -9,7 +9,6 @@
  //
  
@@ -63,17 +144,22 @@ diff -rupN --no-dereference OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/R
  
  namespace http {
  namespace server {
-@@ -23,7 +22,7 @@ server::server(const std::string& addres
+@@ -23,16 +22,17 @@ server::server(const std::string& addres
      request_handler_(doc_root)
  {
    // Open the acceptor with the option to reuse the address (i.e. SO_REUSEADDR).
 -  asio::ip::tcp::resolver resolver(acceptor_.get_io_service());
+-  asio::ip::tcp::resolver::query query(address, port);
+-  asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
+-  acceptor_.open(endpoint.protocol());
 +  asio::ip::tcp::resolver resolver(acceptor_.get_executor());
-   asio::ip::tcp::resolver::query query(address, port);
-   asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
-   acceptor_.open(endpoint.protocol());
-@@ -31,8 +30,8 @@ server::server(const std::string& addres
-   acceptor_.bind(endpoint);
++  asio::ip::tcp::resolver::results_type results = resolver.resolve(address, port);
++
++  auto result = *results.begin();
++  acceptor_.open(result.endpoint().protocol());
+   acceptor_.set_option(asio::ip::tcp::acceptor::reuse_address(true));
+-  acceptor_.bind(endpoint);
++  acceptor_.bind(result.endpoint());
    acceptor_.listen();
    acceptor_.async_accept(new_connection_->socket(),
 -      boost::bind(&server::handle_accept, this,
@@ -83,7 +169,7 @@ diff -rupN --no-dereference OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/R
  }
  
  void server::run()
-@@ -56,8 +55,8 @@ void server::handle_accept(const asio::e
+@@ -56,8 +56,8 @@ void server::handle_accept(const asio::e
      new_connection_.reset(new connection(
            io_service_pool_.get_io_service(), request_handler_));
      acceptor_.async_accept(new_connection_->socket(),