From 78733081e69fe1b035f9636aa47f922a412ba7a7 Mon Sep 17 00:00:00 2001
From: Ribbon <ribbon_45@proton.me>
Date: Wed, 15 Jul 2026 16:26:50 -0300
Subject: [PATCH] Add, fix, improve more recipes and convert rust-cairo demos
 to TOML

---
 recipes/wip/demos/piston/recipe.toml          |  2 +-
 recipes/wip/demos/rapier/recipe.toml          |  2 +-
 recipes/wip/demos/rsille/recipe.toml          |  8 +-----
 recipes/wip/demos/rust-cairo-demo/recipe.sh   | 18 -------------
 recipes/wip/demos/rust-cairo-demo/recipe.toml | 15 +++++++++++
 recipes/wip/demos/rust-cairo/recipe.sh        | 25 -------------------
 recipes/wip/demos/rust-cairo/recipe.toml      | 16 ++++++++++++
 recipes/wip/dev/other/github-cli/recipe.toml  | 10 ++++++++
 recipes/wip/games/engines/godot4/recipe.toml  |  2 +-
 recipes/wip/games/engines/redot4/recipe.toml  |  6 -----
 recipes/wip/image/editors/svguru/recipe.toml  |  6 +++++
 recipes/wip/image/viewers/svgtail/recipe.toml |  6 +++++
 12 files changed, 57 insertions(+), 59 deletions(-)
 delete mode 100644 recipes/wip/demos/rust-cairo-demo/recipe.sh
 create mode 100644 recipes/wip/demos/rust-cairo-demo/recipe.toml
 delete mode 100644 recipes/wip/demos/rust-cairo/recipe.sh
 create mode 100644 recipes/wip/demos/rust-cairo/recipe.toml
 create mode 100644 recipes/wip/dev/other/github-cli/recipe.toml
 delete mode 100644 recipes/wip/games/engines/redot4/recipe.toml
 create mode 100644 recipes/wip/image/editors/svguru/recipe.toml
 create mode 100644 recipes/wip/image/viewers/svgtail/recipe.toml

diff --git a/recipes/wip/demos/piston/recipe.toml b/recipes/wip/demos/piston/recipe.toml
index b54087195..10e52f04d 100644
--- a/recipes/wip/demos/piston/recipe.toml
+++ b/recipes/wip/demos/piston/recipe.toml
@@ -1,4 +1,4 @@
-#TODO glutin crate error
+#TODO update redox_syscall crate version
 [source]
 git = "https://github.com/pistondevelopers/piston-examples"
 shallow_clone = true
diff --git a/recipes/wip/demos/rapier/recipe.toml b/recipes/wip/demos/rapier/recipe.toml
index a9939ffd1..feeba3554 100644
--- a/recipes/wip/demos/rapier/recipe.toml
+++ b/recipes/wip/demos/rapier/recipe.toml
@@ -1,4 +1,4 @@
-#TODO x11rb, rustix and webbrowser crates error
+#TODO rfd crates error
 [source]
 git = "https://github.com/dimforge/rapier"
 shallow_clone = true
diff --git a/recipes/wip/demos/rsille/recipe.toml b/recipes/wip/demos/rsille/recipe.toml
index 63263715c..fbe9a7e64 100644
--- a/recipes/wip/demos/rsille/recipe.toml
+++ b/recipes/wip/demos/rsille/recipe.toml
@@ -4,10 +4,4 @@ git = "https://github.com/nidhoggfgg/rsille"
 shallow_clone = true
 [build]
 template = "cargo"
