From 0a94b5c2d3141d9ec37cf17e9afe72fabf93872b Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 18 Feb 2026 11:18:31 -0700 Subject: [PATCH] Patch COSMIC apps to use new rustix and update cosmic-store to openssl3 --- recipes/tools/cosmic-edit/recipe.toml | 3 ++- recipes/tools/cosmic-files/recipe.toml | 3 ++- recipes/tools/cosmic-store/recipe.toml | 6 ++++-- recipes/tools/cosmic-term/recipe.toml | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/recipes/tools/cosmic-edit/recipe.toml b/recipes/tools/cosmic-edit/recipe.toml index bb8133289..45f55c176 100644 --- a/recipes/tools/cosmic-edit/recipe.toml +++ b/recipes/tools/cosmic-edit/recipe.toml @@ -11,7 +11,8 @@ dependencies = [ script = """ DYNAMIC_INIT export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr" -cookbook_cargo --no-default-features +#TODO: drop patched rustix after upstream release +cookbook_cargo --no-default-features --config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' 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 7804f4213..158cf0c00 100644 --- a/recipes/tools/cosmic-files/recipe.toml +++ b/recipes/tools/cosmic-files/recipe.toml @@ -11,7 +11,8 @@ dependencies = [ script = """ DYNAMIC_INIT export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr" -cookbook_cargo --no-default-features +#TODO: drop patched rustix after upstream release +cookbook_cargo --no-default-features --config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' 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 b303c6462..edba703e5 100644 --- a/recipes/tools/cosmic-store/recipe.toml +++ b/recipes/tools/cosmic-store/recipe.toml @@ -7,12 +7,14 @@ template = "custom" dependencies = [ "gettext", "libxkbcommon", - "openssl1", + "openssl3", ] script = """ DYNAMIC_INIT export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr" -cookbook_cargo --no-default-features --features desktop,pkgar +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"' #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 21bf0884f..bc46f9d8d 100644 --- a/recipes/tools/cosmic-term/recipe.toml +++ b/recipes/tools/cosmic-term/recipe.toml @@ -11,7 +11,8 @@ dependencies = [ script = """ DYNAMIC_INIT export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr" -cookbook_cargo --no-default-features +#TODO: drop patched rustix after upstream release +cookbook_cargo --no-default-features --config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps" cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/10_cosmic-term"