From 96bdc6b92dffce00c3445b2604d7557aab5265ee Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 23 Feb 2026 08:41:22 -0700 Subject: [PATCH] Update rustix patch to use pinned revision --- recipes/tools/cosmic-edit/recipe.toml | 4 +++- recipes/tools/cosmic-files/recipe.toml | 4 +++- recipes/tools/cosmic-settings/recipe.toml | 4 +++- recipes/tools/cosmic-store/recipe.toml | 4 +++- recipes/tools/cosmic-term/recipe.toml | 4 +++- recipes/wip/libs/other/tree-sitter/recipe.toml | 4 +++- recipes/wip/players/cosmic-player/recipe.toml | 1 + 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/recipes/tools/cosmic-edit/recipe.toml b/recipes/tools/cosmic-edit/recipe.toml index 45f55c176..6e00ff681 100644 --- a/recipes/tools/cosmic-edit/recipe.toml +++ b/recipes/tools/cosmic-edit/recipe.toml @@ -12,7 +12,9 @@ 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"' +cookbook_cargo --no-default-features \ + --config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \ + --config 'patch.crates-io.rustix.rev = "8bf15a0"' 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 158cf0c00..05de1f3e6 100644 --- a/recipes/tools/cosmic-files/recipe.toml +++ b/recipes/tools/cosmic-files/recipe.toml @@ -12,7 +12,9 @@ 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"' +cookbook_cargo --no-default-features \ + --config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \ + --config 'patch.crates-io.rustix.rev = "8bf15a0"' mkdir -pv "${COOKBOOK_STAGE}/usr/bin/" cp -v "target/${TARGET}/release/cosmic-files" "${COOKBOOK_STAGE}/usr/bin/" diff --git a/recipes/tools/cosmic-settings/recipe.toml b/recipes/tools/cosmic-settings/recipe.toml index 41f87a707..031d06bb9 100644 --- a/recipes/tools/cosmic-settings/recipe.toml +++ b/recipes/tools/cosmic-settings/recipe.toml @@ -11,7 +11,9 @@ dependencies = [ script = """ DYNAMIC_INIT export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr" -(COOKBOOK_SOURCE+="/cosmic-settings" cookbook_cargo --no-default-features --config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"') +(COOKBOOK_SOURCE+="/cosmic-settings" cookbook_cargo --no-default-features \ + --config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \ + --config 'patch.crates-io.rustix.rev = "8bf15a0"') mkdir -pv "${COOKBOOK_STAGE}/usr/bin/" cp -v "target/${TARGET}/release/cosmic-settings" "${COOKBOOK_STAGE}/usr/bin/" diff --git a/recipes/tools/cosmic-store/recipe.toml b/recipes/tools/cosmic-store/recipe.toml index edba703e5..be3798029 100644 --- a/recipes/tools/cosmic-store/recipe.toml +++ b/recipes/tools/cosmic-store/recipe.toml @@ -14,7 +14,9 @@ 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"' +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"' #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 bc46f9d8d..f7d2ccb30 100644 --- a/recipes/tools/cosmic-term/recipe.toml +++ b/recipes/tools/cosmic-term/recipe.toml @@ -12,7 +12,9 @@ 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"' +cookbook_cargo --no-default-features \ + --config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \ + --config 'patch.crates-io.rustix.rev = "8bf15a0"' 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/libs/other/tree-sitter/recipe.toml b/recipes/wip/libs/other/tree-sitter/recipe.toml index 6cd7fd347..07e2e11ee 100644 --- a/recipes/wip/libs/other/tree-sitter/recipe.toml +++ b/recipes/wip/libs/other/tree-sitter/recipe.toml @@ -9,6 +9,8 @@ patches = [ template = "custom" script = """ DYNAMIC_INIT -PACKAGE_PATH=cli cookbook_cargo --config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' +PACKAGE_PATH=cli cookbook_cargo \ + --config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \ + --config 'patch.crates-io.rustix.rev = "8bf15a0"' cookbook_cmake "${COOKBOOK_SOURCE}"/lib """ diff --git a/recipes/wip/players/cosmic-player/recipe.toml b/recipes/wip/players/cosmic-player/recipe.toml index 0740fd3d6..96ba8486d 100644 --- a/recipes/wip/players/cosmic-player/recipe.toml +++ b/recipes/wip/players/cosmic-player/recipe.toml @@ -22,6 +22,7 @@ DYNAMIC_INIT --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/"