commit: f483544c4b7e8b8fe7657be5900412189f059d4c
Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 12 13:28:59 2026 +0000
Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org>
CommitDate: Thu Feb 12 13:28:59 2026 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f483544c
app-shells/fish: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org>
.../fish-4.1.0-use-cargo-eclass-for-build.patch | 48 ------------------
.../fish-4.2.0-use-cargo-eclass-for-build.patch | 59 ----------------------
2 files changed, 107 deletions(-)
diff --git a/app-shells/fish/files/fish-4.1.0-use-cargo-eclass-for-build.patch
b/app-shells/fish/files/fish-4.1.0-use-cargo-eclass-for-build.patch
deleted file mode 100644
index 8261a3588981..000000000000
--- a/app-shells/fish/files/fish-4.1.0-use-cargo-eclass-for-build.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 15f32f8466..11c11e292c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,18 +45,7 @@
- ${target} ALL
- COMMAND
- "${CMAKE_COMMAND}" -E
-- env ${VARS_FOR_CARGO}
-- ${Rust_CARGO}
-- build --bin ${target}
-- $<$<CONFIG:Release>:--release>
-- $<$<CONFIG:RelWithDebInfo>:--profile=release-with-debug>
-- --target ${Rust_CARGO_TARGET}
-- --no-default-features
-- --features=${FISH_CARGO_FEATURES}
-- ${CARGO_FLAGS}
-- &&
-- "${CMAKE_COMMAND}" -E
-- copy "${rust_target_dir}/${rust_profile}/${target}"
"${CMAKE_CURRENT_BINARY_DIR}"
-+ copy "${FISH_RUST_BUILD_DIR}/${rust_profile}/${target}"
"${CMAKE_CURRENT_BINARY_DIR}"
- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
- USES_TERMINAL
- )
-diff --git a/cmake/Rust.cmake b/cmake/Rust.cmake
-index 00ddf90559..a8ae3028d0 100644
---- a/cmake/Rust.cmake
-+++ b/cmake/Rust.cmake
-@@ -1,7 +1,7 @@
- include(FindRust)
- find_package(Rust REQUIRED)
-
--set(FISH_RUST_BUILD_DIR "${CMAKE_BINARY_DIR}/cargo/build")
-+set(FISH_RUST_BUILD_DIR "${CMAKE_SOURCE_DIR}/target")
-
- if(DEFINED ASAN)
- list(APPEND CARGO_FLAGS "-Z" "build-std")
-@@ -18,8 +18,8 @@
- set(rust_target_dir "${FISH_RUST_BUILD_DIR}/${Rust_CARGO_HOST_TARGET}")
- endif()
-
--set(rust_profile
$<IF:$<CONFIG:Debug>,debug,$<IF:$<CONFIG:RelWithDebInfo>,release-with-debug,release>>)
--set(rust_debugflags "$<$<CONFIG:Debug>:-g>$<$<CONFIG:RelWithDebInfo>:-g>")
-+set(rust_profile $<IF:$<CONFIG:Debug>,debug,release>)
-+set(rust_debugflags "$<$<CONFIG:Debug>:-g>")
-
- option(WITH_GETTEXT "Build with gettext localization support. Requires
`msgfmt` to work." ON)
- # Enable gettext feature unless explicitly disabled.
diff --git a/app-shells/fish/files/fish-4.2.0-use-cargo-eclass-for-build.patch
b/app-shells/fish/files/fish-4.2.0-use-cargo-eclass-for-build.patch
deleted file mode 100644
index 813c0e43533d..000000000000
--- a/app-shells/fish/files/fish-4.2.0-use-cargo-eclass-for-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d161def836..19a0dbc499 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -54,27 +54,16 @@
-
- set(build_types Release RelWithDebInfo Debug "")
- if(NOT "${CMAKE_BUILD_TYPE}" IN_LIST build_types)
-- message(WARNING "Unsupported build type ${CMAKE_BUILD_TYPE}. If this
doesn't build, try one of Release, RelWithDebInfo or Debug")
-+ message(WARNING "Unsupported build type ${CMAKE_BUILD_TYPE}. If this
doesn't build, try one of Release, RelWithDebInfo or Debug")
- endif()
-
- # Define a function to build and link dependencies.
- function(CREATE_TARGET target)
-- add_custom_target(
-+ add_custom_target(
- ${target} ALL
- COMMAND
- "${CMAKE_COMMAND}" -E
-- env ${VARS_FOR_CARGO}
-- ${Rust_CARGO}
-- build --bin ${target}
-- $<$<CONFIG:Release>:--release>
-- $<$<CONFIG:RelWithDebInfo>:--profile=release-with-debug>
-- --target ${Rust_CARGO_TARGET}
-- --no-default-features
-- --features=${FISH_CARGO_FEATURES}
-- ${CARGO_FLAGS}
-- &&
-- "${CMAKE_COMMAND}" -E
-- copy "${rust_target_dir}/${rust_profile}/${target}"
"${CMAKE_CURRENT_BINARY_DIR}"
-+ copy "${FISH_RUST_BUILD_DIR}/${rust_profile}/${target}"
"${CMAKE_CURRENT_BINARY_DIR}"
- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
- USES_TERMINAL
- )
-diff --git a/cmake/Rust.cmake b/cmake/Rust.cmake
-index 1de0da5803..c92c1cc2af 100644
---- a/cmake/Rust.cmake
-+++ b/cmake/Rust.cmake
-@@ -1,7 +1,7 @@
- include(FindRust)
- find_package(Rust REQUIRED)
-
--set(FISH_RUST_BUILD_DIR "${CMAKE_BINARY_DIR}/cargo/build")
-+set(FISH_RUST_BUILD_DIR "${CMAKE_SOURCE_DIR}/target")
-
- list(APPEND FISH_CARGO_FEATURES_LIST "embed-data")
-
-@@ -20,8 +20,8 @@
- set(rust_target_dir "${FISH_RUST_BUILD_DIR}/${Rust_CARGO_HOST_TARGET}")
- endif()
-
--set(rust_profile
$<IF:$<CONFIG:Debug>,debug,$<IF:$<CONFIG:RelWithDebInfo>,release-with-debug,release>>)
--set(rust_debugflags "$<$<CONFIG:Debug>:-g>$<$<CONFIG:RelWithDebInfo>:-g>")
-+set(rust_profile $<IF:$<CONFIG:Debug>,debug,release>)
-+set(rust_debugflags $<$<CONFIG:Debug>:-g>)
-
- option(WITH_GETTEXT "Build with gettext localization support. Requires
`msgfmt` to work." ON)
- # Enable gettext feature unless explicitly disabled.
