From 425853a8116b5ea759bdd9c3710a1cc19442e348 Mon Sep 17 00:00:00 2001
From: simonaXi <18701881329@163.com>
Date: Mon, 30 Oct 2023 19:40:28 +0800
Subject: [PATCH] Fix: adapter absl

---
 cartographer-ros-adapt-glog-0.6.0.patch | 11 +++++++++++
 cartographer-ros-fix-absl.patch         | 12 ++++++++++++
 cartographer-ros.spec                   |  6 +++++-
 cartographer-rviz-fix-absl.patch        | 12 ++++++++++++
 cartographer-rviz.spec                  |  5 ++++-
 5 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 cartographer-ros-adapt-glog-0.6.0.patch
 create mode 100644 cartographer-ros-fix-absl.patch
 create mode 100644 cartographer-rviz-fix-absl.patch

diff --git a/cartographer-ros-adapt-glog-0.6.0.patch b/cartographer-ros-adapt-glog-0.6.0.patch
new file mode 100644
index 0000000..8bbe502
--- /dev/null
+++ b/cartographer-ros-adapt-glog-0.6.0.patch
@@ -0,0 +1,11 @@
+--- ros-humble-cartographer-ros-2.0.9000/src/ros_log_sink.cpp	2022-04-20 08:01:33.000000000 +0800
++++ ros-humble-cartographer-ros-2.0.9000/src/ros_log_sink.cpp	2023-09-13 10:45:08.000000000 +0800
+@@ -46,7 +46,7 @@
+   (void) base_filename; // TODO: remove unused arg ?
+ 
+   const std::string message_string = ::google::LogSink::ToString(
+-      severity, GetBasename(filename), line, tm_time, message, message_len);
++      severity, GetBasename(filename), line, ::google::LogMessageTime(*tm_time), message, message_len);
+   switch (severity) {
+     case ::google::GLOG_INFO:
+       RCLCPP_INFO_STREAM(logger_, message_string);
diff --git a/cartographer-ros-fix-absl.patch b/cartographer-ros-fix-absl.patch
new file mode 100644
index 0000000..9c6da21
--- /dev/null
+++ b/cartographer-ros-fix-absl.patch
@@ -0,0 +1,12 @@
+diff -Naur ros-humble-cartographer-ros-2.0.9000_orgin/CMakeLists.txt ros-humble-cartographer-ros-2.0.9000/CMakeLists.txt
+--- ros-humble-cartographer-ros-2.0.9000_orgin/CMakeLists.txt	2022-04-20 08:01:33.000000000 +0800
++++ ros-humble-cartographer-ros-2.0.9000/CMakeLists.txt	2023-10-25 10:21:05.000000000 +0800
+@@ -50,6 +50,8 @@
+ find_package(urdfdom_headers REQUIRED)
+ find_package(visualization_msgs REQUIRED)
+ 
++add_definitions(-DABSL_LEGACY_THREAD_ANNOTATIONS)
++
+ include_directories(
+   include
+   ${PCL_INCLUDE_DIRS}
diff --git a/cartographer-ros.spec b/cartographer-ros.spec
index 46282e7..f6e0264 100644
--- a/cartographer-ros.spec
+++ b/cartographer-ros.spec
@@ -9,13 +9,15 @@
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        2.0.9000
-Release:        1%{?dist}%{?release_suffix}
+Release:        2%{?dist}%{?release_suffix}
 Summary:        ROS cartographer-ros package
 
 Url:            https://github.com/cartographer-project/cartographer_ros
 License:        Apache 2.0
 Source0:        %{name}_%{version}.orig.tar.gz
 Patch0: cartographer-ros-fix-multiple-definition-error.patch
+Patch1: cartographer-ros-fix-absl.patch
+Patch2: cartographer-ros-adapt-glog-0.6.0
 
 Requires: ros-%{ros_distro}-builtin-interfaces
 Requires: ros-%{ros_distro}-cartographer
@@ -144,5 +146,7 @@ else echo "RPM TESTS SKIPPED"; fi
 /opt/ros/%{ros_distro}
 
 %changelog
+* Wed Sep 12 2023 simonaxi <18701881329@163.com> - 2.0.9000-2
+- fix: adapter absl patch
 * Thu May 04 2023 Chris Lalancette clalancette@openrobotics.org - 2.0.9000-1
 - Autogenerated by ros-porting-tools
diff --git a/cartographer-rviz-fix-absl.patch b/cartographer-rviz-fix-absl.patch
new file mode 100644
index 0000000..a30bd0b
--- /dev/null
+++ b/cartographer-rviz-fix-absl.patch
@@ -0,0 +1,12 @@
+diff -Naur ros-humble-cartographer-rviz-2.0.9000_org/CMakeLists.txt ros-humble-cartographer-rviz-2.0.9000/CMakeLists.txt
+--- ros-humble-cartographer-rviz-2.0.9000_org/CMakeLists.txt	2022-04-20 08:01:35.000000000 +0800
++++ ros-humble-cartographer-rviz-2.0.9000/CMakeLists.txt	2023-10-25 10:48:36.000000000 +0800
+@@ -50,6 +50,8 @@
+ set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+ find_package(Threads REQUIRED)
+ 
++add_definitions(-DABSL_LEGACY_THREAD_ANNOTATIONS)
++
+ set(rviz_plugins_headers_to_moc
+   include/cartographer_rviz/drawable_submap.h
+   include/cartographer_rviz/ogre_slice.h
diff --git a/cartographer-rviz.spec b/cartographer-rviz.spec
index a02e327..e48a814 100644
--- a/cartographer-rviz.spec
+++ b/cartographer-rviz.spec
@@ -9,12 +9,13 @@
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        2.0.9000
-Release:        1%{?dist}%{?release_suffix}
+Release:        2%{?dist}%{?release_suffix}
 Summary:        ROS cartographer-rviz package
 
 Url:            https://github.com/cartographer-project/cartographer_ros
 License:        Apache 2.0
 Source0:        %{name}_%{version}.orig.tar.gz
+Patch0: cartographer-rviz-fix-absl.patch
 
 Requires: ros-%{ros_distro}-cartographer
 Requires: ros-%{ros_distro}-cartographer-ros
@@ -117,5 +118,7 @@ else echo "RPM TESTS SKIPPED"; fi
 /opt/ros/%{ros_distro}
 
 %changelog
+* Wed Sep 12 2023 simonaxi <18701881329@163.com> - 2.0.9000-2
+- fix: adapter absl patch
 * Thu May 04 2023 Chris Lalancette clalancette@openrobotics.org - 2.0.9000-1
 - Autogenerated by ros-porting-tools
-- 
Gitee