-cargoflags = ["--features=img"]
-cargoexamples = [
-    "anime-mix",
-    "obj-mix",
-    "cube",
-    "cube-colorful",
-]
+cargopath = "examples/rsille-showcase"
diff --git a/recipes/wip/demos/rust-cairo-demo/recipe.sh b/recipes/wip/demos/rust-cairo-demo/recipe.sh
deleted file mode 100644
index 7c1c4c28d..000000000
--- a/recipes/wip/demos/rust-cairo-demo/recipe.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-GIT=https://gitlab.redox-os.org/redox-os/rust-cairo-demo.git
-BUILD_DEPENDS=(cairo expat fontconfig freetype2 libpng pixman zlib)
-
-function recipe_build {
-    sysroot="$(realpath ../sysroot)"
-    cargo rustc --target "$TARGET" --release ${CARGOFLAGS} \
-        -- \
-        -L "${sysroot}/lib" \
-        -l cairo \
-        -l fontconfig \
-        -l expat \
-    	-l pixman-1 \
-    	-l freetype \
-    	-l png \
-    	-l z
-    skip=1
-}
-
diff --git a/recipes/wip/demos/rust-cairo-demo/recipe.toml b/recipes/wip/demos/rust-cairo-demo/recipe.toml
new file mode 100644
index 000000000..0d7f7bc17
--- /dev/null
+++ b/recipes/wip/demos/rust-cairo-demo/recipe.toml
@@ -0,0 +1,15 @@
+#TODO compile and test
+[source]
+git = "https://gitlab.redox-os.org/redox-os/rust-cairo-demo"
+shallow_clone = true
+[build]
+template = "cargo"
+dependencies = [
+    "cairo",
+    "expat",
+    "fontconfig",
+    "freetype2",
+    "libpng",
+    "pixman",
+    "zlib",
+]
diff --git a/recipes/wip/demos/rust-cairo/recipe.sh b/recipes/wip/demos/rust-cairo/recipe.sh
deleted file mode 100644
index 033b28df0..000000000
--- a/recipes/wip/demos/rust-cairo/recipe.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-GIT=https://gitlab.redox-os.org/redox-os/rust-cairo.git
-BUILD_DEPENDS=(cairo expat fontconfig freetype2 libpng pixman zlib)
-CARGOFLAGS="--example gui"
-
-function recipe_build {
-    sysroot="$(realpath ../sysroot)"
-    cargo rustc --target "$TARGET" --release ${CARGOFLAGS} \
-        -- \
-        -L "${sysroot}/lib" \
-        -l cairo \
-        -l fontconfig \
-        -l expat \
-    	-l pixman-1 \
-    	-l freetype \
-    	-l png \
-    	-l z
-    skip=1
-}
-
-function recipe_stage {
-    dest="$(realpath $1)"
-    mkdir -pv "$dest/bin"
-    cp -v "target/${TARGET}/release/examples/gui" "$dest/bin/rust-cairo"
-    skip=1
-}
diff --git a/recipes/wip/demos/rust-cairo/recipe.toml b/recipes/wip/demos/rust-cairo/recipe.toml
new file mode 100644
index 000000000..0805a3cbb
--- /dev/null
+++ b/recipes/wip/demos/rust-cairo/recipe.toml
@@ -0,0 +1,16 @@
+#TODO compile and test
+[source]
+git = "https://gitlab.redox-os.org/redox-os/rust-cairo"
+shallow_clone = true
+[build]
+template = "cargo"
+cargoexamples = ["gui"]
+dependencies = [
+    "cairo",
+    "expat",
+    "fontconfig",
+    "freetype2",
+    "libpng",
+    "pixman",
+    "zlib",
+]
diff --git a/recipes/wip/dev/other/github-cli/recipe.toml b/recipes/wip/dev/other/github-cli/recipe.toml
new file mode 100644
index 000000000..84d3151c4
--- /dev/null
+++ b/recipes/wip/dev/other/github-cli/recipe.toml
@@ -0,0 +1,10 @@
+#TODO add script for gnu make: https://github.com/cli/cli/blob/trunk/docs/install_source.md
+[source]
+git = "https://github.com/cli/cli"
+rev = "v2.96.0"
+shallow_clone = true
+[build]
+template = "custom"
+dependencies = [
+    "host:go",
+]
diff --git a/recipes/wip/games/engines/godot4/recipe.toml b/recipes/wip/games/engines/godot4/recipe.toml
index 0fb6802a2..fb7cb5169 100644
--- a/recipes/wip/games/engines/godot4/recipe.toml
+++ b/recipes/wip/games/engines/godot4/recipe.toml
@@ -1,6 +1,6 @@
 #TODO missing script for scons: https://docs.godotengine.org/en/stable/contributing/development/compiling/compiling_for_linuxbsd.html
 #TODO discover minimum dependencies from scons log
 [source]
-tar = "https://github.com/godotengine/godot/releases/download/4.5.1-stable/godot-4.5.1-stable.tar.xz"
+tar = "https://github.com/godotengine/godot/releases/download/4.7.1-stable/godot-4.7.1-stable.tar.xz"
 [build]
 template = "custom"
diff --git a/recipes/wip/games/engines/redot4/recipe.toml b/recipes/wip/games/engines/redot4/recipe.toml
deleted file mode 100644
index e8d8b95b0..000000000
--- a/recipes/wip/games/engines/redot4/recipe.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-#TODO missing script for scons: https://docs.redotengine.org/en/stable/contributing/development/compiling/compiling_for_linuxbsd
-#TODO discover minimum dependencies from scons log
-[source]
-tar = "https://github.com/Redot-Engine/redot-engine/releases/download/redot-4.3.1-stable/Redot-4.3.1-stable.tar.xz"
-[build]
-template = "custom"
diff --git a/recipes/wip/image/editors/svguru/recipe.toml b/recipes/wip/image/editors/svguru/recipe.toml
new file mode 100644
index 000000000..7af000aaa
--- /dev/null
+++ b/recipes/wip/image/editors/svguru/recipe.toml
@@ -0,0 +1,6 @@
+#TODO compile and test
+[source]
+git = "https://github.com/4383/svguru"
+shallow_clone = true
+[build]
+template = "cargo"
diff --git a/recipes/wip/image/viewers/svgtail/recipe.toml b/recipes/wip/image/viewers/svgtail/recipe.toml
new file mode 100644
index 000000000..0fc6b8acd
--- /dev/null
+++ b/recipes/wip/image/viewers/svgtail/recipe.toml
@@ -0,0 +1,6 @@
+#TODO compile and test
+[source]
+git = "https://github.com/statusfailed/svgtail"
+shallow_clone = true
+[build]
+template = "cargo"