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 0000000000000000000000000000000000000000..8bbe502f5148817c51fe1515be63c09dec416622 --- /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.spec b/cartographer-ros.spec index 46282e70b0d2744a0578031f42728ba7e8875aa6..95f31b44254b9bd86f301756699453cb069884f5 100644 --- a/cartographer-ros.spec +++ b/cartographer-ros.spec @@ -9,13 +9,14 @@ 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-adapt-glog-0.6.0.patch Requires: ros-%{ros_distro}-builtin-interfaces Requires: ros-%{ros_distro}-cartographer @@ -146,3 +147,5 @@ else echo "RPM TESTS SKIPPED"; fi %changelog * Thu May 04 2023 Chris Lalancette clalancette@openrobotics.org - 2.0.9000-1 - Autogenerated by ros-porting-tools +* Wed Sep 12 2023 davidhan008 <619409713@qq.com> - 2.0.9000-2 +- fix adapt glog 0.6.0 diff --git a/ros-humble-cartographer-ros_2.0.9000.orig.tar.gz b/ros-humble-cartographer-ros_2.0.9000.orig.tar.gz index 02b752d0c5e2999d9682e6e90ec493dff5ef7d6e..75026b9dbe067d63b62b7b461b39ea712aecf3a2 100644 Binary files a/ros-humble-cartographer-ros_2.0.9000.orig.tar.gz and b/ros-humble-cartographer-ros_2.0.9000.orig.tar.gz differ diff --git a/ros-humble-cartographer-rviz_2.0.9000.orig.tar.gz b/ros-humble-cartographer-rviz_2.0.9000.orig.tar.gz index 83ce360e3b756c02937dc5b5925be0841f92dc85..4aae097a36a312ad00fec55f5e2f8d94eb3bcbf7 100644 Binary files a/ros-humble-cartographer-rviz_2.0.9000.orig.tar.gz and b/ros-humble-cartographer-rviz_2.0.9000.orig.tar.gz differ