Skip to content

Commit 61c1d2c

Browse files
Tobias-FischerTobias-Fischer
committed
A bunch more patches
1 parent da2bbf4 commit 61c1d2c

8 files changed

+108
-16
lines changed

‎patch/ros-jazzy-gz-math-vendor.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index bacf717..69ead8b 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -36,7 +36,7 @@ if(NOT $ENV{GZ_RELAX_VERSION_MATCH} STREQUAL "")
6+
set(VERSION_MATCH "")
7+
endif()
8+
9+
-find_package(${LIB_NAME_FULL} ${VERSION_MATCH} ${LIB_VER} COMPONENTS all QUIET)
10+
+find_package(${LIB_NAME_FULL} COMPONENTS all QUIET)
11+
12+
ament_vendor(${LIB_NAME_UNDERSCORE}_vendor
13+
SATISFIED ${${LIB_NAME_FULL}_FOUND}

‎patch/ros-jazzy-gz-msgs-vendor.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index a234d6c..1bc36ea 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -37,7 +37,7 @@ if(NOT $ENV{GZ_RELAX_VERSION_MATCH} STREQUAL "")
6+
set(VERSION_MATCH "")
7+
endif()
8+
9+
-find_package(${LIB_NAME_FULL} ${VERSION_MATCH} ${LIB_VER} COMPONENTS all QUIET)
10+
+find_package(${LIB_NAME_FULL} COMPONENTS all QUIET)
11+
12+
ament_vendor(${LIB_NAME_UNDERSCORE}_vendor
13+
SATISFIED ${${LIB_NAME_FULL}_FOUND}

‎patch/ros-jazzy-gz-physics-vendor.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 3b0b5e4..fa007d8 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -41,7 +41,7 @@ if(NOT $ENV{GZ_RELAX_VERSION_MATCH} STREQUAL "")
6+
set(VERSION_MATCH "")
7+
endif()
8+
9+
-find_package(${LIB_NAME_FULL} ${VERSION_MATCH} ${LIB_VER} COMPONENTS all QUIET)
10+
+find_package(${LIB_NAME_FULL} COMPONENTS all QUIET)
11+
12+
ament_vendor(${LIB_NAME_UNDERSCORE}_vendor
13+
SATISFIED ${${LIB_NAME_FULL}_FOUND}

‎patch/ros-jazzy-gz-plugin-vendor.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index ed2578e..cb5c72a 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -36,7 +36,7 @@ if(NOT $ENV{GZ_RELAX_VERSION_MATCH} STREQUAL "")
6+
set(VERSION_MATCH "")
7+
endif()
8+
9+
-find_package(${LIB_NAME_FULL} ${VERSION_MATCH} ${LIB_VER} COMPONENTS all QUIET)
10+
+find_package(${LIB_NAME_FULL} COMPONENTS all QUIET)
11+
12+
ament_vendor(${LIB_NAME_UNDERSCORE}_vendor
13+
SATISFIED ${${LIB_NAME_FULL}_FOUND}

‎patch/ros-jazzy-gz-sensors-vendor.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 1fba7c8..c82aaa5 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -42,7 +42,7 @@ if(NOT $ENV{GZ_RELAX_VERSION_MATCH} STREQUAL "")
6+
set(VERSION_MATCH "")
7+
endif()
8+
9+
-find_package(${LIB_NAME_FULL} ${VERSION_MATCH} ${LIB_VER} COMPONENTS all QUIET)
10+
+find_package(${LIB_NAME_FULL} COMPONENTS all QUIET)
11+
12+
ament_vendor(${LIB_NAME_UNDERSCORE}_vendor
13+
SATISFIED ${${LIB_NAME_FULL}_FOUND}

‎patch/ros-jazzy-gz-transport-vendor.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index d0d7a23..77f334f 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -38,7 +38,7 @@ if(NOT $ENV{GZ_RELAX_VERSION_MATCH} STREQUAL "")
6+
set(VERSION_MATCH "")
7+
endif()
8+
9+
-find_package(${LIB_NAME_FULL} ${VERSION_MATCH} ${LIB_VER} COMPONENTS all QUIET)
10+
+find_package(${LIB_NAME_FULL} COMPONENTS all QUIET)
11+
12+
ament_vendor(${LIB_NAME_UNDERSCORE}_vendor
13+
SATISFIED ${${LIB_NAME_FULL}_FOUND}

‎patch/ros-jazzy-gz-utils-vendor.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 264ab97..acc88cd 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -34,7 +34,7 @@ if(NOT $ENV{GZ_RELAX_VERSION_MATCH} STREQUAL "")
6+
set(VERSION_MATCH "")
7+
endif()
8+
9+
-find_package(${LIB_NAME_FULL} ${VERSION_MATCH} ${LIB_VER} COMPONENTS all QUIET)
10+
+find_package(${LIB_NAME_FULL} COMPONENTS all QUIET)
11+
12+
ament_vendor(${LIB_NAME_UNDERSCORE}_vendor
13+
SATISFIED ${${LIB_NAME_FULL}_FOUND}

‎patch/ros-jazzy-plotjuggler.patch

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -469,11 +469,12 @@ diff --git a/3rdparty/Qt-Advanced-Docking/CMakeLists.txt b/3rdparty/Qt-Advanced-
469469
index 6b650f1b..82c58edb 100644
470470
--- a/3rdparty/Qt-Advanced-Docking/CMakeLists.txt
471471
+++ b/3rdparty/Qt-Advanced-Docking/CMakeLists.txt
472-
@@ -67,7 +67,8 @@ target_link_libraries(qt_advanced_docking PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets
472+
@@ -67,7 +67,9 @@ target_link_libraries(qt_advanced_docking PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets
473473

474474
if(UNIX AND NOT APPLE)
475475
target_link_libraries(qt_advanced_docking PUBLIC Qt5::X11Extras)
476476
- target_link_libraries(qt_advanced_docking PRIVATE xcb)
477+
+ find_package(XCB REQUIRED)
477478
+ target_link_libraries(qt_advanced_docking PRIVATE ${XCB_LIBRARIES})
478479
+ target_include_directories(qt_advanced_docking SYSTEM PUBLIC ${XCB_INCLUDE_DIRS})
479480
endif()
@@ -608,18 +609,18 @@ index 0bb68ebe..20855338 100644
608609
--- a/3rdparty/sol/sol.hpp
609610
+++ b/3rdparty/sol/sol.hpp
610611
@@ -6747,12 +6747,9 @@ namespace sol {
611-
/// one.
612-
///
613-
/// \group emplace
614-
- template <class... Args>
615-
- T& emplace(Args&&... args) noexcept {
616-
- static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
617-
-
618-
- *this = nullopt;
619-
- this->construct(std::forward<Args>(args)...);
620-
+ T& emplace(T& arg) noexcept {
621-
+ m_value = &arg;
622-
+ return **this;
623-
}
624-
625-
/// Swaps this optional with the other.
612+
/// one.
613+
///
614+
/// \group emplace
615+
- template <class... Args>
616+
- T& emplace(Args&&... args) noexcept {
617+
- static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
618+
-
619+
- *this = nullopt;
620+
- this->construct(std::forward<Args>(args)...);
621+
+ T& emplace(T& arg) noexcept {
622+
+ m_value = &arg;
623+
+ return **this;
624+
}
625+
626+
/// Swaps this optional with the other.

0 commit comments

Comments
 (0)