MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-11-05 04:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'cosmic-shared' into 'master'

Browse Source 
Improve dynamically linked cosmic apps

See merge request redox-os/redox!2318
This commit is contained in:
Jeremy Soller 2026-09-01 06:05:14 -06:00
commit 1fb8aefb0b
8 changed files with 49 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
recipes/cosmic/cosmic-edit/recipe.toml
View File

@ -4,12 +4,11 @@ git = "https://github.com/pop-os/cosmic-edit.git"
[build]
template = "custom"
dependencies = [
"gettext",
"libxkbcommon",
"libonig",
]
script = """
DYNAMIC_INIT
export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr"
export RUSTONIG_DYNAMIC_LIBONIG=1
cookbook_cargo --no-default-features
mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps"
@ -23,3 +22,8 @@ cp -v "${COOKBOOK_SOURCE}/res/${APPID}.metainfo.xml" "${COOKBOOK_STAGE}/usr/shar
mkdir -pv "${COOKBOOK_STAGE}/usr/share/icons/"
cp -rv "${COOKBOOK_SOURCE}/res/icons/hicolor/" "${COOKBOOK_STAGE}/usr/share/icons/"
"""
[package]
dependencies = [
"libxkbcommon",
]

10
recipes/cosmic/cosmic-files/recipe.toml
View File

@ -4,12 +4,11 @@ git = "https://github.com/pop-os/cosmic-files.git"
[build]
template = "custom"
dependencies = [
"gettext",
"libxkbcommon",
"zstd",
]
script = """
DYNAMIC_INIT
export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr"
export ZSTD_SYS_USE_PKG_CONFIG=1
cookbook_cargo --no-default-features
mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps/"
@ -23,3 +22,8 @@ cp -v "${COOKBOOK_SOURCE}/res/${APPID}.metainfo.xml" "${COOKBOOK_STAGE}/usr/shar
mkdir -pv "${COOKBOOK_STAGE}/usr/share/icons/"
cp -rv "${COOKBOOK_SOURCE}/res/icons/hicolor/" "${COOKBOOK_STAGE}/usr/share/icons/"
"""
[package]
dependencies = [
"libxkbcommon",
]

6
recipes/cosmic/cosmic-monitor/recipe.toml
View File

@ -6,7 +6,6 @@ rev = "epoch-1.2.0"
template = "custom"
dependencies = [
"gettext",
"libxkbcommon",
]
script = """
DYNAMIC_INIT
@ -22,3 +21,8 @@ cp -v "${COOKBOOK_SOURCE}/res/${APPID}.metainfo.xml" "${COOKBOOK_STAGE}/usr/shar
mkdir -pv "${COOKBOOK_STAGE}/usr/share/icons/"
cp -rv "${COOKBOOK_SOURCE}/res/icons/hicolor/" "${COOKBOOK_STAGE}/usr/share/icons/"
"""
[package]
dependencies = [
"libxkbcommon",
]

5
recipes/cosmic/cosmic-reader/recipe.toml
View File

@ -36,3 +36,8 @@ cp -v "${COOKBOOK_SOURCE}/res/${APPID}.thumbnailer" "${COOKBOOK_STAGE}/usr/share
mkdir -pv "${COOKBOOK_STAGE}/usr/share/icons/"
cp -rv "${COOKBOOK_SOURCE}/res/icons/hicolor/" "${COOKBOOK_STAGE}/usr/share/icons/"
"""
[package]
dependencies = [
"libxkbcommon",
]

14
recipes/cosmic/cosmic-settings/recipe.toml
View File

@ -4,16 +4,9 @@ branch = "master"
shallow_clone = true
[build]
template = "custom"
dependencies = [
"gettext",
"libxkbcommon",
]
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"' \
--config 'patch.crates-io.rustix.rev = "8bf15a0"')
COOKBOOK_SOURCE+="/cosmic-settings" cookbook_cargo --no-default-features
mkdir -pv "${COOKBOOK_STAGE}/usr/bin/"
cp -v "target/${TARGET}/release/cosmic-settings" "${COOKBOOK_STAGE}/usr/bin/"
@ -28,3 +21,8 @@ cp -rv "${COOKBOOK_SOURCE}/resources/default_schema/" "${COOKBOOK_STAGE}/usr/sha
mkdir -pv "${COOKBOOK_STAGE}/usr/share/icons/"
cp -rv "${COOKBOOK_SOURCE}/resources/icons/" "${COOKBOOK_STAGE}/usr/share/icons/hicolor/"
"""
[package]
dependencies = [
"libxkbcommon",
]

6
recipes/cosmic/cosmic-store/recipe.toml
View File

@ -5,7 +5,6 @@ shallow_clone = true
template = "custom"
dependencies = [
"gettext",
"libxkbcommon",
"openssl3",
]
script = """
@ -23,3 +22,8 @@ cp -v "${COOKBOOK_SOURCE}/res/${APPID}.metainfo.xml" "${COOKBOOK_STAGE}/usr/shar
mkdir -pv "${COOKBOOK_STAGE}/usr/share/icons/"
cp -rv "${COOKBOOK_SOURCE}/res/icons/hicolor/" "${COOKBOOK_STAGE}/usr/share/icons/"
"""
[package]
dependencies = [
"libxkbcommon",
]

10
recipes/cosmic/cosmic-term/recipe.toml
View File

@ -3,13 +3,8 @@ git = "https://github.com/pop-os/cosmic-term.git"
[build]
template = "custom"
dependencies = [
"gettext",
"libxkbcommon",
]
script = """
DYNAMIC_INIT
export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr"
cookbook_cargo --no-default-features
mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps"
@ -23,3 +18,8 @@ cp -v "${COOKBOOK_SOURCE}/res/${APPID}.metainfo.xml" "${COOKBOOK_STAGE}/usr/shar
mkdir -pv "${COOKBOOK_STAGE}/usr/share/icons/"
cp -rv "${COOKBOOK_SOURCE}/res/icons/hicolor/" "${COOKBOOK_STAGE}/usr/share/icons/"
"""
[package]
dependencies = [
"libxkbcommon",
]

9
recipes/cosmic/cosmic-text/recipe.toml
View File

@ -4,8 +4,17 @@ branch = "main"
[build]
template = "custom"
dependencies = [
"libonig",
]
script = """
DYNAMIC_INIT
export RUSTONIG_DYNAMIC_LIBONIG=1
COOKBOOK_CARGO_FLAGS=() # remove --locked
COOKBOOK_CARGO_PATH=examples/editor cookbook_cargo_build
"""
[package]
dependencies = [
"libxkbcommon",
]