Bug#1140533: simgrid: diff for NMU version 4.1-2.1

Control: tags 1140533 + patch
Control: tags 1140533 + pending
--

Dear maintainer,

I've prepared an NMU for simgrid (versioned as 4.1-2.1) and
uploaded it to DELAYED/3. Please feel free to tell me if I
should cancel it.

-- 
Regards
Sudip

diffstat for simgrid-4.1 simgrid-4.1

 changelog               |    7 +++++++
 patches/ftbfs-ns3.patch |   20 ++++++++++++++++++++
 patches/series          |    1 +
 3 files changed, 28 insertions(+)

diff -Nru simgrid-4.1/debian/changelog simgrid-4.1/debian/changelog
--- simgrid-4.1/debian/changelog	2026-02-27 17:41:49.000000000 +0000
+++ simgrid-4.1/debian/changelog	2026-08-10 22:39:53.000000000 +0100
@@ -1,3 +1,10 @@
+simgrid (4.1-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with libns3.48. (Closes: #1140533)
+
+ -- Sudip Mukherjee <[email protected]>  Mon, 10 Aug 2026 21:39:53 +0000
+
 simgrid (4.1-2) unstable; urgency=medium
 
   * d/p/ns3-47.diff: Adapt to API change in ns3 v3.47 (Closes: #1129164).
diff -Nru simgrid-4.1/debian/patches/ftbfs-ns3.patch simgrid-4.1/debian/patches/ftbfs-ns3.patch
--- simgrid-4.1/debian/patches/ftbfs-ns3.patch	1970-01-01 01:00:00.000000000 +0100
+++ simgrid-4.1/debian/patches/ftbfs-ns3.patch	2026-08-10 22:39:53.000000000 +0100
@@ -0,0 +1,20 @@
+Description: Fix FTBFS with libns3
+
+Bug-Debian: https://bugs.debian.org/1140533
+Forwarded: https://github.com/simgrid/simgrid/pull/409
+Last-Update: 2026-08-10
+---
+
+--- simgrid-4.1.orig/src/kernel/resource/models/network_ns3.cpp
++++ simgrid-4.1/src/kernel/resource/models/network_ns3.cpp
+@@ -358,8 +358,8 @@ UdpTraceClient=0*/
+     ns3::GlobalRouteManager::BuildGlobalRoutingDatabase();
+     ns3::GlobalRouteManager::InitializeRoutes();
+ #else
+-    ns3::GlobalRouteManager<Ipv4Manager>::BuildGlobalRoutingDatabase();
+-    ns3::GlobalRouteManager<Ipv4Manager>::InitializeRoutes();
++    ns3::GlobalRouteManager<ns3::Ipv4Manager>::BuildGlobalRoutingDatabase();
++    ns3::GlobalRouteManager<ns3::Ipv4Manager>::InitializeRoutes();
+ #endif
+   });
+   routing::on_cluster_creation.connect(&clusterCreation_cb);
diff -Nru simgrid-4.1/debian/patches/series simgrid-4.1/debian/patches/series
--- simgrid-4.1/debian/patches/series	2026-02-27 17:41:49.000000000 +0000
+++ simgrid-4.1/debian/patches/series	2026-08-10 22:39:53.000000000 +0100
@@ -1,3 +1,4 @@
 
 java-MANIFEST.patch
 ns3-47.diff
+ftbfs-ns3.patch