From ab61bfbb9c25f6a532f53f1dde87961ff6c01798 Mon Sep 17 00:00:00 2001
From: Julien Enoch <julien.e@zettascale.tech>
Date: Wed, 3 Apr 2024 11:48:43 +0200
Subject: [PATCH] Bump zenoh-c to eclipse-zenoh/zenoh-c#307

---
 zenoh_c_vendor/CMakeLists.txt       | 10 +++-------
 zenoh_c_vendor/patches/pr_301.patch | 24 ------------------------
 2 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 zenoh_c_vendor/patches/pr_301.patch

diff --git a/zenoh_c_vendor/CMakeLists.txt b/zenoh_c_vendor/CMakeLists.txt
index ad75856c..81211fae 100644
--- 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
deleted file mode 100644
index 68008fd9..00000000
--- a/zenoh_c_vendor/patches/pr_301.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 00aa5ca..d236e99 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,7 +27,7 @@ declare_cache_var_true_if_vscode(ZENOHC_BUILD_IN_SOURCE_TREE "Do build inside so
- declare_cache_var(ZENOHC_BUILD_WITH_LOGGER_AUTOINIT TRUE BOOL "Enable logger-autoinit zenoh-c feature")
- declare_cache_var(ZENOHC_BUILD_WITH_SHARED_MEMORY TRUE BOOL "Enable shared-memory zenoh-c feature")
- declare_cache_var(ZENOHC_CUSTOM_TARGET "" STRING "Rust target for cross compilation, 'aarch64-unknown-linux-gnu' for example")
--declare_cache_var(ZENOHC_CARGO_CHANNEL "stable" STRING "Cargo channel selected: stable or nightly")
-+declare_cache_var(ZENOHC_CARGO_CHANNEL "" STRING "Cargo channel parameter. Should be '+stable', '+nightly' or empty value")
- declare_cache_var(ZENOHC_CARGO_FLAGS "" STRING "Additional cargo flags")
- declare_cache_var(ZENOHC_LIB_STATIC FALSE BOOL "Alias zenohc::lib target to zenohc::static if TRUE, to zenohc::shared if FALSE")
- 
-@@ -198,8 +198,8 @@ file(GLOB_RECURSE rust_sources "Cargo.toml.in" "src/*.rs" "build.rs" "splitguide
- add_custom_command(
- 	OUTPUT ${libs}
- 	COMMAND ${CMAKE_COMMAND} -E echo \"RUSTFLAGS = $$RUSTFLAGS\"
--	COMMAND ${CMAKE_COMMAND} -E echo \"cargo +${ZENOHC_CARGO_CHANNEL} build ${cargo_flags}\"
--	COMMAND cargo +${ZENOHC_CARGO_CHANNEL} build ${cargo_flags}
-+	COMMAND ${CMAKE_COMMAND} -E echo \"cargo ${ZENOHC_CARGO_CHANNEL} build ${cargo_flags}\"
-+	COMMAND cargo ${ZENOHC_CARGO_CHANNEL} build ${cargo_flags}
- 	VERBATIM
- 	COMMAND_EXPAND_LISTS
- 	DEPENDS "${rust_sources}"