From a975154b271a4e8093f8f78aca4c05d09f986c75 Mon Sep 17 00:00:00 2001
From: Ruben Arts <ruben.arts@hotmail.com>
Date: Thu, 3 Sep 2026 15:42:02 +0200
Subject: [PATCH 1/2] fix: ros2 cli autocompletions

---
 patch/ros-rolling-ros2cli.patch | 34 +++++++++++++++++++++++++++++++++
 patch/ros-rolling-rosidl.patch  | 31 ++++++++++++++++++++++++++++++
 pkg_additional_info.yaml        |  4 ++++
 tests/ros-rolling-ros2cli.yaml  |  8 ++++++++
 tests/ros-rolling-rosidl.yaml   |  7 +++++++
 5 files changed, 84 insertions(+)
 create mode 100644 patch/ros-rolling-ros2cli.patch
 create mode 100644 patch/ros-rolling-rosidl.patch
 create mode 100644 tests/ros-rolling-ros2cli.yaml
 create mode 100644 tests/ros-rolling-rosidl.yaml

diff --git a/patch/ros-rolling-ros2cli.patch b/patch/ros-rolling-ros2cli.patch
new file mode 100644
index 00000000..5736688c
--- /dev/null
+++ b/patch/ros-rolling-ros2cli.patch
@@ -0,0 +1,34 @@
+diff --git a/ros2cli/completion/ros2-argcomplete.zsh b/ros2cli/completion/ros2-argcomplete.zsh
+index b9fc309..14279de 100644
+--- a/ros2cli/completion/ros2-argcomplete.zsh
++++ b/ros2cli/completion/ros2-argcomplete.zsh
+@@ -20,6 +20,6 @@ autoload -U +X bashcompinit && bashcompinit
+ # Get this scripts directory
+ __ros2cli_completion_dir=${0:a:h}
+ # Just source the bash version, it works in zsh too
+-source "$__ros2cli_completion_dir/ros2-argcomplete.bash"
++source "$CONDA_PREFIX/share/bash-completion/completions/ros2-argcomplete.bash"
+ # Cleanup
+ unset __ros2cli_completion_dir
+diff --git a/ros2cli/setup.py b/ros2cli/setup.py
+index 458010c..c08d015 100644
+--- a/ros2cli/setup.py
++++ b/ros2cli/setup.py
+@@ -24,6 +24,17 @@ setup(
+             'completion/ros2-argcomplete.fish',
+             'completion/ros2-argcomplete.zsh',
+         ]),
++
++        # [pixi] install autocompletion scripts
++        ('share/bash-completion/completions', [
++            'completion/ros2-argcomplete.bash',
++        ]),
++        ('share/zsh/site-functions', [
++            'completion/ros2-argcomplete.zsh',
++        ]),
++        ('share/fish/vendor_completions.d', [
++            'completion/ros2-argcomplete.fish',
++        ]),
+     ],
+     package_data={'': ['py.typed']},
+     zip_safe=False,
diff --git a/patch/ros-rolling-rosidl.patch b/patch/ros-rolling-rosidl.patch
new file mode 100644
index 00000000..7d668c89
--- /dev/null
+++ b/patch/ros-rolling-rosidl.patch
@@ -0,0 +1,31 @@
+diff --git a/rosidl_cli/completion/rosidl-argcomplete.zsh b/rosidl_cli/completion/rosidl-argcomplete.zsh
+index 9a86dbd..a33f8e1 100644
+--- a/rosidl_cli/completion/rosidl-argcomplete.zsh
++++ b/rosidl_cli/completion/rosidl-argcomplete.zsh
+@@ -18,6 +18,6 @@ autoload -U +X bashcompinit && bashcompinit
+ # Get this scripts directory
+ __rosidl_cli_completion_dir=${0:a:h}
+ # Just source the bash version, it works in zsh too
+-source "$__rosidl_cli_completion_dir/rosidl-argcomplete.bash"
++source "$CONDA_PREFIX/share/bash-completion/completions/rosidl-argcomplete.bash"
+ # Cleanup
+ unset __rosidl_cli_completion_dir
+diff --git a/rosidl_cli/setup.py b/rosidl_cli/setup.py
+index 7b41f65..36a71b3 100644
+--- a/rosidl_cli/setup.py
++++ b/rosidl_cli/setup.py
+@@ -23,6 +23,14 @@ setup(
+             'completion/rosidl-argcomplete.bash',
+             'completion/rosidl-argcomplete.zsh'
+         ]),
++
++        # [pixi] install autocompletion scripts
++        ('share/bash-completion/completions', [
++            'completion/rosidl-argcomplete.bash',
++        ]),
++        ('share/zsh/site-functions', [
++            'completion/rosidl-argcomplete.zsh'
++        ]),
+     ],
+     package_data={'': ['py.typed']},
+     zip_safe=False,
diff --git a/pkg_additional_info.yaml b/pkg_additional_info.yaml
index bdeacdc0..88bec679 100644
--- a/pkg_additional_info.yaml
+++ b/pkg_additional_info.yaml
@@ -231,3 +231,7 @@ visp:
     override_version: '3.6.0'
 zenoh_cpp_vendor:
   additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK -DUSE_SYSTEM_ZENOH=ON"
+ros2cli:
+  build_number: 26
+rosidl_cli:
+  build_number: 26
diff --git a/tests/ros-rolling-ros2cli.yaml b/tests/ros-rolling-ros2cli.yaml
new file mode 100644
index 00000000..6a0f9eed
--- /dev/null
+++ b/tests/ros-rolling-ros2cli.yaml
@@ -0,0 +1,8 @@
+tests:
+  # Regression test for https://github.com/RoboStack/ros-humble/issues/271
+  - script:
+    - if: unix
+      then:
+        - test -f ${PREFIX}/share/bash-completion/completions/ros2-argcomplete.bash
+        - test -f ${PREFIX}/share/zsh/site-functions/ros2-argcomplete.zsh
+        - test -f ${PREFIX}/share/fish/vendor_completions.d/ros2-argcomplete.fish
diff --git a/tests/ros-rolling-rosidl.yaml b/tests/ros-rolling-rosidl.yaml
new file mode 100644
index 00000000..9a42672a
--- /dev/null
+++ b/tests/ros-rolling-rosidl.yaml
@@ -0,0 +1,7 @@
+tests:
+  # Regression test for https://github.com/RoboStack/ros-humble/issues/271
+  - script:
+    - if: unix
+      then:
+        - test -f ${PREFIX}/share/bash-completion/completions/rosidl-argcomplete.bash
+        - test -f ${PREFIX}/share/zsh/site-functions/rosidl-argcomplete.zsh

From 06da5114d9612304aa0a51f630fe710a3e92c04f Mon Sep 17 00:00:00 2001
From: Ruben Arts <ruben.arts@hotmail.com>
Date: Fri, 4 Sep 2026 10:01:10 +0200
Subject: [PATCH 2/2] bump rebuild number hint

---
 vinca.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vinca.yaml b/vinca.yaml
index 1791026c..02206144 100644
--- a/vinca.yaml
+++ b/vinca.yaml
@@ -7,7 +7,7 @@ conda_index:
   - robostack.yaml
   - packages-ignore.yaml
 
-# Reminder for next full rebuild, the next build number should be 26
+# Reminder for next full rebuild, the next build number should be 27
 build_number: 25
 
 mutex_package: