From d09f7e4992838d4885007ac668ffcbf708d523b9 Mon Sep 17 00:00:00 2001
From: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
Date: Tue, 16 Jul 2024 13:16:57 +0000
Subject: [PATCH 01/10] add cartographer-ros-fix-link.patch.

Signed-off-by: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
---
 cartographer-ros-fix-link.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 cartographer-ros-fix-link.patch

diff --git a/cartographer-ros-fix-link.patch b/cartographer-ros-fix-link.patch
new file mode 100644
index 0000000..1fbb76e
--- /dev/null
+++ b/cartographer-ros-fix-link.patch
@@ -0,0 +1,11 @@
+--- ros-humble-cartographer-ros-2.0.9000_orig/CMakeLists.txt    2022-04-20 00:01:33.000000000 +0000
++++ ros-humble-cartographer-ros-2.0.9000/CMakeLists.txt 2024-07-16 10:03:01.781000000 +0000
+@@ -110,7 +110,7 @@
+ ament_target_dependencies(${PROJECT_NAME}
+   ${dependencies}
+   )
+-target_link_libraries(${PROJECT_NAME} cartographer ${PCL_LIBRARIES})
++target_link_libraries(${PROJECT_NAME} cartographer ${PCL_LIBRARIES} absl_log_internal_check_op absl_log_internal_message)
+ 
+ # Executables
+ add_executable(cartographer_node src/node_main.cpp)
\ No newline at end of file
-- 
Gitee


From becb368bb100a717ac9ae3ef5723bc323f62ba03 Mon Sep 17 00:00:00 2001
From: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
Date: Tue, 16 Jul 2024 13:17:34 +0000
Subject: [PATCH 02/10] update cartographer-ros.spec.

Signed-off-by: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
---
 cartographer-ros.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cartographer-ros.spec b/cartographer-ros.spec
index e135ee8..f9fbc2f 100644
--- a/cartographer-ros.spec
+++ b/cartographer-ros.spec
@@ -18,6 +18,7 @@ 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.patch
+Patch3: cartographer-ros-fix-link.patch
 
 Requires: ros-%{ros_distro}-builtin-interfaces
 Requires: ros-%{ros_distro}-cartographer
-- 
Gitee


From 75d0e4a097761591fd12bed1cf83da076ea09269 Mon Sep 17 00:00:00 2001
From: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
Date: Tue, 16 Jul 2024 13:32:51 +0000
Subject: [PATCH 03/10] update cartographer-ros.spec.

Signed-off-by: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
---
 cartographer-ros.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cartographer-ros.spec b/cartographer-ros.spec
index f9fbc2f..e135ee8 100644
--- a/cartographer-ros.spec
+++ b/cartographer-ros.spec
@@ -18,7 +18,6 @@ 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.patch
-Patch3: cartographer-ros-fix-link.patch
 
 Requires: ros-%{ros_distro}-builtin-interfaces
 Requires: ros-%{ros_distro}-cartographer
-- 
Gitee


From 347a013753a46f2fced98dfd5fef3e20cb88fc0b Mon Sep 17 00:00:00 2001
From: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
Date: Wed, 17 Jul 2024 00:58:05 +0000
Subject: [PATCH 04/10] update cartographer-rviz.spec.

Signed-off-by: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
---
 cartographer-rviz.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cartographer-rviz.spec b/cartographer-rviz.spec
index e48a814..fac1cdd 100644
--- a/cartographer-rviz.spec
+++ b/cartographer-rviz.spec
@@ -18,7 +18,6 @@ Source0:        %{name}_%{version}.orig.tar.gz
 Patch0: cartographer-rviz-fix-absl.patch
 
 Requires: ros-%{ros_distro}-cartographer
-Requires: ros-%{ros_distro}-cartographer-ros
 Requires: ros-%{ros_distro}-cartographer-ros-msgs
 Requires: eigen3-devel
 Requires: abseil-cpp-devel
-- 
Gitee


From bd4e93b0d079f510b75a635e9174bc6ec87c6e55 Mon Sep 17 00:00:00 2001
From: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
Date: Wed, 17 Jul 2024 05:10:24 +0000
Subject: [PATCH 05/10] update cartographer-rviz.spec.

Signed-off-by: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
---
 cartographer-rviz.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cartographer-rviz.spec b/cartographer-rviz.spec
index fac1cdd..5b445fc 100644
--- a/cartographer-rviz.spec
+++ b/cartographer-rviz.spec
@@ -30,7 +30,6 @@ Requires: ros-%{ros_distro}-rviz-rendering
 Requires: ros-%{ros_distro}-ros-workspace
 
 BuildRequires: ros-%{ros_distro}-cartographer
-BuildRequires: ros-%{ros_distro}-cartographer-ros
 BuildRequires: ros-%{ros_distro}-cartographer-ros-msgs
 BuildRequires: eigen3-devel
 BuildRequires: abseil-cpp-devel
-- 
Gitee


From b0aa38a388971c202de8cf1ac1e135f7fd46771f Mon Sep 17 00:00:00 2001
From: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
Date: Thu, 18 Jul 2024 04:17:43 +0000
Subject: [PATCH 06/10] update cartographer-ros.spec.

