Replace patches for mavros/mavlink with sed one-liners.

Author: amarburg

.docker/Dockerfile

@@ -114,14 +114,18 @@ ARG MAVROS_RELEASE=ros2
 ARG MAVLINK_RELEASE=release/rolling/mavlink
 RUN git clone --depth 1 -b ${MAVROS_RELEASE} https://github.com/mavlink/mavros.git
 RUN git clone --depth 1 --recursive -b ${MAVLINK_RELEASE} https://github.com/mavlink/mavlink-gbp-release.git mavlink
-# mavgen uses future.standard_library for backwards compatibility with Python2;
-# However, this caused issues Python3.12 as installed in "noble".
-# Comment those lines out in mavlink.
-# n.b. This may not be the best way to do this.  A sed one-liner?
-RUN patch -d mavlink -p 1 < $USER_WORKSPACE/src/blue/.docker/patches/mavlink_standard_library.patch
-# Fix linkage for yaml-cpp in mavros_extra_plugins
-RUN patch -d mavros -p 1 < $USER_WORKSPACE/src/blue/.docker/patches/mavros_extra_yaml_linkage.patch
-
+# - mavgen uses future.standard_library for backwards compatibility with Python2;
+#   However, this caused issues with Python 3.12 installed in "noble".
+#   Comment those lines out in mavlink.
+#
+# - Fix linkage for yaml-cpp in mavros_extra_plugins
+RUN sed -i -e 's/^from future import standard_library/#from future import standard_library/' \
+    -e 's/standard_library.install_aliases()/#standard_library.install_aliases()/' \
+    mavlink/pymavlink/generator/mavgen.py && \
+    sed -i -e 's/^# find_package(yaml_cpp REQUIRED)/find_package(yaml-cpp REQUIRED)/' \
+    -e '/^ament_target_dependencies(mavros_extras_plugins$/i target_link_libraries(mavros_extras_plugins yaml-cpp::yaml-cpp)' \
+    -e '/^ament_target_dependencies(mavros_extras$/i target_link_libraries(mavros_extras yaml-cpp::yaml-cpp)' \
+    mavros/mavros_extras/CMakeLists.txt
 
 WORKDIR $USER_WORKSPACE
 RUN sudo apt-get -q update \

.docker/patches/mavlink_standard_library.patch

@@ -9,5 +9,4 @@
 !blue.repos
 !sim.repos
 !.docker/entrypoints
-!.docker/patches
 !requirements-build.txt