Skip to content

Commit

Permalink
A bunch more patches
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobias-Fischer committed Dec 30, 2024
1 parent da2bbf4 commit 61c1d2c
Show file tree
Hide file tree
Showing 8 changed files with 108 additions and 16 deletions.
13 changes: 13 additions & 0 deletions patch/ros-jazzy-gz-math-vendor.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bacf717..69ead8b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ if(NOT $ENV{GZ_RELAX_VERSION_MATCH} STREQUAL "")
set(VERSION_MATCH "")
endif()

-find_package(${LIB_NAME_FULL} ${VERSION_MATCH} ${LIB_VER} COMPONENTS all QUIET)
+find_package(${LIB_NAME_FULL} COMPONENTS all QUIET)

ament_vendor(${LIB_NAME_UNDERSCORE}_vendor
SATISFIED ${${LIB_NAME_FULL}_FOUND}
13 changes: 13 additions & 0 deletions patch/ros-jazzy-gz-msgs-vendor.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a234d6c..1bc36ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ if(NOT $ENV{GZ_RELAX_VERSION_MATCH} STREQUAL "")
set(VERSION_MATCH "")
endif()

-find_package(${LIB_NAME_FULL} ${VERSION_MATCH} ${LIB_VER} COMPONENTS all QUIET)
+find_package(${LIB_NAME_FULL} COMPONENTS all QUIET)

ament_vendor(${LIB_NAME_UNDERSCORE}_vendor
SATISFIED ${${LIB_NAME_FULL}_FOUND}
13 changes: 13 additions & 0 deletions patch/ros-jazzy-gz-physics-vendor.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b0b5e4..fa007d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ if(NOT $ENV{GZ_RELAX_VERSION_MATCH} STREQUAL "")
set(VERSION_MATCH "")
endif()

-find_package(${LIB_NAME_FULL} ${VERSION_MATCH} ${LIB_VER} COMPONENTS all QUIET)
+find_package(${LIB_NAME_FULL} COMPONENTS all QUIET)

ament_vendor(${LIB_NAME_UNDERSCORE}_vendor
SATISFIED ${${LIB_NAME_FULL}_FOUND}
13 changes: 13 additions & 0 deletions patch/ros-jazzy-gz-plugin-vendor.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed2578e..cb5c72a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ if(NOT $ENV{GZ_RELAX_VERSION_MATCH} STREQUAL "")
set(VERSION_MATCH "")
endif()

-find_package(${LIB_NAME_FULL} ${VERSION_MATCH} ${LIB_VER} COMPONENTS all QUIET)
+find_package(${LIB_NAME_FULL} COMPONENTS all QUIET)

ament_vendor(${LIB_NAME_UNDERSCORE}_vendor
SATISFIED ${${LIB_NAME_FULL}_FOUND}
13 changes: 13 additions & 0 deletions patch/ros-jazzy-gz-sensors-vendor.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fba7c8..c82aaa5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ if(NOT $ENV{GZ_RELAX_VERSION_MATCH} STREQUAL "")
set(VERSION_MATCH "")
endif()

-find_package(${LIB_NAME_FULL} ${VERSION_MATCH} ${LIB_VER} COMPONENTS all QUIET)
+find_package(${LIB_NAME_FULL} COMPONENTS all QUIET)

ament_vendor(${LIB_NAME_UNDERSCORE}_vendor
SATISFIED ${${LIB_NAME_FULL}_FOUND}
13 changes: 13 additions & 0 deletions patch/ros-jazzy-gz-transport-vendor.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0d7a23..77f334f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,7 @@ if(NOT $ENV{GZ_RELAX_VERSION_MATCH} STREQUAL "")
set(VERSION_MATCH "")
endif()

-find_package(${LIB_NAME_FULL} ${VERSION_MATCH} ${LIB_VER} COMPONENTS all QUIET)
+find_package(${LIB_NAME_FULL} COMPONENTS all QUIET)

ament_vendor(${LIB_NAME_UNDERSCORE}_vendor
SATISFIED ${${LIB_NAME_FULL}_FOUND}
13 changes: 13 additions & 0 deletions patch/ros-jazzy-gz-utils-vendor.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 264ab97..acc88cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ if(NOT $ENV{GZ_RELAX_VERSION_MATCH} STREQUAL "")
set(VERSION_MATCH "")
endif()

-find_package(${LIB_NAME_FULL} ${VERSION_MATCH} ${LIB_VER} COMPONENTS all QUIET)
+find_package(${LIB_NAME_FULL} COMPONENTS all QUIET)

ament_vendor(${LIB_NAME_UNDERSCORE}_vendor
SATISFIED ${${LIB_NAME_FULL}_FOUND}
33 changes: 17 additions & 16 deletions patch/ros-jazzy-plotjuggler.patch
Original file line number Diff line number Diff line change
Expand Up @@ -469,11 +469,12 @@ diff --git a/3rdparty/Qt-Advanced-Docking/CMakeLists.txt b/3rdparty/Qt-Advanced-
index 6b650f1b..82c58edb 100644
--- a/3rdparty/Qt-Advanced-Docking/CMakeLists.txt
+++ b/3rdparty/Qt-Advanced-Docking/CMakeLists.txt
@@ -67,7 +67,8 @@ target_link_libraries(qt_advanced_docking PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets
@@ -67,7 +67,9 @@ target_link_libraries(qt_advanced_docking PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets

if(UNIX AND NOT APPLE)
target_link_libraries(qt_advanced_docking PUBLIC Qt5::X11Extras)
- target_link_libraries(qt_advanced_docking PRIVATE xcb)
+ find_package(XCB REQUIRED)
+ target_link_libraries(qt_advanced_docking PRIVATE ${XCB_LIBRARIES})
+ target_include_directories(qt_advanced_docking SYSTEM PUBLIC ${XCB_INCLUDE_DIRS})
endif()
Expand Down Expand Up @@ -608,18 +609,18 @@ index 0bb68ebe..20855338 100644
--- a/3rdparty/sol/sol.hpp
+++ b/3rdparty/sol/sol.hpp
@@ -6747,12 +6747,9 @@ namespace sol {
/// one.
///
/// \group emplace
- template <class... Args>
- T& emplace(Args&&... args) noexcept {
- static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
-
- *this = nullopt;
- this->construct(std::forward<Args>(args)...);
+ T& emplace(T& arg) noexcept {
+ m_value = &arg;
+ return **this;
}

/// Swaps this optional with the other.
/// one.
///
/// \group emplace
- template <class... Args>
- T& emplace(Args&&... args) noexcept {
- static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
-
- *this = nullopt;
- this->construct(std::forward<Args>(args)...);
+ T& emplace(T& arg) noexcept {
+ m_value = &arg;
+ return **this;
}

/// Swaps this optional with the other.

0 comments on commit 61c1d2c

Please sign in to comment.