Signed-off-by: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
---
 cartographer-ros.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cartographer-ros.spec b/cartographer-ros.spec
index e135ee8..50093f3 100644
--- a/cartographer-ros.spec
+++ b/cartographer-ros.spec
@@ -17,7 +17,8 @@ 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.patch
+Patch2: cartographer-ros-fix-link.patch
+Patch3: cartographer-ros-adapt-glog-0.6.0.patch
 
 Requires: ros-%{ros_distro}-builtin-interfaces
 Requires: ros-%{ros_distro}-cartographer
-- 
Gitee


From 09a70d388e2801ad449f225693ce52ecdcf835af Mon Sep 17 00:00:00 2001
From: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
Date: Thu, 18 Jul 2024 04:29:39 +0000
Subject: [PATCH 07/10] update cartographer-rviz.spec.

Signed-off-by: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
---
 cartographer-rviz.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cartographer-rviz.spec b/cartographer-rviz.spec
index 5b445fc..fac1cdd 100644
--- a/cartographer-rviz.spec
+++ b/cartographer-rviz.spec
@@ -30,6 +30,7 @@ Requires: ros-%{ros_distro}-rviz-rendering
 Requires: ros-%{ros_distro}-ros-workspace
 
 BuildRequires: ros-%{ros_distro}-cartographer
+BuildRequires: ros-%{ros_distro}-cartographer-ros
 BuildRequires: ros-%{ros_distro}-cartographer-ros-msgs
 BuildRequires: eigen3-devel
 BuildRequires: abseil-cpp-devel
-- 
Gitee


From 34e4d11002220410d03ea87393ffbead08bf9d0c Mon Sep 17 00:00:00 2001
From: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
Date: Thu, 18 Jul 2024 05:01:22 +0000
Subject: [PATCH 08/10] update cartographer-ros.spec.

Signed-off-by: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
---
 cartographer-ros.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cartographer-ros.spec b/cartographer-ros.spec
index 50093f3..f9fbc2f 100644
--- a/cartographer-ros.spec
+++ b/cartographer-ros.spec
@@ -17,8 +17,8 @@ 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-fix-link.patch
-Patch3: cartographer-ros-adapt-glog-0.6.0.patch
+Patch2: cartographer-ros-adapt-glog-0.6.0.patch
+Patch3: cartographer-ros-fix-link.patch
 
 Requires: ros-%{ros_distro}-builtin-interfaces
 Requires: ros-%{ros_distro}-cartographer
-- 
Gitee


From 30409abb633abbde5db2ef771f2890a1d0d74027 Mon Sep 17 00:00:00 2001
From: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
Date: Mon, 22 Jul 2024 01:12:49 +0000
Subject: [PATCH 09/10] update cartographer-ros-fix-link.patch.

Signed-off-by: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
---
 cartographer-ros-fix-link.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cartographer-ros-fix-link.patch b/cartographer-ros-fix-link.patch
index 1fbb76e..0bd2fe3 100644
--- a/cartographer-ros-fix-link.patch
+++ b/cartographer-ros-fix-link.patch
@@ -1,11 +1,11 @@
---- ros-humble-cartographer-ros-2.0.9000_orig/CMakeLists.txt    2022-04-20 00:01:33.000000000 +0000
-+++ ros-humble-cartographer-ros-2.0.9000/CMakeLists.txt 2024-07-16 10:03:01.781000000 +0000
-@@ -110,7 +110,7 @@
+--- ros-humble-cartographer-ros-2.0.9000/CMakeLists.txt.orig    2024-07-22 00:49:24.631000000 +0000
++++ ros-humble-cartographer-ros-2.0.9000/CMakeLists.txt 2024-07-22 00:51:08.336000000 +0000
+@@ -105,7 +105,7 @@
  ament_target_dependencies(${PROJECT_NAME}
    ${dependencies}
    )
 -target_link_libraries(${PROJECT_NAME} cartographer ${PCL_LIBRARIES})
 +target_link_libraries(${PROJECT_NAME} cartographer ${PCL_LIBRARIES} absl_log_internal_check_op absl_log_internal_message)
- 
+
  # Executables
  add_executable(cartographer_node src/node_main.cpp)
\ No newline at end of file
-- 
Gitee


From cbc9a74b079058516ab9914eb1d292f984c42009 Mon Sep 17 00:00:00 2001
From: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
Date: Mon, 22 Jul 2024 01:53:22 +0000
Subject: [PATCH 10/10] update cartographer-ros.spec.

Signed-off-by: tabbleman <11778353+awesome_cheems@user.noreply.gitee.com>
---
 cartographer-ros.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cartographer-ros.spec b/cartographer-ros.spec
index f9fbc2f..e135ee8 100644
--- a/cartographer-ros.spec
+++ b/cartographer-ros.spec
@@ -18,7 +18,6 @@ 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.patch
-Patch3: cartographer-ros-fix-link.patch
 
 Requires: ros-%{ros_distro}-builtin-interfaces
 Requires: ros-%{ros_distro}-cartographer
-- 
Gitee