Bump zenoh-c to eclipse-zenoh/zenoh-c#307

JEnoch · Apr 3, 2024 · ab61bfb · ab61bfb
1 parent 68eb03b
commit ab61bfb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 31 deletions.
diff --git a/zenoh_c_vendor/CMakeLists.txt b/zenoh_c_vendor/CMakeLists.txt
@@ -24,17 +24,13 @@ find_package(ament_cmake_vendor_package REQUIRED)
 # when expanded.
 set(ZENOHC_CARGO_FLAGS "--no-default-features$<SEMICOLON>--features=zenoh/transport_tcp zenoh/shared-memory")
 
-# Set VCS_VERSION to include changes from https://github.com/eclipse-zenoh/zenoh/pull/830
-# and https://github.com/eclipse-zenoh/zenoh/pull/848 which was synced to zenoh-c in
-# https://github.com/eclipse-zenoh/zenoh-c/pull/293.
-# Apply patches:
-# - https://github.com/eclipse-zenoh/zenoh-c/pull/301
+# Set VCS_VERSION to include changes from https://github.com/eclipse-zenoh/zenoh/pull/875
+# which was synced to zenoh-c in https://github.com/eclipse-zenoh/zenoh-c/pull/307.
 ament_vendor(zenoh_c_vendor
   VCS_URL https://github.com/eclipse-zenoh/zenoh-c.git
-  VCS_VERSION bd0fe98772b7d65e8fb71eb0369d7c85c9b09c73
+  VCS_VERSION c1498fcaf08d3dad15e49b1ac15cd380c0dc175c
   CMAKE_ARGS
     "-DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS}"
-  PATCHES patches
 )
 
 # set(INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-prefix/install")

diff --git a/zenoh_c_vendor/patches/pr_301.patch b/zenoh_c_vendor/patches/pr_301.patch