From 9d3046a72be17967524b85f6803b3e7ca3fb6495 Mon Sep 17 00:00:00 2001
From: Ryan Liao <ryan.liao0305@gmail.com>
Date: Sat, 27 Jun 2026 14:09:58 -0400
Subject: [PATCH 1/2] Reintroduce library_path.sh patches from humble

---
 patch/ros-lyrical-ament-cmake-core.patch | 18 ++++++++++++++++++
 patch/ros-lyrical-ament-package.patch    | 22 ++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 patch/ros-lyrical-ament-cmake-core.patch
 create mode 100644 patch/ros-lyrical-ament-package.patch

diff --git a/patch/ros-lyrical-ament-cmake-core.patch b/patch/ros-lyrical-ament-cmake-core.patch
new file mode 100644
index 00000000..555f3fc9
--- /dev/null
+++ b/patch/ros-lyrical-ament-cmake-core.patch
@@ -0,0 +1,18 @@
+diff --git a/cmake/package_templates/templates_2_cmake.py b/cmake/package_templates/templates_2_cmake.py
+index b7c0faf..328cc38 100644
+--- a/cmake/package_templates/templates_2_cmake.py
++++ b/cmake/package_templates/templates_2_cmake.py
+@@ -68,12 +68,7 @@ def generate_cmake_code():
+     """
+     variables = []
+ 
+-    if not IS_WINDOWS:
+-        variables.append((
+-            'ENVIRONMENT_HOOK_LIBRARY_PATH',
+-            '"%s"' % get_environment_hook_template_path('library_path.sh')))
+-    else:
+-        variables.append(('ENVIRONMENT_HOOK_LIBRARY_PATH', ''))
++    variables.append(('ENVIRONMENT_HOOK_LIBRARY_PATH', ''))
+ 
+     ext = '.bat.in' if IS_WINDOWS else '.sh.in'
+     variables.append((
diff --git a/patch/ros-lyrical-ament-package.patch b/patch/ros-lyrical-ament-package.patch
new file mode 100644
index 00000000..ae032894
--- /dev/null
+++ b/patch/ros-lyrical-ament-package.patch
@@ -0,0 +1,22 @@
+diff --git a/ament_package/template/environment_hook/library_path.sh b/ament_package/template/environment_hook/library_path.sh
+deleted file mode 100644
+index 292e518..0000000
+--- a/ament_package/template/environment_hook/library_path.sh
++++ /dev/null
+@@ -1,16 +0,0 @@
+-# copied from ament_package/template/environment_hook/library_path.sh
+-
+-# detect if running on Darwin platform
+-_UNAME=`uname -s`
+-_IS_DARWIN=0
+-if [ "$_UNAME" = "Darwin" ]; then
+-  _IS_DARWIN=1
+-fi
+-unset _UNAME
+-
+-if [ $_IS_DARWIN -eq 0 ]; then
+-  ament_prepend_unique_value LD_LIBRARY_PATH "$AMENT_CURRENT_PREFIX/lib"
+-else
+-  ament_prepend_unique_value DYLD_LIBRARY_PATH "$AMENT_CURRENT_PREFIX/lib"
+-fi
+-unset _IS_DARWIN

From f30e588fdfa1419d578e6f9e9be45e4189081cdb Mon Sep 17 00:00:00 2001
From: Ryan Liao <ryan.liao0305@gmail.com>
Date: Sun, 28 Jun 2026 06:19:54 -0400
Subject: [PATCH 2/2] Bump vinca for full rebuild

---
 .github/workflows/testpr.yml | 2 +-
 vinca.yaml                   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/testpr.yml b/.github/workflows/testpr.yml
index feb42967..da0ec258 100644
--- a/.github/workflows/testpr.yml
+++ b/.github/workflows/testpr.yml
@@ -7,7 +7,7 @@ env:
   # Change to 'true' to enable the cache upload as artifacts
   SAVE_CACHE_AS_ARTIFACT: 'true'
   # Change to 'true' to ignore cache and force a full rebuild, but please restore to 'false' before merging
-  IGNORE_CACHE_AND_DO_FULL_REBUILD: 'false'
+  IGNORE_CACHE_AND_DO_FULL_REBUILD: 'true'
 
 jobs:
   build:
diff --git a/vinca.yaml b/vinca.yaml
index 19fcffaf..44cef2a3 100644
--- a/vinca.yaml
+++ b/vinca.yaml
@@ -5,12 +5,12 @@ conda_index:
   - robostack.yaml
   - packages-ignore.yaml
 
-# Reminder for next full rebuild, the next build number should be 22
-build_number: 21
+# Reminder for next full rebuild, the next build number should be 23
+build_number: 22
 
 mutex_package:
   name: "ros2-distro-mutex"
-  version: "0.17.0"
+  version: "0.18.0"
   upper_bound: "x.x"
   run_constraints:
     - libboost 1.90.*