From 7394b85cf7ca64e718a25068e52e6e81ec4516c1 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 25 Feb 2026 10:46:20 -0700 Subject: [PATCH] Drop rustix patches where possible --- recipes/tools/cosmic-edit/recipe.toml | 5 +---- recipes/tools/cosmic-files/recipe.toml | 5 +---- recipes/tools/cosmic-store/recipe.toml | 5 +---- recipes/tools/cosmic-term/recipe.toml | 5 +---- recipes/wip/players/cosmic-player/recipe.toml | 2 -- 5 files changed, 4 insertions(+), 18 deletions(-) diff --git a/recipes/tools/cosmic-edit/recipe.toml b/recipes/tools/cosmic-edit/recipe.toml index 6e00ff681..bb8133289 100644 --- a/recipes/tools/cosmic-edit/recipe.toml +++ b/recipes/tools/cosmic-edit/recipe.toml @@ -11,10 +11,7 @@ dependencies = [ script = """ DYNAMIC_INIT export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr" -#TODO: drop patched rustix after upstream release -cookbook_cargo --no-default-features \ - --config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \ - --config 'patch.crates-io.rustix.rev = "8bf15a0"' +cookbook_cargo --no-default-features mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps" cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/30_cosmic-edit" diff --git a/recipes/tools/cosmic-files/recipe.toml b/recipes/tools/cosmic-files/recipe.toml index 05de1f3e6..7804f4213 100644 --- a/recipes/tools/cosmic-files/recipe.toml +++ b/recipes/tools/cosmic-files/recipe.toml @@ -11,10 +11,7 @@ dependencies = [ script = """ DYNAMIC_INIT export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr" -#TODO: drop patched rustix after upstream release -cookbook_cargo --no-default-features \ - --config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \ - --config 'patch.crates-io.rustix.rev = "8bf15a0"' +cookbook_cargo --no-default-features mkdir -pv "${COOKBOOK_STAGE}/usr/bin/" cp -v "target/${TARGET}/release/cosmic-files" "${COOKBOOK_STAGE}/usr/bin/" diff --git a/recipes/tools/cosmic-store/recipe.toml b/recipes/tools/cosmic-store/recipe.toml index be3798029..3c57d1ef2 100644 --- a/recipes/tools/cosmic-store/recipe.toml +++ b/recipes/tools/cosmic-store/recipe.toml @@ -13,10 +13,7 @@ script = """ DYNAMIC_INIT export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr" export ZSTD_SYS_USE_PKG_CONFIG=1 -#TODO: drop patched rustix after upstream release -cookbook_cargo --no-default-features --features desktop,pkgar \ - --config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \ - --config 'patch.crates-io.rustix.rev = "8bf15a0"' +cookbook_cargo --no-default-features --features desktop,pkgar #TODO: install with just? APPID="com.system76.CosmicStore" diff --git a/recipes/tools/cosmic-term/recipe.toml b/recipes/tools/cosmic-term/recipe.toml index f7d2ccb30..21bf0884f 100644 --- a/recipes/tools/cosmic-term/recipe.toml +++ b/recipes/tools/cosmic-term/recipe.toml @@ -11,10 +11,7 @@ dependencies = [ script = """ DYNAMIC_INIT export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr" -#TODO: drop patched rustix after upstream release -cookbook_cargo --no-default-features \ - --config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \ - --config 'patch.crates-io.rustix.rev = "8bf15a0"' +cookbook_cargo --no-default-features mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps" cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/10_cosmic-term" diff --git a/recipes/wip/players/cosmic-player/recipe.toml b/recipes/wip/players/cosmic-player/recipe.toml index 96ba8486d..db1b55046 100644 --- a/recipes/wip/players/cosmic-player/recipe.toml +++ b/recipes/wip/players/cosmic-player/recipe.toml @@ -21,8 +21,6 @@ DYNAMIC_INIT --release \ --bin cosmic-player \ --no-default-features \ - --config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \ - --config 'patch.crates-io.rustix.rev = "8bf15a0"' -- \ -C link-args="-lgmodule-2.0 -lffi -liconv -lpcre2-8 -lz" mkdir -pv "${COOKBOOK_STAGE}/usr/bin/"