From f2915fb2e8757b639f49a14499b7cf2a474968b7 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Wed, 30 Sep 2026 07:27:04 +0200 Subject: [PATCH 01/63] Fix lua-compat compilation --- recipes/dev/lua54/recipe.toml | 3 +++ recipes/dev/lua54/redox.patch | 12 ++++++++++++ recipes/libs/lua-compat-53/recipe.toml | 8 ++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 recipes/dev/lua54/redox.patch diff --git a/recipes/dev/lua54/recipe.toml b/recipes/dev/lua54/recipe.toml index 9b4f228d9..c72ddf89f 100644 --- a/recipes/dev/lua54/recipe.toml +++ b/recipes/dev/lua54/recipe.toml @@ -1,6 +1,9 @@ [source] tar = "https://lua.org/ftp/lua-5.4.7.tar.gz" blake3 = "e51c2f347e3185479d5ff95cae8ac77511db486853269443c56bedaa0a6ae629" +patches = [ + "redox.patch" +] [build] template = "custom" diff --git a/recipes/dev/lua54/redox.patch b/recipes/dev/lua54/redox.patch new file mode 100644 index 000000000..f034f573b --- /dev/null +++ b/recipes/dev/lua54/redox.patch @@ -0,0 +1,12 @@ +diff -ruwN source/src/ldo.c source-new/src/ldo.c +--- source/src/ldo.c 2024-06-13 22:15:09.000000000 +0000 ++++ source-new/src/ldo.c 2026-09-30 05:11:35.697677914 +0000 +@@ -60,7 +60,7 @@ + try { a } catch(...) { if ((c)->status == 0) (c)->status = -1; } + #define luai_jmpbuf int /* dummy variable */ + +-#elif defined(LUA_USE_POSIX) /* }{ */ ++#elif defined(LUA_USE_POSIX) && !defined(__redox__) /* }{ */ + + /* in POSIX, try _longjmp/_setjmp (more efficient) */ + #define LUAI_THROW(L,c) _longjmp((c)->b, 1) diff --git a/recipes/libs/lua-compat-53/recipe.toml b/recipes/libs/lua-compat-53/recipe.toml index edbca1c43..9704c34fe 100644 --- a/recipes/libs/lua-compat-53/recipe.toml +++ b/recipes/libs/lua-compat-53/recipe.toml @@ -6,6 +6,10 @@ dependencies = [ "lua54" ] script = """ -mkdir -pv "${COOKBOOK_STAGE}/include" -cp -r "$COOKBOOK_SOURCE/c-api/." "${COOKBOOK_STAGE}/include" +${CC} -O2 -fPIC ${CPPFLAGS} -c "${COOKBOOK_SOURCE}/c-api/compat-5.3.c" -o compat-5.3.o +${AR} rcs libcompat53.a compat-5.3.o + +mkdir -p "${COOKBOOK_STAGE}/usr/lib" "${COOKBOOK_STAGE}/usr/include" +cp libcompat53.a "${COOKBOOK_STAGE}/usr/lib/" +cp "${COOKBOOK_SOURCE}/c-api/compat-5.3.h" "${COOKBOOK_STAGE}/usr/include/" """ From d5cc8bf4dc47842d543d47db10ff8bc57b2f2944 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Mon, 28 Sep 2026 23:38:29 +0700 Subject: [PATCH 02/63] Fix openttd prefix --- recipes/games/openttd/recipe.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/games/openttd/recipe.toml b/recipes/games/openttd/recipe.toml index 2d5b2e18b..d4e21e89d 100644 --- a/recipes/games/openttd/recipe.toml +++ b/recipes/games/openttd/recipe.toml @@ -26,7 +26,7 @@ rsync -av --delete "${COOKBOOK_SOURCE}/" ./ ./configure \\ --build="$(gcc -dumpmachine)" \\ --host="${TARGET}" \\ - --prefix="" \\ + --prefix="/usr" \\ --disable-static \\ --without-liblzo2 \\ --disable-network \\ From 16670064b9329534656c6fb8ee4e9fb92f5a6997 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Tue, 29 Sep 2026 01:16:18 +0700 Subject: [PATCH 03/63] cookbook: Don't build dev recipes whenever possible --- src/bin/repo/main.rs | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/bin/repo/main.rs b/src/bin/repo/main.rs index 777a13078..2b34847de 100644 --- a/src/bin/repo/main.rs +++ b/src/bin/repo/main.rs @@ -668,21 +668,19 @@ fn parse_args(args: Vec) -> Result<(CliConfig, CliCommand, Vec = Vec::new(); let mut ignore_recipe_names: Vec = Vec::new(); for recipe_name in recipe_names.iter() { - if source_names.contains(recipe_name) { + if special_rules + .get(recipe_name) + .is_some_and(|s| s == "ignore") + { + ignore_recipe_names.push(recipe_name.clone()); + } else if source_names.contains(recipe_name) { source_recipe_names.push(recipe_name.clone()); } else if binary_names.contains(recipe_name) { binary_recipe_names.push(recipe_name.clone()); + } else if repo_binary { + binary_recipe_names.push(recipe_name.clone()); } else { - if special_rules - .get(recipe_name) - .is_some_and(|s| s == "ignore") - { - ignore_recipe_names.push(recipe_name.clone()); - } else if repo_binary { - binary_recipe_names.push(recipe_name.clone()); - } else { - source_recipe_names.push(recipe_name.clone()); - } + source_recipe_names.push(recipe_name.clone()); } } @@ -700,19 +698,20 @@ fn parse_args(args: Vec) -> Result<(CliConfig, CliCommand, Vec source -> binary -> dev - // in this case, we need to move that "source" to "binary", because - // that would include dev from its binary child, which is unnecessary + // try to lookup if this recipe eventually changed to "binary" so that dev recipes + // don't really get included. TODO: move this logic down after special rules applied. let mut i = 0; + let (_, repository) = fetch_repo::get_binary_repo(); while i < source_recipe_names.len() { let name = &source_recipe_names[i]; - match special_rules.get(name) { - Some(s) if s.as_str() == "source" && binary_names.contains(name) => { - let bin = source_recipe_names.remove(i); - binary_recipe_names.push(bin); - continue; - } - _ => {} + if (binary_names.contains(name) + || special_rules + .get(name) + .is_some_and(|s| s.as_str() == "binary")) + && repository.packages.contains_key(name.as_str()) + { + binary_recipe_names.push(source_recipe_names.remove(i)); + continue; } i += 1; } From f3123f7ded8109e44a059fc498eeef557b09d4f1 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Tue, 29 Sep 2026 12:39:27 +0700 Subject: [PATCH 04/63] Update redoxer --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 9f63bb527..a8756af68 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -918,7 +918,7 @@ dependencies = [ [[package]] name = "redoxer" version = "0.2.63" -source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#9281d1d591adf2db028e06a7d75767ad9b55d54f" +source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#d448ee8b1640d91ed70c37c164ca994f0c0b4fe8" dependencies = [ "anyhow", "dirs", From 2902f6a0f8c1f4b521a124d8285830337122cc23 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Tue, 29 Sep 2026 12:45:44 +0700 Subject: [PATCH 05/63] Fix undefined REDOXER_RUSTFLAGS_KEY in fetch script --- src/cook/script.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cook/script.rs b/src/cook/script.rs index 12d94ddc4..d3665a5d2 100644 --- a/src/cook/script.rs +++ b/src/cook/script.rs @@ -36,6 +36,7 @@ function DYNAMIC_INIT { # TODO: check paths for spaces export LDFLAGS="${USER_LDFLAGS}-Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib -L${COOKBOOK_SYSROOT}/lib -Wl,--export-dynamic" rustflags="-C target-feature=-crt-static -L native=${COOKBOOK_SYSROOT}/lib -C link-arg=-Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib" + REDOXER_RUSTFLAGS_KEY=${REDOXER_RUSTFLAGS_KEY:-RUSTFLAGS} export "${REDOXER_RUSTFLAGS_KEY}=${!REDOXER_RUSTFLAGS_KEY} ${rustflags}" export COOKBOOK_DYNAMIC=1 From 9552c0c41a7c5e158020526ba58af153bf2451e9 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Wed, 30 Sep 2026 03:15:50 +0700 Subject: [PATCH 06/63] Use webkit launch script --- recipes/wip/web/webkitgtk3/recipe.toml | 2 +- recipes/wip/web/webkitgtk3/webkit.desktop | 2 +- recipes/wip/web/webkitgtk3/webkit.sh | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100755 recipes/wip/web/webkitgtk3/webkit.sh diff --git a/recipes/wip/web/webkitgtk3/recipe.toml b/recipes/wip/web/webkitgtk3/recipe.toml index b676f890c..2db5ce321 100644 --- a/recipes/wip/web/webkitgtk3/recipe.toml +++ b/recipes/wip/web/webkitgtk3/recipe.toml @@ -58,8 +58,8 @@ cookbook_cmake patchelf --replace-needed "${COOKBOOK_SYSROOT}/usr/lib/libsqlite3.so" "libsqlite3.so" "${COOKBOOK_STAGE}/usr/lib/libwebkit2gtk-4.1.so" patchelf --replace-needed "${COOKBOOK_SYSROOT}/usr/lib/libsqlite3.so" "libsqlite3.so" "${COOKBOOK_STAGE}/usr/libexec/webkit2gtk-4.1/MiniBrowser" mkdir -p "${COOKBOOK_STAGE}/usr/bin" "${COOKBOOK_STAGE}/usr/share/applications" -ln -sr "${COOKBOOK_STAGE}/usr/libexec/webkit2gtk-4.1/MiniBrowser" "${COOKBOOK_STAGE}/usr/bin/MiniBrowser" cp "${COOKBOOK_RECIPE}/webkit.desktop" "${COOKBOOK_STAGE}/usr/share/applications/webkit.desktop" +cp "${COOKBOOK_RECIPE}/webkit.sh" "${COOKBOOK_STAGE}/usr/bin/webkit" """ [package] diff --git a/recipes/wip/web/webkitgtk3/webkit.desktop b/recipes/wip/web/webkitgtk3/webkit.desktop index b3c4fd074..43aab7b08 100644 --- a/recipes/wip/web/webkitgtk3/webkit.desktop +++ b/recipes/wip/web/webkitgtk3/webkit.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=WebKit Comment=WebKit GTK Browser -Exec=MiniBrowser +Exec=webkit Icon=/usr/share/ui/icons/apps/internet-web-browser.png Terminal=false Type=Application diff --git a/recipes/wip/web/webkitgtk3/webkit.sh b/recipes/wip/web/webkitgtk3/webkit.sh new file mode 100755 index 000000000..a152e5346 --- /dev/null +++ b/recipes/wip/web/webkitgtk3/webkit.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +SCHEMA_DIR="/usr/share/glib-2.0/schemas" +COMPILED_SCHEMA="$SCHEMA_DIR/gschemas.compiled" + +if [ ! -f "$COMPILED_SCHEMA" ]; then + echo "GSettings schemas are not compiled. Please run" + echo "sudo glib-compile-schemas $SCHEMA_DIR" + # otherwise css layout will be broken + exit 1 +fi + +# TODO: why? +export GTK_DEBUG=interactive +# TODO: plugin scanner parsing failure +export GST_REGISTRY_DISABLE=yes + +exec /usr/libexec/webkit2gtk-4.1/MiniBrowser From 97938076478903fb545feac105cd6a9be489d845 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Wed, 30 Sep 2026 11:17:24 -0300 Subject: [PATCH 07/63] Add recipes --- recipes/wip/demos/ascii-rain/recipe.toml | 14 ++++++++++++ recipes/wip/demos/nms/recipe.toml | 14 ++++++++++++ recipes/wip/demos/terminal-rain/recipe.toml | 7 ++++++ recipes/wip/dev/analysis/cppcheck/recipe.toml | 11 ++++++++++ recipes/wip/dev/lang/janet/recipe.toml | 22 +++++++++++++++++++ recipes/wip/dev/lang/rhai/recipe.toml | 13 +++++++++++ recipes/wip/doc/pandoc/recipe.toml | 5 +++++ recipes/wip/graphics/viewers/f3d/recipe.toml | 14 ++++++++++++ .../wip/search/silver-searcher/recipe.toml | 10 +++++++++ recipes/wip/sys-info/fastfetch/recipe.toml | 14 ++++++++++++ 10 files changed, 124 insertions(+) create mode 100644 recipes/wip/demos/ascii-rain/recipe.toml create mode 100644 recipes/wip/demos/nms/recipe.toml create mode 100644 recipes/wip/demos/terminal-rain/recipe.toml create mode 100644 recipes/wip/dev/analysis/cppcheck/recipe.toml create mode 100644 recipes/wip/dev/lang/janet/recipe.toml create mode 100644 recipes/wip/dev/lang/rhai/recipe.toml create mode 100644 recipes/wip/doc/pandoc/recipe.toml create mode 100644 recipes/wip/graphics/viewers/f3d/recipe.toml create mode 100644 recipes/wip/search/silver-searcher/recipe.toml create mode 100644 recipes/wip/sys-info/fastfetch/recipe.toml diff --git a/recipes/wip/demos/ascii-rain/recipe.toml b/recipes/wip/demos/ascii-rain/recipe.toml new file mode 100644 index 000000000..eb2757b23 --- /dev/null +++ b/recipes/wip/demos/ascii-rain/recipe.toml @@ -0,0 +1,14 @@ +#TODO compile and test +[source] +git = "https://github.com/nkleemann/ascii-rain" +rev = "39396dea0a84b4580f0ee5f46de9de4468566ed0" +shallow_clone = true +[build] +template = "custom" +dependencies = ["ncursesw"] +script = """ +mkdir -pv "${COOKBOOK_STAGE}/usr/bin" +DYNAMIC_INIT +"${COOKBOOK_CC}" rain.c -o "${COOKBOOK_STAGE}"/usr/bin/rain -lncurses +cp -rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/usr/bin" +""" diff --git a/recipes/wip/demos/nms/recipe.toml b/recipes/wip/demos/nms/recipe.toml new file mode 100644 index 000000000..73540e493 --- /dev/null +++ b/recipes/wip/demos/nms/recipe.toml @@ -0,0 +1,14 @@ +#TODO compile and test +[source] +git = "https://github.com/bartobri/no-more-secrets" +rev = "v1.0.1" +shallow_clone = true +[build] +template = "custom" +#dependencies = ["ncursesw"] # enable if needed +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" nms -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/demos/terminal-rain/recipe.toml b/recipes/wip/demos/terminal-rain/recipe.toml new file mode 100644 index 000000000..1ea0a5dfa --- /dev/null +++ b/recipes/wip/demos/terminal-rain/recipe.toml @@ -0,0 +1,7 @@ +#TODO compile and test +[source] +git = "https://github.com/Oakamoore/terminal-rain" +rev = "c46946f5a1ab71dc8b7f826f9ab634d46cb81c71" +shallow_clone = true +[build] +template = "cmake" diff --git a/recipes/wip/dev/analysis/cppcheck/recipe.toml b/recipes/wip/dev/analysis/cppcheck/recipe.toml new file mode 100644 index 000000000..9fcb61452 --- /dev/null +++ b/recipes/wip/dev/analysis/cppcheck/recipe.toml @@ -0,0 +1,11 @@ +#TODO compile and test +[source] +git = "https://github.com/cppcheck-opensource/cppcheck" +rev = "2.22.0" +shallow_clone = true +[build] +template = "cmake" +cmakeflags = [ + "-DREGISTER_TESTS=OFF", + "-DREGISTER_GUI_TESTS=OFF", +] \ No newline at end of file diff --git a/recipes/wip/dev/lang/janet/recipe.toml b/recipes/wip/dev/lang/janet/recipe.toml new file mode 100644 index 000000000..90e3afd71 --- /dev/null +++ b/recipes/wip/dev/lang/janet/recipe.toml @@ -0,0 +1,22 @@ +#TODO compile and test +[source] +git = "https://github.com/janet-lang/janet" +rev = "v1.42.1" +shallow_clone = true +[build] +template = "custom" +mesonflags = [ + +] +script = """ +DYNAMIC_INIT +COOKBOOK_MESON_FLAGS+=( + -Dassembler=false + -Dnet=false + -Dipv6=false + -Dkqueue=false +) +cookbook_meson +mkdir -pv "${COOKBOOK_STAGE}/usr/share/janet" +cp -rv "${COOKBOOK_SOURCE}"/examples/* "${COOKBOOK_STAGE}/usr/share/janet" +""" diff --git a/recipes/wip/dev/lang/rhai/recipe.toml b/recipes/wip/dev/lang/rhai/recipe.toml new file mode 100644 index 000000000..71ed73c39 --- /dev/null +++ b/recipes/wip/dev/lang/rhai/recipe.toml @@ -0,0 +1,13 @@ +#TODO compile and test +[source] +git = "https://github.com/rhaiscript/rhai" +shallow_clone = true +[build] +template = "custom" +script = """ +DYNAMIC_INIT +cookbook_cargo +cookbook_cargo_examples hello +mkdir -pv "${COOKBOOK_STAGE}/usr/share/rhai" +cp -rv "${COOKBOOK_SOURCE}"/scripts/* "${COOKBOOK_STAGE}/usr/share/rhai" +""" diff --git a/recipes/wip/doc/pandoc/recipe.toml b/recipes/wip/doc/pandoc/recipe.toml new file mode 100644 index 000000000..f0ee2b561 --- /dev/null +++ b/recipes/wip/doc/pandoc/recipe.toml @@ -0,0 +1,5 @@ +#TODO add a script for stack build system: https://pandoc.org/installing.html#compiling-from-source +[source] +tar = "https://hackage.haskell.org/package/pandoc-3.12/pandoc-3.12.tar.gz" +[build] +template = "custom" diff --git a/recipes/wip/graphics/viewers/f3d/recipe.toml b/recipes/wip/graphics/viewers/f3d/recipe.toml new file mode 100644 index 000000000..00a320357 --- /dev/null +++ b/recipes/wip/graphics/viewers/f3d/recipe.toml @@ -0,0 +1,14 @@ +#TODO compile and test +# build instructions: https://github.com/f3d-app/f3d/blob/master/doc/dev/05-BUILD.md +[source] +git = "https://github.com/f3d-app/f3d" +rev = "v3.5.0" +shallow_clone = true +[build] +template = "cmake" +cmakeflags = [ + "-DF3D_MODULE_CLIP=OFF", +] +dependencies = [ + "vtk", +] diff --git a/recipes/wip/search/silver-searcher/recipe.toml b/recipes/wip/search/silver-searcher/recipe.toml new file mode 100644 index 000000000..bd0209bbd --- /dev/null +++ b/recipes/wip/search/silver-searcher/recipe.toml @@ -0,0 +1,10 @@ +#TODO compile and test +[source] +tar = "https://geoff.greer.fm/ag/releases/the_silver_searcher-2.2.0.tar.gz" +[build] +template = "configure" +dependencies = [ + "pcre", + "zlib", + "xz", +] diff --git a/recipes/wip/sys-info/fastfetch/recipe.toml b/recipes/wip/sys-info/fastfetch/recipe.toml new file mode 100644 index 000000000..9b69bd24a --- /dev/null +++ b/recipes/wip/sys-info/fastfetch/recipe.toml @@ -0,0 +1,14 @@ +#TODO compile and test +[source] +git = "https://github.com/fastfetch-cli/fastfetch" +rev = "2.69.0" +shallow_clone = true +[build] +template = "cmake" +cmakeflags = [ + "-DENABLE_ZLIB=OFF", + "-DSET_TWEAK=OFF", + "-DENABLE_LUA=OFF", + "-DENABLE_LIBZFS=OFF", + "-DENABLE_IMAGE_LOGO=OFF", +] From a64077bce3dc305a08fa7a375cbec49f4c2db2cf Mon Sep 17 00:00:00 2001 From: Ribbon Date: Wed, 30 Sep 2026 11:19:37 -0300 Subject: [PATCH 08/63] Rename graphics/vr recipe category to xr --- recipes/wip/graphics/{vr => xr}/alvr/recipe.toml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename recipes/wip/graphics/{vr => xr}/alvr/recipe.toml (100%) diff --git a/recipes/wip/graphics/vr/alvr/recipe.toml b/recipes/wip/graphics/xr/alvr/recipe.toml similarity index 100% rename from recipes/wip/graphics/vr/alvr/recipe.toml rename to recipes/wip/graphics/xr/alvr/recipe.toml From d4b049df7b69a9d961176c9389999c5194b1afdc Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 30 Sep 2026 14:42:02 -0600 Subject: [PATCH 09/63] Adopt Pop AI policy --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8001cfc1c..5626fa00f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,7 +27,7 @@ When making a contribution you agree to the following terms: ## AI Policy -Redox OS does not accept contributions generated by LLMs ([Large Language Models](https://en.wikipedia.org/wiki/Large_language_model)), sometimes also referred to as "AI". This policy is not open to discussion, any content submitted that is clearly labelled as LLM-generated (including issues, merge requests, and merge request descriptions) will be immediately closed, and any attempt to bypass this policy will result in a ban from the project. +Content generated by any LLM (also known as AI) may not be contributed in issues or merge requests to Redox OS projects including code, comments, and descriptions. You may use these tools to perform research, testing, benchmarking, and other tasks. ## Chat From 231528f64f088fbdb8978c4d1f96f96e08ddd45e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 30 Sep 2026 16:42:43 -0600 Subject: [PATCH 10/63] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Ron Williams --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5626fa00f..8aeba5ae5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,7 +27,7 @@ When making a contribution you agree to the following terms: ## AI Policy -Content generated by any LLM (also known as AI) may not be contributed in issues or merge requests to Redox OS projects including code, comments, and descriptions. You may use these tools to perform research, testing, benchmarking, and other tasks. +Content generated by any LLM (also known as AI) may not be directly contributed in issues or merge requests to Redox OS projects including code, comments, and descriptions. You may use LLM tools to perform research, testing, benchmarking, and other tasks not excluded above. ## Chat From a54595650b0674e6d27e0fa7e3d3cfcff1d79181 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 1 Oct 2026 14:00:37 -0600 Subject: [PATCH 11/63] Adjust to match our prior policy minus unnecessary language --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8aeba5ae5..1950e31f8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,7 +27,7 @@ When making a contribution you agree to the following terms: ## AI Policy -Content generated by any LLM (also known as AI) may not be directly contributed in issues or merge requests to Redox OS projects including code, comments, and descriptions. You may use LLM tools to perform research, testing, benchmarking, and other tasks not excluded above. +Redox OS does not accept contributions generated by LLMs ([Large Language Models](https://en.wikipedia.org/wiki/Large_language_model)), sometimes also referred to as "AI". ## Chat From be90cb09e7efd43c9c3b52def6a24d57a5bb08eb Mon Sep 17 00:00:00 2001 From: Wildan M Date: Sat, 3 Oct 2026 07:09:12 +0700 Subject: [PATCH 12/63] Remove webkit envs hack --- recipes/wip/web/webkitgtk3/webkit.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes/wip/web/webkitgtk3/webkit.sh b/recipes/wip/web/webkitgtk3/webkit.sh index a152e5346..4855899ef 100755 --- a/recipes/wip/web/webkitgtk3/webkit.sh +++ b/recipes/wip/web/webkitgtk3/webkit.sh @@ -10,9 +10,7 @@ if [ ! -f "$COMPILED_SCHEMA" ]; then exit 1 fi -# TODO: why? -export GTK_DEBUG=interactive -# TODO: plugin scanner parsing failure -export GST_REGISTRY_DISABLE=yes +# If webkit stuck launching, uncomment +# export GTK_DEBUG=interactive exec /usr/libexec/webkit2gtk-4.1/MiniBrowser From f12422d1a5a01d8a44a760cda487c2e7ca5cb434 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Sat, 3 Oct 2026 08:12:58 +0700 Subject: [PATCH 13/63] Fix openttd paths --- recipes/games/openttd-openmsx/recipe.toml | 4 ++-- recipes/games/openttd-opensfx/recipe.toml | 6 +++--- recipes/games/openttd/recipe.toml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/games/openttd-openmsx/recipe.toml b/recipes/games/openttd-openmsx/recipe.toml index 0030209ef..de044ad75 100644 --- a/recipes/games/openttd-openmsx/recipe.toml +++ b/recipes/games/openttd-openmsx/recipe.toml @@ -4,6 +4,6 @@ git = "https://gitlab.redox-os.org/redox-os/openttd-openmsx.git" [build] template = "custom" script = """ -mkdir -pv "${COOKBOOK_STAGE}/share/games/openttd/baseset/openmsx" -cp -Rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/share/games/openttd/baseset/openmsx" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/games/openttd/baseset/openmsx" +cp -Rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/usr/share/games/openttd/baseset/openmsx" """ \ No newline at end of file diff --git a/recipes/games/openttd-opensfx/recipe.toml b/recipes/games/openttd-opensfx/recipe.toml index 1527275ba..e77b13199 100644 --- a/recipes/games/openttd-opensfx/recipe.toml +++ b/recipes/games/openttd-opensfx/recipe.toml @@ -4,6 +4,6 @@ git = "https://gitlab.redox-os.org/redox-os/openttd-opensfx.git" [build] template = "custom" script = """ -mkdir -pv "${COOKBOOK_STAGE}/share/games/openttd/baseset/opensfx" -cp -Rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/share/games/openttd/baseset/opensfx" -""" \ No newline at end of file +mkdir -pv "${COOKBOOK_STAGE}/usr/share/games/openttd/baseset/opensfx" +cp -Rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/usr/share/games/openttd/baseset/opensfx" +""" diff --git a/recipes/games/openttd/recipe.toml b/recipes/games/openttd/recipe.toml index d4e21e89d..0c5c35b45 100644 --- a/recipes/games/openttd/recipe.toml +++ b/recipes/games/openttd/recipe.toml @@ -37,7 +37,7 @@ make VERBOSE=1 -j"$(nproc)" dest="${COOKBOOK_STAGE}" bundledir="$dest/bundle" -make VERBOSE=1 ROOT_DIR="./" BUNDLE_DIR="$bundledir" INSTALL_DIR="$dest/usr" install +make VERBOSE=1 ROOT_DIR="./" BUNDLE_DIR="$bundledir" INSTALL_DIR="$dest" install rm -rf "$bundledir" if [ -d "${COOKBOOK_STAGE}/usr/bin" ] From 7b7f42444a8b2aefe12a064ce62f6c44b7b25be5 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Sat, 3 Oct 2026 14:02:05 +0200 Subject: [PATCH 14/63] Add ffmpeg and AAC on gstreamer --- recipes/libs/ffmpeg6/recipe.toml | 7 ++++++- recipes/libs/gstreamer/recipe.toml | 5 +++-- recipes/wip/libs/media/libfdk-aac/recipe.toml | 2 +- recipes/wip/web/webkitgtk3/redox.patch | 12 ++++++++++++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/recipes/libs/ffmpeg6/recipe.toml b/recipes/libs/ffmpeg6/recipe.toml index 09f828343..f18ff3bf4 100644 --- a/recipes/libs/ffmpeg6/recipe.toml +++ b/recipes/libs/ffmpeg6/recipe.toml @@ -14,10 +14,14 @@ dependencies = [ "sdl2", "zlib", ] +dev-dependencies = [ + "libstdcxx" +] +compiler = "gcc-no-lto" script = """ DYNAMIC_INIT -export LDFLAGS="$LDFLAGS -lSDL2 -lorbital -lOSMesa -lstdc++" +export LDFLAGS="$LDFLAGS -lSDL2 -lorbital -lOSMesa" ARCH="${TARGET%%-*}" COOKBOOK_CONFIGURE_FLAGS=( --enable-cross-compile @@ -31,6 +35,7 @@ COOKBOOK_CONFIGURE_FLAGS=( --disable-network --enable-sdl2 --enable-zlib + --enable-pic --enable-encoder=png --enable-decoder=png ) diff --git a/recipes/libs/gstreamer/recipe.toml b/recipes/libs/gstreamer/recipe.toml index 233affc20..b6631722d 100644 --- a/recipes/libs/gstreamer/recipe.toml +++ b/recipes/libs/gstreamer/recipe.toml @@ -8,7 +8,7 @@ template = "custom" dependencies = [ "bzip2", "curl", - #TODO: "ffmpeg6", + "ffmpeg6", "gdk-pixbuf", "libass", "libffi", @@ -18,6 +18,7 @@ dependencies = [ "libsoup", "libwebp", "mesa", + "libfdk-aac", #TODO: "openal", "pango", ] @@ -31,7 +32,7 @@ CFLAGS="${CFLAGS} -DM_LN2=0.69314718055994530942" cookbook_meson \ -Ddevtools=disabled \ -Dexamples=disabled \ - -Dlibav=disabled \ + -Dlibav=enabled \ -Dlibnice=disabled \ -Dorc=disabled \ -Dtests=disabled \ diff --git a/recipes/wip/libs/media/libfdk-aac/recipe.toml b/recipes/wip/libs/media/libfdk-aac/recipe.toml index 514cb83e2..379c4c5dd 100644 --- a/recipes/wip/libs/media/libfdk-aac/recipe.toml +++ b/recipes/wip/libs/media/libfdk-aac/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO promote [source] git = "https://github.com/mstorsjo/fdk-aac" rev = "v2.0.3" diff --git a/recipes/wip/web/webkitgtk3/redox.patch b/recipes/wip/web/webkitgtk3/redox.patch index 8589384ee..7f5bc2e84 100644 --- a/recipes/wip/web/webkitgtk3/redox.patch +++ b/recipes/wip/web/webkitgtk3/redox.patch @@ -684,3 +684,15 @@ diff -ruwN source/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp if (disableDMABuf && strcmp(disableDMABuf, "0")) return; +diff -ruwN source/Source/WTF/wtf/FileSystem.cpp source-new/Source/WTF/wtf/FileSystem.cpp +--- source/Source/WTF/wtf/FileSystem.cpp 2025-03-21 11:07:10.828055100 +0000 ++++ source-new/Source/WTF/wtf/FileSystem.cpp 2026-10-03 11:58:07.275782479 +0000 +@@ -360,7 +360,7 @@ + mprotect(map, bytesSize, PROT_READ); + + // Flush (asynchronously) to file, turning this into clean memory. +- msync(map, bytesSize, MS_ASYNC); ++ // msync(map, bytesSize, MS_ASYNC); // redox: msync unimplemented + #endif + } + From 29d3c40b4b656843eeeeb4c6a1fce12710865c69 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Sun, 4 Oct 2026 03:22:27 +0700 Subject: [PATCH 15/63] prefix: Add clang++ symlink --- mk/prefix.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/mk/prefix.mk b/mk/prefix.mk index ac394e30e..1f3b83b3d 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -452,6 +452,7 @@ else rm -rf "$@.partial/lib/"*.a echo "--sysroot=$(ROOT)/$(PREFIX)/gcc-install" > "$@.partial/bin/$(GNU_TARGET).cfg" ln -s clang-21 "$@.partial/bin/$(GNU_TARGET)-clang" + ln -s clang++ "$@.partial/bin/$(GNU_TARGET)-clang++" export PATH="$(ROOT)/$@.partial/bin:$$PATH" $(PREFIX_CONFIG) \ COOKBOOK_HOST_SYSROOT=/usr COOKBOOK_CROSS_TARGET=$(HOST_TARGET) && \ $(REPO_BIN) cook llvm-rt21 From 73542ee0d500576f76c0b0d41824a0a621ff7377 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Sun, 4 Oct 2026 09:32:07 +0700 Subject: [PATCH 16/63] Fix missing nproc --- recipes/core/uutils/recipe.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/core/uutils/recipe.toml b/recipes/core/uutils/recipe.toml index ac3e6b35b..f43509da6 100644 --- a/recipes/core/uutils/recipe.toml +++ b/recipes/core/uutils/recipe.toml @@ -16,7 +16,7 @@ script = """ DYNAMIC_INIT export RUSTONIG_DYNAMIC_LIBONIG=1 # TODO: upstream changes, consider using feat_require_unix_core if relibc is ready? -CARGO_PROFILE_RELEASE_LTO=thin cookbook_cargo --no-default-features --features feat_os_unix_redox,kill,nice --bin coreutils +CARGO_PROFILE_RELEASE_LTO=thin cookbook_cargo --no-default-features --features feat_os_unix_redox,kill,nice,nproc --bin coreutils BINS=( '[' From 996da092dd7a844c150e0d9d03af73905a5f68e6 Mon Sep 17 00:00:00 2001 From: radex Date: Sun, 4 Oct 2026 15:17:06 +0200 Subject: [PATCH 17/63] mk/qemu: ensure UEFI vars are writable On some platforms (e.g. Nix), the template variables file is non-writable. So, we need to make the copy writable before we can use it with qemu --- mk/qemu.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/mk/qemu.mk b/mk/qemu.mk index e2e2d819e..707cf60ea 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -358,6 +358,7 @@ qemu-deps: $(BUILD)/fw_vars.bin .PRECIOUS: $(BUILD)/fw_vars.bin $(BUILD)/fw_vars.bin: $(PFLASH1) cp "$<" "$@" + chmod +w "$@" endif $(EXTRA_DISK): From 4748f0a2c1d0782a804c0d74e4ab706d019f52f8 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Sun, 4 Oct 2026 20:07:05 +0200 Subject: [PATCH 18/63] Remove legacy orbital symlinks --- config/base.toml | 16 ---------------- config/desktop-contain.toml | 2 +- recipes/cosmic/cosmic-edit/manifest | 2 +- recipes/cosmic/cosmic-files/manifest | 2 +- recipes/cosmic/cosmic-reader/manifest | 2 +- recipes/cosmic/cosmic-term/manifest | 2 +- recipes/emulators/dosbox/manifest | 2 +- recipes/games/classicube/manifest | 2 +- recipes/games/eduke32/manifest | 2 +- recipes/games/freedoom/recipe.toml | 2 +- recipes/games/gigalomania/manifest | 2 +- recipes/games/neverball/manifest-neverball | 2 +- recipes/games/neverball/manifest-neverputt | 2 +- recipes/games/quakespasm/manifest | 2 +- recipes/games/sm64ex/manifest | 2 +- recipes/web/netsurf/manifest | 2 +- recipes/wip/cosmic/cosmic-player/manifest | 2 +- .../games/data/openjazz-shareware-data/manifest | 2 +- recipes/wip/web/webkitgtk3/webkit.desktop | 2 +- 19 files changed, 18 insertions(+), 34 deletions(-) diff --git a/config/base.toml b/config/base.toml index 351426861..858988729 100644 --- a/config/base.toml +++ b/config/base.toml @@ -174,22 +174,6 @@ path = "/share" data = "usr/share" symlink = true -## legacy orbital directories -[[files]] -path = "/ui" -data = "usr/share/ui" -symlink = true - -[[files]] -path = "/usr/share/ui/fonts" -data = "/usr/share/fonts" -symlink = true - -[[files]] -path = "/usr/share/ui/icons" -data = "/usr/share/icons" -symlink = true - ## /var [[files]] path = "/var" diff --git a/config/desktop-contain.toml b/config/desktop-contain.toml index d21c3c2fc..097544365 100644 --- a/config/desktop-contain.toml +++ b/config/desktop-contain.toml @@ -29,5 +29,5 @@ sandbox_schemes = ["file"] files = ["file:/dev/null"] rofiles = ["file:/etc/passwd", "file:/etc/hostname", "file:/etc/localtime"] dirs = ["file:/tmp"] -rodirs = ["file:/bin", "file:/ui"] +rodirs = ["file:/bin"] """ diff --git a/recipes/cosmic/cosmic-edit/manifest b/recipes/cosmic/cosmic-edit/manifest index 0682999c3..251f2f5d1 100644 --- a/recipes/cosmic/cosmic-edit/manifest +++ b/recipes/cosmic/cosmic-edit/manifest @@ -1,6 +1,6 @@ name=COSMIC Text Editor binary=/bin/cosmic-edit -icon=/usr/share/ui/icons/apps/accessories-text-editor.png +icon=/usr/share/icons/apps/accessories-text-editor.png accept=*.asm accept=*.c accept=*.conf diff --git a/recipes/cosmic/cosmic-files/manifest b/recipes/cosmic/cosmic-files/manifest index 62b4a9668..7a54cd545 100644 --- a/recipes/cosmic/cosmic-files/manifest +++ b/recipes/cosmic/cosmic-files/manifest @@ -1,5 +1,5 @@ name=COSMIC File Manager binary=/bin/cosmic-files -icon=/usr/share/ui/icons/apps/system-file-manager.png +icon=/usr/share/icons/apps/system-file-manager.png author=Jeremy Soller description=COSMIC File Manager diff --git a/recipes/cosmic/cosmic-reader/manifest b/recipes/cosmic/cosmic-reader/manifest index c99e835d2..0aec5bf0c 100644 --- a/recipes/cosmic/cosmic-reader/manifest +++ b/recipes/cosmic/cosmic-reader/manifest @@ -1,6 +1,6 @@ name=COSMIC Reader binary=/bin/cosmic-reader -icon=/usr/share/ui/icons/apps/accessories-text-editor.png +icon=/usr/share/icons/apps/accessories-text-editor.png accept=*.pdf accept=*.epub accept=*.cbz diff --git a/recipes/cosmic/cosmic-term/manifest b/recipes/cosmic/cosmic-term/manifest index 9342f3c4f..c4b2e1cd4 100644 --- a/recipes/cosmic/cosmic-term/manifest +++ b/recipes/cosmic/cosmic-term/manifest @@ -1,5 +1,5 @@ name=COSMIC Terminal binary=/bin/cosmic-term -icon=/usr/share/ui/icons/apps/utilities-terminal.png +icon=/usr/share/icons/apps/utilities-terminal.png author=Jeremy Soller description=COSMIC Terminal diff --git a/recipes/emulators/dosbox/manifest b/recipes/emulators/dosbox/manifest index 0381a22fc..408f399a5 100644 --- a/recipes/emulators/dosbox/manifest +++ b/recipes/emulators/dosbox/manifest @@ -1,4 +1,4 @@ name=DOSBox category=Games binary=/bin/dosbox -icon=/usr/share/ui/icons/apps/dosbox.png +icon=/usr/share/icons/apps/dosbox.png diff --git a/recipes/games/classicube/manifest b/recipes/games/classicube/manifest index 58ebf05a3..062877102 100644 --- a/recipes/games/classicube/manifest +++ b/recipes/games/classicube/manifest @@ -1,4 +1,4 @@ name=ClassiCube category=Games binary=/usr/games/classicube/ClassiCube -icon=/usr/share/ui/icons/apps/classicube.png +icon=/usr/share/icons/apps/classicube.png diff --git a/recipes/games/eduke32/manifest b/recipes/games/eduke32/manifest index c9fd63f26..ff3c34740 100644 --- a/recipes/games/eduke32/manifest +++ b/recipes/games/eduke32/manifest @@ -1,4 +1,4 @@ name=EDuke32 category=Games binary=/usr/games/eduke32 -icon=/usr/share/ui/icons/apps/eduke32.png +icon=/usr/share/icons/apps/eduke32.png diff --git a/recipes/games/freedoom/recipe.toml b/recipes/games/freedoom/recipe.toml index 45d2ceebb..f4547f9af 100644 --- a/recipes/games/freedoom/recipe.toml +++ b/recipes/games/freedoom/recipe.toml @@ -20,7 +20,7 @@ do echo "name=$game" | sed 's/freedoom/FreeDOOM: Phase /' | sed 's/doom1/DOOM (Shareware)/' > "${COOKBOOK_STAGE}/usr/share/ui/apps/$game" echo "category=Games" >> "${COOKBOOK_STAGE}/usr/share/ui/apps/$game" echo "binary=/usr/games/$game" >> "${COOKBOOK_STAGE}/usr/share/ui/apps/$game" - echo "icon=/usr/share/ui/icons/apps/$game.png" >> "${COOKBOOK_STAGE}/usr/share/ui/apps/$game" + echo "icon=/usr/share/icons/apps/$game.png" >> "${COOKBOOK_STAGE}/usr/share/ui/apps/$game" cp -v "${COOKBOOK_SOURCE}/$game.png" "${COOKBOOK_STAGE}/usr/share/icons/apps/$game.png" done diff --git a/recipes/games/gigalomania/manifest b/recipes/games/gigalomania/manifest index 8f45b54a2..3792c13a0 100644 --- a/recipes/games/gigalomania/manifest +++ b/recipes/games/gigalomania/manifest @@ -1,4 +1,4 @@ name=Gigalomania category=Games binary=/usr/games/gigalomania/gigalomania -icon=/usr/share/ui/icons/apps/gigalomania.png +icon=/usr/share/icons/apps/gigalomania.png diff --git a/recipes/games/neverball/manifest-neverball b/recipes/games/neverball/manifest-neverball index 89510ee08..39dfb9e71 100644 --- a/recipes/games/neverball/manifest-neverball +++ b/recipes/games/neverball/manifest-neverball @@ -1,4 +1,4 @@ name=Neverball category=Games binary=/usr/games/neverball/neverball -icon=/usr/share/ui/icons/apps/neverball.png +icon=/usr/share/icons/apps/neverball.png diff --git a/recipes/games/neverball/manifest-neverputt b/recipes/games/neverball/manifest-neverputt index 7eb4a2e3f..3fb7bfe92 100644 --- a/recipes/games/neverball/manifest-neverputt +++ b/recipes/games/neverball/manifest-neverputt @@ -1,4 +1,4 @@ name=Neverputt category=Games binary=/usr/games/neverball/neverputt -icon=/usr/share/ui/icons/apps/neverputt.png +icon=/usr/share/icons/apps/neverputt.png diff --git a/recipes/games/quakespasm/manifest b/recipes/games/quakespasm/manifest index 3813ede74..fbc74827e 100644 --- a/recipes/games/quakespasm/manifest +++ b/recipes/games/quakespasm/manifest @@ -1,4 +1,4 @@ name=QuakeSpasm category=Games binary=/usr/games/quakespasm -icon=/usr/share/ui/icons/apps/quakespasm.png +icon=/usr/share/icons/apps/quakespasm.png diff --git a/recipes/games/sm64ex/manifest b/recipes/games/sm64ex/manifest index 321fbfc4a..0d01b7235 100644 --- a/recipes/games/sm64ex/manifest +++ b/recipes/games/sm64ex/manifest @@ -1,4 +1,4 @@ name=Super Mario 64 EX category=Games binary=/bin/sm64 -icon=/usr/share/ui/icons/apps/sm64ex.png +icon=/usr/share/icons/apps/sm64ex.png diff --git a/recipes/web/netsurf/manifest b/recipes/web/netsurf/manifest index a9ae25704..49c80bb5e 100644 --- a/recipes/web/netsurf/manifest +++ b/recipes/web/netsurf/manifest @@ -1,6 +1,6 @@ name=Netsurf binary=/usr/bin/netsurf-fb -icon=/usr/share/ui/icons/apps/internet-web-browser.png +icon=/usr/share/icons/apps/internet-web-browser.png accept=*.html author=The Netsurf Developers description=Browser for Redox diff --git a/recipes/wip/cosmic/cosmic-player/manifest b/recipes/wip/cosmic/cosmic-player/manifest index f87b03905..ad87b493f 100644 --- a/recipes/wip/cosmic/cosmic-player/manifest +++ b/recipes/wip/cosmic/cosmic-player/manifest @@ -1,6 +1,6 @@ name=COSMIC Media Player binary=/usr/bin/cosmic-player -icon=/usr/share/ui/icons/apps/multimedia-photo-viewer.png +icon=/usr/share/icons/apps/multimedia-photo-viewer.png author=Jeremy Soller description=COSMIC Media Player accept=*.avi diff --git a/recipes/wip/games/data/openjazz-shareware-data/manifest b/recipes/wip/games/data/openjazz-shareware-data/manifest index 8d1f2f327..ec8af011a 100644 --- a/recipes/wip/games/data/openjazz-shareware-data/manifest +++ b/recipes/wip/games/data/openjazz-shareware-data/manifest @@ -1,4 +1,4 @@ name=Jazz Jackrabbit (shareware) category=Games binary=/usr/games/OpenJazz -icon=/usr/share/ui/icons/apps/OpenJazz.png +icon=/usr/share/icons/apps/OpenJazz.png diff --git a/recipes/wip/web/webkitgtk3/webkit.desktop b/recipes/wip/web/webkitgtk3/webkit.desktop index 43aab7b08..1ff81bafd 100644 --- a/recipes/wip/web/webkitgtk3/webkit.desktop +++ b/recipes/wip/web/webkitgtk3/webkit.desktop @@ -2,7 +2,7 @@ Name=WebKit Comment=WebKit GTK Browser Exec=webkit -Icon=/usr/share/ui/icons/apps/internet-web-browser.png +Icon=/usr/share/icons/apps/internet-web-browser.png Terminal=false Type=Application StartupNotify=true From b668e904bcec3a8434c47116d35a37c419272dfc Mon Sep 17 00:00:00 2001 From: radex Date: Sun, 4 Oct 2026 17:19:34 +0200 Subject: [PATCH 19/63] mk/qemu: improved Nix(OS) UEFI path search The /run/libvirt/nix-ovmf/* paths cannot be relied upon to exist. As far as I can tell, this is only available on NixOS with libvirtd enabled. On the other hand, on any Nix platform, UEFI firmware binaries can be found relative to the the qemu binary (including when using nix shell). --- mk/qemu.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mk/qemu.mk b/mk/qemu.mk index 707cf60ea..03144ccb0 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -5,6 +5,8 @@ QEMUFLAGS?=-d guest_errors -name "Redox OS $(ARCH)" netboot?=no redoxer?=no VGA_SUPPORTED=no +QEMU_PATH?=$(shell command -v $(QEMU)) +QEMU_BASE_DIR?=$(shell if [ $(QEMU_PATH) ]; then realpath $$(dirname $(QEMU_PATH))/..; fi) ifeq ($(ARCH),i586) audio?=ac97 @@ -40,6 +42,7 @@ else ifeq ($(ARCH),x86_64) PFLASH0=$(firstword \ $(wildcard /usr/share/qemu/edk2-x86_64-code.fd) \ $(wildcard /run/libvirt/nix-ovmf/edk2-x86_64-code.fd) \ + $(wildcard $(QEMU_BASE_DIR)/share/qemu/edk2-x86_64-code.fd) \ $(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2s-x86_64-code.fd) \ ) endif @@ -79,6 +82,7 @@ else ifeq ($(ARCH),aarch64) PFLASH0=$(firstword \ $(wildcard /usr/share/qemu/edk2-aarch64-code.fd) \ $(wildcard /run/libvirt/nix-ovmf/edk2-aarch64-code.fd) \ + $(wildcard $(QEMU_BASE_DIR)/share/qemu/edk2-aarch64-code.fd) \ $(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2-aarch64-code.fd) \ ) endif @@ -113,6 +117,7 @@ else ifeq ($(ARCH),riscv64gc) $(wildcard /usr/share/edk2/riscv/RISCV_VIRT_CODE.fd) \ $(wildcard /usr/share/qemu/edk2-riscv-code.fd) \ $(wildcard /run/libvirt/nix-ovmf/edk2-riscv-code.fd) \ + $(wildcard $(QEMU_BASE_DIR)/share/qemu/edk2-riscv-code.fd) \ $(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2-riscv-code.fd) \ ) PFLASH1=$(firstword \ @@ -120,6 +125,7 @@ else ifeq ($(ARCH),riscv64gc) $(wildcard /usr/share/edk2/riscv/RISCV_VIRT_VARS.fd) \ $(wildcard /usr/share/qemu/edk2-riscv-vars.fd) \ $(wildcard /run/libvirt/nix-ovmf/edk2-riscv-vars.fd) \ + $(wildcard $(QEMU_BASE_DIR)/share/qemu/edk2-riscv-vars.fd) \ $(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2-riscv-vars.fd) \ ) ifneq ($(usb),no) From 21f69c1c43c6f432a293b2052b3ee5e6c296e620 Mon Sep 17 00:00:00 2001 From: radex Date: Sun, 4 Oct 2026 17:24:16 +0200 Subject: [PATCH 20/63] mk/qemu: more helpful error on missing UEFI As best I can tell, on aarch64 and riscv64gc, the UEFI firmware is *required* for Redox to run. If not found, qemu will still run, but will get stuck. It's better to error out explicitly and early. This does not appear to be the case on x86_64 where skipping the firmware load still appears to boot Redox successfully, hence I didn't add the error there. --- mk/qemu.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mk/qemu.mk b/mk/qemu.mk index 03144ccb0..2e49790b1 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -85,6 +85,7 @@ else ifeq ($(ARCH),aarch64) $(wildcard $(QEMU_BASE_DIR)/share/qemu/edk2-aarch64-code.fd) \ $(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2-aarch64-code.fd) \ ) + PFLASH0_NEEDED=yes endif else FIRMWARE=$(BUILD)/qemu_uboot.rom @@ -120,6 +121,7 @@ else ifeq ($(ARCH),riscv64gc) $(wildcard $(QEMU_BASE_DIR)/share/qemu/edk2-riscv-code.fd) \ $(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2-riscv-code.fd) \ ) + PFLASH0_NEEDED=yes PFLASH1=$(firstword \ $(wildcard /usr/share/qemu-efi-riscv64/RISCV_VIRT_VARS.fd) \ $(wildcard /usr/share/edk2/riscv/RISCV_VIRT_VARS.fd) \ @@ -128,6 +130,7 @@ else ifeq ($(ARCH),riscv64gc) $(wildcard $(QEMU_BASE_DIR)/share/qemu/edk2-riscv-vars.fd) \ $(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2-riscv-vars.fd) \ ) + PFLASH1_NEEDED=yes ifneq ($(usb),no) QEMUFLAGS+=-device qemu-xhci -device usb-kbd -device usb-tablet endif @@ -367,6 +370,10 @@ $(BUILD)/fw_vars.bin: $(PFLASH1) chmod +w "$@" endif +qemu-deps: + $(if $(PFLASH0_NEEDED),$(if $(PFLASH0),,$(error UEFI firmware needed but not found)),) + $(if $(PFLASH1_NEEDED),$(if $(PFLASH1),,$(error UEFI variables needed but not found)),) + $(EXTRA_DISK): truncate -s 1g $@ From 08e45bc160a9de094571b1d0fe0aad989fe68890 Mon Sep 17 00:00:00 2001 From: radex Date: Sun, 4 Oct 2026 19:29:20 +0200 Subject: [PATCH 21/63] nix: make qemu for all architectures available --- flake.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 3226874d5..60ddcb702 100644 --- a/flake.nix +++ b/flake.nix @@ -86,7 +86,8 @@ # with FSTOOLS_IN_PODMAN=1 these are not needed # without it, the installer fails to link FUSE somehow #fuse - qemu_kvm + qemu_kvm # for host arch + qemu ]; LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs; From 27881074c3c359e41d798a6f01c0c4b5ea7b4af6 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Wed, 7 Oct 2026 11:40:09 +0200 Subject: [PATCH 22/63] Update servo to 0.7.0 --- recipes/wip/web/servo/recipe.toml | 36 +++++++++++++++++------------ recipes/wip/web/servo/servo.desktop | 10 ++++++++ recipes/wip/web/servo/servo.sh | 6 +++++ 3 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 recipes/wip/web/servo/servo.desktop create mode 100755 recipes/wip/web/servo/servo.sh diff --git a/recipes/wip/web/servo/recipe.toml b/recipes/wip/web/servo/recipe.toml index f03ec50b7..1444c37c6 100644 --- a/recipes/wip/web/servo/recipe.toml +++ b/recipes/wip/web/servo/recipe.toml @@ -1,6 +1,6 @@ [source] git = "https://gitlab.redox-os.org/redox-os/servo.git" -branch = "redox" +branch = "redox-0.7.0" [build] template = "custom" @@ -12,10 +12,6 @@ dependencies = [ "mesa", "zlib", ] -dev-dependencies = [ - "llvm21.dev", - "host:libarchive", # workaround for cmake error -] script = """ DYNAMIC_INIT @@ -23,30 +19,40 @@ cp -v "${COOKBOOK_RECIPE}/.servobuild" "${COOKBOOK_SOURCE}/.servobuild" # jemalloc specific configuration export JEMALLOC_SYS_WITH_LG_PAGE=16 + +if [[ "$REDOXER_USE_CLANG" != "1" && "$REDOXER_USE_CLANG" != "true" ]]; then + export CC="${GNU_TARGET}-gcc" + export CXX="${GNU_TARGET}-g++" + export HOST_CC="gcc" + export HOST_CXX="g++" +else + export CC="${GNU_TARGET}-clang" + export CXX="${GNU_TARGET}-clang++ -stdlib=libstdc++" + export HOST_CC="clang" + export HOST_CXX="clang++" +fi export TARGET_CC="$CC" export TARGET_CXX="$CXX" -export TARGET_AR="$AR" +export MOZJS_FROM_SOURCE=1 # pkg-config crate can only recognize one path to pkgconfig export PKG_CONFIG_PATH_x86_64_unknown_redox="${COOKBOOK_SYSROOT}/lib/pkgconfig" export PKG_CONFIG_SYSROOT_DIR_x86_64_unknown_redox="${COOKBOOK_SYSROOT}/lib/pkgconfig" # rsync -a -v ${COOKBOOK_SYSROOT}/usr/share/pkgconfig/*.pc ${COOKBOOK_SYSROOT}/lib/pkgconfig/ -#TODO: mozjs-sys and mozangle uses clang, it won't know our prefix C libraries, so here's the workaround -PREFIX_INCLUDE="$COOKBOOK_HOST_SYSROOT/$TARGET/include" -export CLANGFLAGS="-I $PREFIX_INCLUDE/c++/13.2.0 -I $PREFIX_INCLUDE/c++/13.2.0/$TARGET -I $PREFIX_INCLUDE/c++/13.2.0/backward -I $PREFIX_INCLUDE" - #Mozjs specifics +export CCACHE="$CC_WRAPPER" unset CC_WRAPPER -export CARGO_MAKEFLAGS="-j $COOKBOOK_MAKE_JOBS" CCACHE="sccache" +export CARGO_MAKEFLAGS="-j $COOKBOOK_MAKE_JOBS" COOKBOOK_CARGO_PATH="ports/servoshell" cookbook_cargo # resources packaging -mkdir -p ${COOKBOOK_STAGE}/usr/lib/servo/bin -mv ${COOKBOOK_STAGE}/usr/bin/servo ${COOKBOOK_STAGE}/usr/lib/servo/bin/ -ln -s ../lib/servo/bin/servo ${COOKBOOK_STAGE}/usr/bin/servo -rsync -a -v ${COOKBOOK_SOURCE}/resources ${COOKBOOK_STAGE}/usr/lib/servo/ +mkdir -p "${COOKBOOK_STAGE}/usr/lib/servo/bin" "${COOKBOOK_STAGE}/usr/share/applications" +mv "${COOKBOOK_STAGE}/usr/bin/servoshell" "${COOKBOOK_STAGE}/usr/lib/servo/bin/" +rsync -a -v "${COOKBOOK_SOURCE}/resources" "${COOKBOOK_STAGE}/usr/lib/servo/" +cp "${COOKBOOK_RECIPE}/servo.desktop" "${COOKBOOK_STAGE}/usr/share/applications/servo.desktop" +cp "${COOKBOOK_RECIPE}/servo.sh" "${COOKBOOK_STAGE}/usr/bin/servo" """ [package] diff --git a/recipes/wip/web/servo/servo.desktop b/recipes/wip/web/servo/servo.desktop new file mode 100644 index 000000000..71f718f6e --- /dev/null +++ b/recipes/wip/web/servo/servo.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Servo +Comment=Servoshell +Exec=servo +Icon=/usr/lib/servo/resources/servo_64.png +Terminal=false +Type=Application +StartupNotify=true +Categories=Network;WebBrowser; +NoDisplay=true diff --git a/recipes/wip/web/servo/servo.sh b/recipes/wip/web/servo/servo.sh new file mode 100755 index 000000000..7ee4fc254 --- /dev/null +++ b/recipes/wip/web/servo/servo.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# bug within egui/llvm causing broken fonts +export GALLIUM_DRIVER=softpipe + +exec /usr/lib/servo/bin/servoshell From 09e72447476bb177f618136d25a5b11889f2692c Mon Sep 17 00:00:00 2001 From: radex Date: Mon, 5 Oct 2026 20:24:35 +0200 Subject: [PATCH 23/63] mk/qemu: remove redundant search paths with qemu-relative firmware search, we don't need NixOS libvirtd's paths or Homebrew paths (the latter are equivalent to qemu-relative) --- mk/qemu.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/mk/qemu.mk b/mk/qemu.mk index 2e49790b1..af4ec9800 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -5,6 +5,7 @@ QEMUFLAGS?=-d guest_errors -name "Redox OS $(ARCH)" netboot?=no redoxer?=no VGA_SUPPORTED=no +# for qemu-relative firmware search QEMU_PATH?=$(shell command -v $(QEMU)) QEMU_BASE_DIR?=$(shell if [ $(QEMU_PATH) ]; then realpath $$(dirname $(QEMU_PATH))/..; fi) @@ -41,9 +42,7 @@ else ifeq ($(ARCH),x86_64) ifeq ($(FIRMWARE),) PFLASH0=$(firstword \ $(wildcard /usr/share/qemu/edk2-x86_64-code.fd) \ - $(wildcard /run/libvirt/nix-ovmf/edk2-x86_64-code.fd) \ $(wildcard $(QEMU_BASE_DIR)/share/qemu/edk2-x86_64-code.fd) \ - $(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2s-x86_64-code.fd) \ ) endif endif @@ -81,9 +80,7 @@ else ifeq ($(ARCH),aarch64) ifeq ($(FIRMWARE),) PFLASH0=$(firstword \ $(wildcard /usr/share/qemu/edk2-aarch64-code.fd) \ - $(wildcard /run/libvirt/nix-ovmf/edk2-aarch64-code.fd) \ $(wildcard $(QEMU_BASE_DIR)/share/qemu/edk2-aarch64-code.fd) \ - $(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2-aarch64-code.fd) \ ) PFLASH0_NEEDED=yes endif @@ -117,18 +114,14 @@ else ifeq ($(ARCH),riscv64gc) $(wildcard /usr/share/qemu-efi-riscv64/RISCV_VIRT_CODE.fd) \ $(wildcard /usr/share/edk2/riscv/RISCV_VIRT_CODE.fd) \ $(wildcard /usr/share/qemu/edk2-riscv-code.fd) \ - $(wildcard /run/libvirt/nix-ovmf/edk2-riscv-code.fd) \ $(wildcard $(QEMU_BASE_DIR)/share/qemu/edk2-riscv-code.fd) \ - $(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2-riscv-code.fd) \ ) PFLASH0_NEEDED=yes PFLASH1=$(firstword \ $(wildcard /usr/share/qemu-efi-riscv64/RISCV_VIRT_VARS.fd) \ $(wildcard /usr/share/edk2/riscv/RISCV_VIRT_VARS.fd) \ $(wildcard /usr/share/qemu/edk2-riscv-vars.fd) \ - $(wildcard /run/libvirt/nix-ovmf/edk2-riscv-vars.fd) \ $(wildcard $(QEMU_BASE_DIR)/share/qemu/edk2-riscv-vars.fd) \ - $(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2-riscv-vars.fd) \ ) PFLASH1_NEEDED=yes ifneq ($(usb),no) From 4a1d58323a5c9f018dcf5d51ba5dbdf1bf4ee41f Mon Sep 17 00:00:00 2001 From: Wildan M Date: Thu, 8 Oct 2026 10:24:17 +0200 Subject: [PATCH 24/63] Port GIMP --- recipes/libs/libarchive/recipe.toml | 12 +- recipes/terminal/bash-completion/recipe.toml | 2 +- recipes/web/netsurf/recipe.toml | 3 - recipes/wip/data/poppler-data/recipe.toml | 2 +- recipes/wip/fonts/noto/recipe.toml | 3 +- recipes/wip/gnome/gimp/recipe.toml | 64 +-- recipes/wip/gnome/gimp/redox.patch | 472 ++++++++++++++++++ recipes/wip/libs/gnome/gegl/recipe.toml | 18 +- recipes/wip/libs/gnome/gegl/redox.patch | 44 ++ recipes/wip/libs/gnome/gexiv2/recipe.toml | 7 +- recipes/wip/libs/media/exiv2/recipe.toml | 3 +- recipes/wip/libs/other/appstream/recipe.toml | 21 +- recipes/wip/libs/other/appstream/redox.patch | 87 ++++ recipes/wip/libs/other/babl/recipe.toml | 9 +- recipes/wip/libs/other/babl/redox.patch | 44 ++ recipes/wip/libs/other/libfyaml/recipe.toml | 6 + recipes/wip/libs/other/libfyaml/redox.patch | 35 ++ recipes/wip/libs/other/libicu/recipe.toml | 1 + recipes/wip/libs/other/libmypaint/recipe.toml | 14 +- recipes/wip/libs/other/libnsgif/recipe.toml | 22 + recipes/wip/libs/other/libstemmer/recipe.toml | 16 + recipes/wip/libs/other/libxmlb/recipe.toml | 13 + .../libs/other/mypaint-brushes/recipe.toml | 6 + .../other/netsurf-buildsystem/recipe.toml | 11 + recipes/wip/libs/other/poly2tri-c/recipe.toml | 24 + recipes/wip/libs/other/poly2tri-c/redox.patch | 49 ++ recipes/wip/libs/text/inih/recipe.toml | 3 +- 27 files changed, 936 insertions(+), 55 deletions(-) create mode 100644 recipes/wip/gnome/gimp/redox.patch create mode 100644 recipes/wip/libs/gnome/gegl/redox.patch create mode 100644 recipes/wip/libs/other/appstream/redox.patch create mode 100644 recipes/wip/libs/other/babl/redox.patch create mode 100644 recipes/wip/libs/other/libfyaml/recipe.toml create mode 100644 recipes/wip/libs/other/libfyaml/redox.patch create mode 100644 recipes/wip/libs/other/libnsgif/recipe.toml create mode 100644 recipes/wip/libs/other/libstemmer/recipe.toml create mode 100644 recipes/wip/libs/other/libxmlb/recipe.toml create mode 100644 recipes/wip/libs/other/mypaint-brushes/recipe.toml create mode 100644 recipes/wip/libs/other/netsurf-buildsystem/recipe.toml create mode 100644 recipes/wip/libs/other/poly2tri-c/recipe.toml create mode 100644 recipes/wip/libs/other/poly2tri-c/redox.patch diff --git a/recipes/libs/libarchive/recipe.toml b/recipes/libs/libarchive/recipe.toml index 19c17650a..72128d367 100644 --- a/recipes/libs/libarchive/recipe.toml +++ b/recipes/libs/libarchive/recipe.toml @@ -3,4 +3,14 @@ tar = "https://libarchive.org/downloads/libarchive-3.8.7.tar.xz" blake3 = "6b7f744132368a53ecf98a4586af09c255f81cebf37687edd857528a1bfd3bd3" [build] -template = "configure" +template = "cmake" +cmakeflags = [ + "-DENABLE_TEST=OFF" +] +dependencies = [ + "openssl3", + "libxml2", + "bzip2", + "zlib", + "zstd", +] diff --git a/recipes/terminal/bash-completion/recipe.toml b/recipes/terminal/bash-completion/recipe.toml index d363f869f..7a9ed093d 100644 --- a/recipes/terminal/bash-completion/recipe.toml +++ b/recipes/terminal/bash-completion/recipe.toml @@ -11,5 +11,5 @@ configureflags = [ [package] dependencies = [ - "sed", + "uutils-sed", ] diff --git a/recipes/web/netsurf/recipe.toml b/recipes/web/netsurf/recipe.toml index ae5bb7bf2..7aa3388b8 100644 --- a/recipes/web/netsurf/recipe.toml +++ b/recipes/web/netsurf/recipe.toml @@ -30,9 +30,6 @@ DYNAMIC_INIT # Netsurf does not currently support out-of-tree builds :( rsync -av --delete "${COOKBOOK_SOURCE}/" ./ -# obscure crash from sccache if jobs number is too much -COOKBOOK_MAKE_JOBS="$(( ${COOKBOOK_MAKE_JOBS} > 8 ? 8 : ${COOKBOOK_MAKE_JOBS} ))" - export TARGET="framebuffer" export CFLAGS="-I${PWD}/inst-${TARGET}/include" export LDFLAGS="${LDFLAGS} -L${COOKBOOK_SYSROOT}/lib -L${PWD}/inst-${TARGET}/lib -Wl,--allow-multiple-definition -Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib" diff --git a/recipes/wip/data/poppler-data/recipe.toml b/recipes/wip/data/poppler-data/recipe.toml index 3262c088a..9ff376f19 100644 --- a/recipes/wip/data/poppler-data/recipe.toml +++ b/recipes/wip/data/poppler-data/recipe.toml @@ -2,4 +2,4 @@ [source] tar = "https://poppler.freedesktop.org/poppler-data-0.4.12.tar.gz" [build] -template = "custom" +template = "cmake" diff --git a/recipes/wip/fonts/noto/recipe.toml b/recipes/wip/fonts/noto/recipe.toml index c33429709..7de97f65b 100644 --- a/recipes/wip/fonts/noto/recipe.toml +++ b/recipes/wip/fonts/noto/recipe.toml @@ -7,6 +7,7 @@ template = "custom" script = """ mkdir -pv "${COOKBOOK_STAGE}"/usr/share/fonts/Noto for f in "${COOKBOOK_SOURCE}"/fonts/*; do -echo cp -rv "${f}/full/ttf/* "${COOKBOOK_STAGE}/usr/share/fonts/Noto/$(basename ${f})/" +mkdir "${COOKBOOK_STAGE}/usr/share/fonts/Noto/$(basename ${f})/" +cp -rv "${f}/googlefonts/ttf"/* "${COOKBOOK_STAGE}/usr/share/fonts/Noto/$(basename ${f})/" || true done """ diff --git a/recipes/wip/gnome/gimp/recipe.toml b/recipes/wip/gnome/gimp/recipe.toml index cd4d73156..96ce04ae9 100644 --- a/recipes/wip/gnome/gimp/recipe.toml +++ b/recipes/wip/gnome/gimp/recipe.toml @@ -1,36 +1,40 @@ -#TODO not compiled or tested -#TODO discover minimum dependencies from meson log +#TODO compiled but not tested # build instructions: https://developer.gimp.org/core/setup/build/3.0/INSTALL # all build options: https://gitlab.gnome.org/GNOME/gimp/-/blob/master/meson_options.txt?ref_type=heads [source] tar = "https://download.gimp.org/gimp/v3.2/gimp-3.2.4.tar.xz" [build] -template = "meson" -mesonflags = [ - "-Dcheck-update=no", - "-Dlibbacktrace=false", - "-Dlibunwind=false", - "-Dprint=false", +template = "custom" +script = """ +DYNAMIC_INIT +rsync -a -v ${COOKBOOK_SYSROOT}/usr/share/pkgconfig/*.pc ${COOKBOOK_SYSROOT}/lib/pkgconfig/ +COOKBOOK_MESON_FLAGS+=( + -Denable-default-bin=enabled + -Denable-console-bin=true + -Dcheck-update=no + -Dlibbacktrace=false + -Dlibunwind=false + -Dprint=false + -Dshmem-type=posix +) +cookbook_meson +""" +dependencies = [ + "appstream", + "atk", + "babl", + "gtk3", + "gegl", + "gexiv2", + "libarchive", + "liblcms", + "libmypaint", + "librsvg", + "mypaint-brushes", + "libpoppler", + "poppler-data", + "shared-mime-info", +] +dev-dependencies = [ + "host:libxml2" ] -# dependencies = [ -# "gtk3", -# "gobject-introspection", -# "glib", -# "cairo", -# "pango", -# "liblcms", -# "libmypaint", -# "gexiv2", -# "gegl", -# "babl", -# "librsvg", -# "libtiff", -# "libjpeg", -# "libpng", -# "fontconfig", -# "freetype2", -# "atk", -# "harfbuzz", -# "bzip2", -# "zlib", -# ] diff --git a/recipes/wip/gnome/gimp/redox.patch b/recipes/wip/gnome/gimp/redox.patch new file mode 100644 index 000000000..ded94e2a5 --- /dev/null +++ b/recipes/wip/gnome/gimp/redox.patch @@ -0,0 +1,472 @@ +diff -ruwN source/app/widgets/gimpdashboard.c source-new/app/widgets/gimpdashboard.c +--- source/app/widgets/gimpdashboard.c 2026-04-17 08:37:38.000000000 +0000 ++++ source-new/app/widgets/gimpdashboard.c 2026-10-08 08:12:01.951143761 +0000 +@@ -2243,7 +2243,7 @@ + clock_t curr_usage; + struct tms tms; + +- curr_clock = times (&tms); ++ curr_clock = (clock_t) -1;//times (&tms); + + if (curr_clock == (clock_t) -1) + { +diff -ruwN source/desktop/meson.build source-new/desktop/meson.build +--- source/desktop/meson.build 2026-04-17 08:37:38.000000000 +0000 ++++ source-new/desktop/meson.build 2026-10-08 06:34:47.957042051 +0000 +@@ -5,7 +5,7 @@ + desktop_conf.set('GIMP_VERSION', gimp_version) + desktop_conf.set('GIMP_APP_VERSION', gimp_app_version) + desktop_conf.set('GIMP_DESKTOP_NAME', gimp_desktop_name) +-desktop_conf.set('MIME_TYPES', 'image/x-xcf;' + MIMEtypes_dep.get_variable('MIMEtypes')) ++desktop_conf.set('MIME_TYPES', 'image/x-xcf;') + desktop_conf.set('BUG_REPORT_URL', bug_report_url) + + desktopfilein = configure_file( +diff -ruwN source/gimp-data/meson.build source-new/gimp-data/meson.build +--- source/gimp-data/meson.build 2026-04-07 19:54:05.000000000 +0000 ++++ source-new/gimp-data/meson.build 2026-10-08 06:34:28.962938109 +0000 +@@ -1,9 +1,5 @@ + ## Tools ## + +-native_glib_minver = '2.2.0' +-native_glib = dependency('glib-2.0', version: '>='+native_glib_minver, native: true) +-native_rsvg = dependency('librsvg-2.0', version: '>='+rsvg_minver, native: true) +- + subdir('tools') + + ## Data ## +diff -ruwN source/gimp-data/tools/colorsvg2png.c source-new/gimp-data/tools/colorsvg2png.c +--- source/gimp-data/tools/colorsvg2png.c 2026-04-07 19:54:05.000000000 +0000 ++++ source-new/gimp-data/tools/colorsvg2png.c 2026-10-08 06:34:20.069421216 +0000 +@@ -15,80 +15,52 @@ + * along with this program. If not, see . + */ + +-#include +-#include ++#include ++#include + ++// Stubbed to avoid compiling native glib/librsvg + int + main (int argc, char **argv) + { +- GError *error = NULL; +- RsvgHandle *handle; +- cairo_surface_t *surface; +- cairo_t *cr; +-#if LIBRSVG_CHECK_VERSION(2, 46, 0) +- RsvgRectangle target_rect; +-#endif +- +- gchar *input; +- gchar *output; +- gint dim; +- gint retval = 0; ++ FILE *in_file; ++ FILE *out_file; ++ size_t bytes_read; ++ char buffer[8192]; + + if (argc != 4) + { +- g_fprintf (stderr, "Usage: colorsvg2png svg-image png-output size\n"); ++ fprintf (stderr, "Usage: colorsvg2png svg-image png-output size\n"); + return 1; + } + +- input = argv[1]; +- output = argv[2]; +- dim = (gint) g_ascii_strtoull (argv[3], NULL, 10); +- if (dim < 1) ++ in_file = fopen (argv[1], "rb"); ++ if (!in_file) + { +- g_fprintf (stderr, "Usage: invalid dimension %d\n", dim); ++ fprintf (stderr, "Error: failed to open input file '%s'\n", argv[1]); + return 1; + } + +- handle = rsvg_handle_new_from_file (input, &error); +- if (! handle) ++ out_file = fopen (argv[2], "wb"); ++ if (!out_file) + { +- g_fprintf (stderr, +- "Error: failed to load '%s' as SVG: %s\n", +- input, error->message); +- g_error_free (error); ++ fprintf (stderr, "Error: failed to open output file '%s'\n", argv[2]); ++ fclose (in_file); + return 1; + } + +- surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, dim, dim); +- cr = cairo_create (surface); +- +-#if LIBRSVG_CHECK_VERSION(2, 46, 0) +- target_rect.x = target_rect.y = 0; +- target_rect.width = target_rect.height = dim; +- +- if (! rsvg_handle_render_document (handle, cr, &target_rect, NULL)) +-#else +- if (! rsvg_handle_render_cairo (handle, cr)) +-#endif ++ while ((bytes_read = fread (buffer, 1, sizeof(buffer), in_file)) > 0) + { +- g_fprintf (stderr, +- "Error: failed to render '%s'\n", +- input); +- retval = 1; +- } +- +- if (retval == 0 && +- cairo_surface_write_to_png (surface, output) != CAIRO_STATUS_SUCCESS) ++ if (fwrite (buffer, 1, bytes_read, out_file) != bytes_read) + { +- g_fprintf (stderr, +- "Error: failed to write '%s'\n", +- output); +- retval = 1; ++ fprintf (stderr, "Error: failed to write to '%s'\n", argv[2]); ++ fclose (in_file); ++ fclose (out_file); ++ return 1; ++ } + } + +- cairo_surface_destroy (surface); +- cairo_destroy (cr); +- g_object_unref (handle); ++ fclose (in_file); ++ fclose (out_file); + +- return retval; ++ return 0; + } +diff -ruwN source/gimp-data/tools/meson.build source-new/gimp-data/tools/meson.build +--- source/gimp-data/tools/meson.build 2026-04-07 19:54:05.000000000 +0000 ++++ source-new/gimp-data/tools/meson.build 2026-10-08 06:34:25.152716659 +0000 +@@ -2,8 +2,6 @@ + 'colorsvg2png.c', + native: true, + dependencies: [ +- native_glib, +- native_rsvg + ], + # In case b_sanitize was set, we don't really care if the tool has issues (in + # particular we experienced some memory leaks with b_sanitize=address, within +diff -ruwN source/libgimp/gimpplugin.c source-new/libgimp/gimpplugin.c +--- source/libgimp/gimpplugin.c 2026-04-17 08:37:38.000000000 +0000 ++++ source-new/libgimp/gimpplugin.c 2026-10-08 07:14:34.086664710 +0000 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #include "gimp.h" + +diff -ruwN source/libgimp/meson.build source-new/libgimp/meson.build +--- source/libgimp/meson.build 2026-04-17 08:37:38.000000000 +0000 ++++ source-new/libgimp/meson.build 2026-10-08 08:06:39.354346391 +0000 +@@ -637,40 +637,3 @@ + ) + endif + endif +- +-if not platform_osx and host_cpu_family != 'x86' +- nm = find_program('nm', required: false) +- +- # Verify .def files for Windows linking. +- # We check this on non-Windows platform (Debian) on CI, and on Windows itself. +- custom_target('check-def-files', +- input: [ +- '../libgimpbase/gimpbase.def', +- '../libgimpcolor/gimpcolor.def', +- '../libgimpconfig/gimpconfig.def', +- '../libgimp/gimp.def', +- '../libgimp/gimpui.def', +- '../libgimpmath/gimpmath.def', +- '../libgimpmodule/gimpmodule.def', +- '../libgimpthumb/gimpthumb.def', +- '../libgimpwidgets/gimpwidgets.def', +- ], +- depends: [ +- libgimpbase, +- libgimpcolor, +- libgimpconfig, +- libgimp, +- libgimpui, +- libgimpmath, +- libgimpmodule, +- libgimpthumb, +- libgimpwidgets +- ], +- env: nm.found() ? { 'NM': nm.full_path() } : {}, +- output: [ 'check-def-files', ], +- command: [ +- python, meson.project_source_root() / 'tools' / 'defcheck.py', meson.project_source_root(), +- ], +- build_by_default: true, +- ) +-endif +diff -ruwN source/libgimpbase/meson.build source-new/libgimpbase/meson.build +--- source/libgimpbase/meson.build 2026-04-17 08:37:38.000000000 +0000 ++++ source-new/libgimpbase/meson.build 2026-10-08 06:37:40.002041333 +0000 +@@ -135,20 +135,3 @@ + libgimpbase_headers, + subdir: gimp_api_name / 'libgimpbase', + ) +- +-# Test program, not installed +-executable('test-cpu-accel', +- 'test-cpu-accel.c', +- include_directories: rootInclude, +- dependencies: [ +- glib, +- ], +- c_args: [ +- '-DG_LOG_DOMAIN="LibGimpBase"', +- '-DGIMP_BASE_COMPILATION', +- ], +- link_with: [ +- libgimpbase, +- ], +- install: false, +-) +diff -ruwN source/meson.build source-new/meson.build +--- source/meson.build 2026-04-17 08:37:38.000000000 +0000 ++++ source-new/meson.build 2026-10-08 07:11:16.124158097 +0000 +@@ -486,8 +486,6 @@ + # minimum requirement. + add_project_arguments('-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_76', language: 'c') + +-gi = dependency('gobject-introspection-1.0') +- + gobject = dependency('gobject-2.0', version: '>='+glib_minver) + gmodule = dependency('gmodule-no-export-2.0') + +@@ -573,38 +571,6 @@ + pangoft2 = dependency('pangoft2', version: '>='+pango_minver) + endif + +-if cc.run(''' +- #include +- #include +- #include +- +- int main () { +- const char *text = "ภาษาไทย"; +- int char_count = 7; +- int byte_len = strlen(text); +- int breaks_found = 0; +- +- PangoLogAttr *attrs = (PangoLogAttr *) calloc(char_count + 1, sizeof(PangoLogAttr)); +- +- pango_get_log_attrs (text, byte_len, -1, pango_language_from_string("th"), attrs, char_count + 1); +- for (int i = 1; i < char_count; i++) { +- if (attrs[i].is_line_break) +- breaks_found++; +- } +- +- if (breaks_found > 0) +- return 0; +- else +- return 1; +- } +- ''', +- name: 'pango is built with libthai support', +- dependencies: [pango]).returncode() != 0 +- thai_warning = 'Pango was not built with libthai support. Line breaking on Text tool may be incorrect on Thai language.' +- warning(thai_warning) +- warnings += thai_warning +-endif +- + conf.set('PANGO_DISABLE_DEPRECATED',pangocairo.version().version_compare('<1.43')) + + # Check if Pango is built with a recent fontconfig +@@ -801,7 +767,7 @@ + ################################################################################ + # Check for x11 support + +-x11_target = gtk3.get_variable(pkgconfig: 'targets').contains('x11') ++x11_target = false + + x11 = x11_target ? dependency('x11') : no_dep + xmu = x11_target ? dependency('xmu') : no_dep +@@ -1200,45 +1166,7 @@ + py_candidates += ['python3.' + i.to_string()] + endforeach + +-python = disabler() +-pygobject_found = '' +-pygobject_gexiv2_found = false +-foreach py : py_candidates +- #Check if PyGobject installation have pycairo (#13105) +- python_tmp = pythonmod.find_installation(py, modules: ['gi', 'cairo'], required: false) +- if python_tmp.found() and python_tmp.language_version().version_compare(python3_minver) +- python = python_tmp +- #Check if PyGObject installation have minimum version +- pygobject_found = run_command(python_tmp, '-c', +- '\n'.join([ +- '''import gi''', +- '''print(".".join(map(str, gi.version_info)))''']), +- check: false) +- #Check if PyGObject installation have gexiv2 (#15179) +- #(This is specially important on MacPorts where gexiv2 have many python variants) +- pygobject_gexiv2_found = run_command(python_tmp, '-c', +- '\n'.join([ +- '''import sys, gi''', +- '''try:''', +- ''' import gi.repository.GExiv2''', +- '''except (ImportError):''', +- ''' sys.exit(1)''']), +- check: false).returncode() == 0 +- if pygobject_found.returncode() == 0 and pygobject_found.stdout().strip().version_compare(pygobject_minver) and pygobject_gexiv2_found +- break +- endif +- endif +-endforeach +- +-if not python.found() or not python.language_version().version_compare(python3_minver) +- error('No suitable Python installation (with cairo and gi modules) found. Minimum supported version: @0@'.format(python3_minver)) +-endif +-message('Found Python @0@'.format(python.language_version())) +- +-if pygobject_found.returncode() != 0 or not pygobject_found.stdout().strip().version_compare(pygobject_minver) or not pygobject_gexiv2_found +- error('No suitable PyGObject (with GExiv2 submodule) found. Minimum supported version: @0@'.format(pygobject_minver)) +-endif +-message('Found PyGObject: @0@'.format(pygobject_found.stdout().strip())) ++python = pythonmod.find_installation('python3') + + ## Javascript + +@@ -1756,49 +1684,7 @@ + ).returncode() == 0 + + generate_version_h = is_git_repository or not has_version_h +-if generate_version_h +- gitversion_h1 = vcs_tag( +- input : 'app/git-version.h.in', +- output: 'git-version.h.in.1', +- command: [ 'git', 'describe', '--always', ], +- replace_string: '@GIMP_GIT_VERSION@', +- fallback: 'unknown (unsupported)', +- ) +- gitversion_h2 = vcs_tag( +- input : gitversion_h1, +- output: 'git-version.h.in.2', +- command: [ 'git', 'rev-parse', '--short', 'HEAD', ], +- replace_string: '@GIMP_GIT_VERSION_ABBREV@', +- fallback: 'unknown (unsupported)', +- ) +- gitversion_h = vcs_tag( +- input : gitversion_h2, +- output: 'git-version.h', +- command: [ 'git', 'log', '-n1', '--date=format:%Y', '--pretty=%cd', ], +- replace_string: '@GIMP_GIT_LAST_COMMIT_YEAR@', +- fallback: 'unknown (unsupported)', +- ) +- +- git = find_program('git', required: false) +- if not is_git_repository or not git.found() +- # We create git-version.h but know it will be useless because we are +- # not in a git repository. Output a warning. +- git_warning = ''' +- +- UNSUPPORTED BUILD! +- +- This is not a distribution tarball (git-version.h missing) and +- we could not establish the corresponding commit (either this is +- not a git repository or git command is missing). Therefore +- we have no reference for debugging. +- Please either use release tarballs or build from the repository. +- ''' +- warning(git_warning) +- warnings += git_warning +- endif +-else + gitversion_h = files('git-version.h') +-endif + + install_conf = configuration_data() + install_conf.set('GIMP_APP_VERSION', gimp_app_version) +@@ -2071,7 +1957,7 @@ + elif platform_osx + gimp_exe_depends += [patched_libgimp_gir, patched_libgimpui_gir] + +- gimp_run_env.set('GIMP_GI_DIR', gi.get_variable('libdir')) ++ gimp_run_env.set('GIMP_GI_DIR', '/usr/lib') + + gimp_run_env.set('GIMP_TEMP_UPDATE_RPATH', gimp_real_exe.full_path()) + gimp_run_env.prepend('GIMP_TEMP_UPDATE_RPATH', libgimp.full_path()) +@@ -2087,20 +1973,10 @@ + endforeach + endif + else +- # Cross-builds require an existing native GIMP installed, unless we +- # can run target binaries. +- native_gimp_exe = find_program([gimpconsole_exe_name, gimpmain_exe_name], +- native: true, required: false) +- +- if not native_gimp_exe.found() +- error('When cross-compiling, the build requires either an exe_wrapper or a native GIMP installed (@0@ or @1@).'.format(gimpconsole_exe_name, gimpmain_exe_name)) +- endif +- +- gimp_run_env.set('GIMP_SELF_IN_BUILD', native_gimp_exe.full_path()) + gimp_exe_depends = [] + endif + +-gimp_exe = find_program('tools'/'in-build-gimp.py') ++gimp_exe = disabler() # we're stripping native gimp build + + ################################################################################ + # Subdirs: part 2 +@@ -2108,14 +1984,6 @@ + # gimp-data submodule part 2 + subdir('gimp-data/images/') + +-# Unit testing +-subdir('app/tests') +-subdir('libgimp/tests') +- +-# Docs +-subdir('docs') +-subdir('devel-docs') +- + # Inno Windows installer + if get_option('windows-installer') + subdir('po-windows-installer') +diff -ruwN source/plug-ins/meson.build source-new/plug-ins/meson.build +--- source/plug-ins/meson.build 2026-04-17 08:37:38.000000000 +0000 ++++ source-new/plug-ins/meson.build 2026-10-08 07:53:23.381004527 +0000 +@@ -34,8 +34,8 @@ + { 'name': 'metadata', }, + { 'name': 'pagecurl', }, + { 'name': 'print', }, +- { 'name': 'screenshot', }, +- { 'name': 'script-fu', }, ++# screenshot need x11 ++# script-fu need 'gi' + { 'name': 'selection-to-path', } + ] + +@@ -92,17 +92,6 @@ + endif + endforeach + +- +-#Dynamically created list of supported files with the plugins lists above +-MIMEtypes_output = run_command( +- python, +- meson.current_source_dir() / 'generate_mime_ext.py', +- '--mime', +- meson.current_build_dir() / 'file_mimetypes.list', +- all_plugins_sources, check: true +-).stdout().strip() +-MIMEtypes_dep = declare_dependency(variables : {'MIMEtypes': MIMEtypes_output}) +- + if get_option('windows-installer') or get_option('ms-store') + custom_target('file_associations', + input : all_plugins_sources, diff --git a/recipes/wip/libs/gnome/gegl/recipe.toml b/recipes/wip/libs/gnome/gegl/recipe.toml index a0b36c722..51b101218 100644 --- a/recipes/wip/libs/gnome/gegl/recipe.toml +++ b/recipes/wip/libs/gnome/gegl/recipe.toml @@ -1,16 +1,28 @@ #TODO not compiled or tested # build instructions: https://gitlab.gnome.org/GNOME/gegl/-/blob/master/docs/development.adoc?ref_type=heads#user-content-debugging [source] -tar = "https://download.gimp.org/pub/gegl/0.4/gegl-0.4.46.tar.xz" +tar = "https://download.gimp.org/pub/gegl/0.4/gegl-0.4.72.tar.xz" [build] -template = "meson" +template = "custom" mesonflags = [ "-Ddocs=false", - "-Dgi-docgen=false", + "-Dgtk-doc=false", "-Dintrospection=false", "-Dparallel-tests=false", ] dependencies = [ + "cairo", "libpng", "glib", + "pango", + "babl", + "json-glib", + "libjpeg", + "libnsgif", + "poly2tri-c", ] +script = """ +DYNAMIC_INIT +CFLAGS="-std=c11" +cookbook_meson +""" diff --git a/recipes/wip/libs/gnome/gegl/redox.patch b/recipes/wip/libs/gnome/gegl/redox.patch new file mode 100644 index 000000000..58d5150c3 --- /dev/null +++ b/recipes/wip/libs/gnome/gegl/redox.patch @@ -0,0 +1,44 @@ +diff -ruwN source/meson.build source-new/meson.build +--- source/meson.build 2026-09-07 02:51:56.000000000 +0000 ++++ source-new/meson.build 2026-10-08 04:30:15.334232657 +0000 +@@ -696,40 +696,8 @@ + subdir('bin') + subdir('tools') + subdir('operations') +-subdir('examples') +-subdir('tests') + subdir('perf') + subdir('po') +-subdir('docs') +- +- +-if host_machine.system() != 'emscripten' +- nm = find_program('nm', required: false) +- +- # Verify .def files for Windows linking (and for macOS too when -Wl,-exported_symbols_list is used). +- # We check this on non-Windows/non-macOS platform (Debian) on CI, and on Windows and macOS itself. +- # (This also checks if .gir files have parity with the library so parity with .def files too) +- custom_target('check-def-files', +- input: [ +- gegl_def, +- g_ir.found() ? gegl_gir : [], +- gegl_npd_def, +- gegl_sc_def, +- ], +- depends: [ +- gegl_lib, +- gegl_npd_lib, +- seamlessclone_lib +- ], +- env: nm.found() ? { 'NM': nm.full_path() } : {}, +- output: [ 'check-def-files', ], +- command: [ +- python, meson.project_source_root() / 'tools' / 'defcheck.py', '@INPUT@', +- ], +- build_by_default: true, +- ) +-endif +- + + if w3m.found() + # Create NEWS file from html file diff --git a/recipes/wip/libs/gnome/gexiv2/recipe.toml b/recipes/wip/libs/gnome/gexiv2/recipe.toml index f62f8489c..799b237f2 100644 --- a/recipes/wip/libs/gnome/gexiv2/recipe.toml +++ b/recipes/wip/libs/gnome/gexiv2/recipe.toml @@ -5,8 +5,11 @@ tar = "https://download.gnome.org/sources/gexiv2/0.14/gexiv2-0.14.2.tar.xz" [build] template = "meson" mesonflags = [ - "-Dintrospection=false" + "-Dintrospection=false", + "-Dvapi=false", + "-Dpython3=false", ] dependencies = [ - "exiv2" + "exiv2", + "glib", ] diff --git a/recipes/wip/libs/media/exiv2/recipe.toml b/recipes/wip/libs/media/exiv2/recipe.toml index b60246de4..c89c746ce 100644 --- a/recipes/wip/libs/media/exiv2/recipe.toml +++ b/recipes/wip/libs/media/exiv2/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO compiled but not tested [source] git = "https://github.com/Exiv2/exiv2" rev = "v0.28.8" @@ -13,4 +13,5 @@ cmakeflags = [ dependencies = [ "zlib", "libiconv", + "inih", ] diff --git a/recipes/wip/libs/other/appstream/recipe.toml b/recipes/wip/libs/other/appstream/recipe.toml index 3941eb70a..67e508c3d 100644 --- a/recipes/wip/libs/other/appstream/recipe.toml +++ b/recipes/wip/libs/other/appstream/recipe.toml @@ -1,17 +1,30 @@ -#TODO not compiled or tested -# build instructions: https://github.com/ximion/appstream#build--install -#TODO missing dependencies +#TODO compiled but not tested [source] tar = "https://www.freedesktop.org/software/appstream/releases/AppStream-1.1.2.tar.xz" +script = """ +mv AppStream-1.1.2/{*,.*} . +rmdir AppStream-1.1.2 +""" +patches = [ + "redox.patch" +] + [build] template = "meson" mesonflags = [ "-Dsystemd=false", "-Dgir=false", - "-Dman=off", + "-Dman=false", ] dependencies = [ "glib", "libxml2", "curl", + "libfyaml", + "libxmlb", + "libstemmer", + "bash-completion" ] +dev-dependencies = [ + "host:gperf" +] \ No newline at end of file diff --git a/recipes/wip/libs/other/appstream/redox.patch b/recipes/wip/libs/other/appstream/redox.patch new file mode 100644 index 000000000..af8b1654a --- /dev/null +++ b/recipes/wip/libs/other/appstream/redox.patch @@ -0,0 +1,87 @@ +diff -ruwN source/AppStream-1.1.2/data/meson.build source-new/AppStream-1.1.2/data/meson.build +--- source/AppStream-1.1.2/data/meson.build 2026-01-28 20:15:58.000000000 +0000 ++++ source-new/AppStream-1.1.2/data/meson.build 2026-10-08 06:16:45.427081991 +0000 +@@ -7,52 +7,6 @@ + install_data('its/metainfo.loc', + install_dir: join_paths(get_option('datadir'), 'gettext', 'its')) + +-# Do not rely on an exe wrapper for rel-info, use the system one in that case +-if meson.is_cross_build() +- dependency('appstream', version: '>=' + as_version, native: true, +- not_found_message: 'Native appstream required for cross-building') +- ascli_exe = find_program('appstreamcli', native: true) +-endif +- +-# NOTE: We do not translate the release notes on purpose here. +-# If you do want to give translators a chance to translate them, +-# ascli news-to-metainfo needs to produce a temporary file to translate +-# prior to running (x)gettext on the file. +-metainfo_with_relinfo = custom_target('gen-output', +- input : ['../NEWS', 'org.freedesktop.appstream.cli.metainfo.xml'], +- output : ['nol10n_withrelinfo_org.freedesktop.appstream.cli.metainfo.xml'], +- command : [ascli_exe, 'news-to-metainfo', '--limit=6', '@INPUT0@', '@INPUT1@', '@OUTPUT@'] +-) +- +-metainfo_i18n = i18n.itstool_join( +- input: metainfo_with_relinfo, +- output: 'org.freedesktop.appstream.cli.metainfo.xml', +- mo_targets: i18n_result[0], +- its_files: [join_paths(meson.current_source_dir(), 'its', 'metainfo.its')], +- install: true, +- install_dir: metainfo_dir, +-) +- +-test('as-validate_metainfo.cli', +- ascli_exe, +- args: ['validate', +- '--pedantic', +- '--no-net', +- metainfo_i18n] +-) +- + # install appstream.conf default template + install_data('appstream.conf', + install_dir: as_data_installdir) +- +-if get_option('compose') +- ascompose_metainfo = 'org.freedesktop.appstream.compose.metainfo.xml' +- test('as-validate_metainfo.compose', +- ascli_exe, +- args: ['validate', +- '--pedantic', +- '--no-net', +- join_paths(meson.current_source_dir(), ascompose_metainfo)] +- ) +- install_data(ascompose_metainfo, install_dir: metainfo_dir) +-endif +diff -ruwN source/AppStream-1.1.2/meson.build source-new/AppStream-1.1.2/meson.build +--- source/AppStream-1.1.2/meson.build 2026-01-28 20:15:58.000000000 +0000 ++++ source-new/AppStream-1.1.2/meson.build 2026-10-08 06:22:27.470986289 +0000 +@@ -193,15 +193,10 @@ + stemmer_inc_dirs = include_directories() + if get_option('stemming') + stemmer_lib = cc.find_library('stemmer', required: true) +- stemmer_inc_dirs = include_directories(['/usr/include']) + if not cc.has_header('libstemmer.h') +- if cc.has_header('libstemmer/libstemmer.h') +- stemmer_inc_dirs = include_directories('/usr/include/libstemmer') +- else + error('Unable to find Snowball header "libstemmer.h". Please ensure libstemmer/Snowball is installed properly in order to continue.') + endif + endif +-endif + + # use gperf for faster string -> enum matching + gperf = find_program('gperf') +diff -ruwN source/AppStream-1.1.2/src/as-system-info.c source-new/AppStream-1.1.2/src/as-system-info.c +--- source/AppStream-1.1.2/src/as-system-info.c 2026-01-28 20:15:58.000000000 +0000 ++++ source-new/AppStream-1.1.2/src/as-system-info.c 2026-10-08 06:23:01.354958074 +0000 +@@ -513,7 +513,7 @@ + return 0; + } + return hbi.memory_size / MB_IN_BYTES; +-#elif defined(__sun) ++#elif defined(__sun) || defined(__redox__) + long physpages = sysconf (_SC_PHYS_PAGES); + long pagesize = sysconf (_SC_PAGESIZE); + if (physpages > 0 && pagesize > 0) diff --git a/recipes/wip/libs/other/babl/recipe.toml b/recipes/wip/libs/other/babl/recipe.toml index 39154ba61..0af789cc4 100644 --- a/recipes/wip/libs/other/babl/recipe.toml +++ b/recipes/wip/libs/other/babl/recipe.toml @@ -1,12 +1,15 @@ -#TODO not compiled or tested -# build instructions: https://gitlab.gnome.org/GNOME/babl/-/blob/master/INSTALL.in?ref_type=heads +#TODO compiled but not tested [source] tar = "https://download.gimp.org/pub/babl/0.1/babl-0.1.124.tar.xz" +blake3 = "30ef72ccc64771f876b4e42e0d5d05f8561fd6bb4baf225ad498056b1e896f92" +patches = [ + "redox.patch" +] [build] template = "meson" mesonflags = [ "-Dwith-docs=false", "-Denable-gir=false", "-Denable-vapi=false", - "-Dgi-docgen=false", + "-Dgi-docgen=disabled", ] diff --git a/recipes/wip/libs/other/babl/redox.patch b/recipes/wip/libs/other/babl/redox.patch new file mode 100644 index 000000000..687b3c624 --- /dev/null +++ b/recipes/wip/libs/other/babl/redox.patch @@ -0,0 +1,44 @@ +diff -ruwN source/babl/babl-conversion.c source-new/babl/babl-conversion.c +--- source/babl/babl-conversion.c 2026-03-10 15:56:45.000000000 +0000 ++++ source-new/babl/babl-conversion.c 2026-10-08 02:54:11.064600969 +0000 +@@ -18,6 +18,7 @@ + + + #include "config.h" ++#include + #include + #include + #include +diff -ruwN source/babl/babl-fish-path.c source-new/babl/babl-fish-path.c +--- source/babl/babl-fish-path.c 2026-03-10 15:56:45.000000000 +0000 ++++ source-new/babl/babl-fish-path.c 2026-10-08 02:54:11.064600969 +0000 +@@ -18,6 +18,7 @@ + + #include "config.h" + #include ++#include + #ifdef _WIN32 + #include + #endif +diff -ruwN source/babl/babl-polynomial.c source-new/babl/babl-polynomial.c +--- source/babl/babl-polynomial.c 2026-03-10 15:56:45.000000000 +0000 ++++ source-new/babl/babl-polynomial.c 2026-10-08 02:54:11.064600969 +0000 +@@ -51,6 +51,7 @@ + + #include "config.h" + #include ++#include + #include + #ifdef _WIN32 + #include +diff -ruwN source/extensions/sse2-float.c source-new/extensions/sse2-float.c +--- source/extensions/sse2-float.c 2026-03-10 15:56:45.000000000 +0000 ++++ source-new/extensions/sse2-float.c 2026-10-08 02:54:11.064600969 +0000 +@@ -25,6 +25,7 @@ + /* SSE 2 */ + #include + ++#include + #include + #include + diff --git a/recipes/wip/libs/other/libfyaml/recipe.toml b/recipes/wip/libs/other/libfyaml/recipe.toml new file mode 100644 index 000000000..69d32b071 --- /dev/null +++ b/recipes/wip/libs/other/libfyaml/recipe.toml @@ -0,0 +1,6 @@ + +[source] +tar = "https://github.com/pantoniou/libfyaml/releases/download/v0.9.6/libfyaml-0.9.6.tar.gz" + +[build] +template = "cmake" diff --git a/recipes/wip/libs/other/libfyaml/redox.patch b/recipes/wip/libs/other/libfyaml/redox.patch new file mode 100644 index 000000000..3f91626ae --- /dev/null +++ b/recipes/wip/libs/other/libfyaml/redox.patch @@ -0,0 +1,35 @@ +diff -ruwN source/CMakeLists.txt source-new/CMakeLists.txt +--- source/CMakeLists.txt 2026-03-15 13:48:50.000000000 +0000 ++++ source-new/CMakeLists.txt 2026-10-08 05:58:36.546675313 +0000 +@@ -686,6 +686,7 @@ + set(COMMON_C_DEFINITIONS WIN32_LEAN_AND_MEAN _CRT_SECURE_NO_WARNINGS) + else() + set(COMMON_C_DEFINITIONS _GNU_SOURCE) ++ set(COMMON_C_DEFINITIONS HAVE_ALLOCA_H) + endif() + + # MSVC requires C11 for stdatomic.h +diff -ruwN source/include/libfyaml/libfyaml-endian.h source-new/include/libfyaml/libfyaml-endian.h +--- source/include/libfyaml/libfyaml-endian.h 2026-03-15 13:48:50.000000000 +0000 ++++ source-new/include/libfyaml/libfyaml-endian.h 2026-10-08 05:53:56.988388856 +0000 +@@ -42,7 +42,7 @@ + extern "C" { + #endif + +-#if defined(__linux__) || defined(__CYGWIN__) || defined(__OpenBSD__) || defined(__GNU__) || defined(__EMSCRIPTEN__) ++#if defined(__linux__) || defined(__CYGWIN__) || defined(__OpenBSD__) || defined(__GNU__) || defined(__redox__) || defined(__EMSCRIPTEN__) + # include + #elif defined(__APPLE__) + # include +diff -ruwN source/src/util/fy-utils.c source-new/src/util/fy-utils.c +--- source/src/util/fy-utils.c 2026-03-15 13:48:50.000000000 +0000 ++++ source-new/src/util/fy-utils.c 2026-10-08 06:03:33.209958279 +0000 +@@ -960,7 +960,7 @@ + if (!fyms) + return NULL; + memset(fyms, 0, sizeof(*fyms)); +-#if !defined(_WIN32) ++#if !defined(_WIN32) && !defined(__redox__) + fyms->fp = open_memstream(&fyms->buf, &fyms->size); + #else + fyms->fp = tmpfile(); diff --git a/recipes/wip/libs/other/libicu/recipe.toml b/recipes/wip/libs/other/libicu/recipe.toml index 5cef02e38..e4e2dbb92 100644 --- a/recipes/wip/libs/other/libicu/recipe.toml +++ b/recipes/wip/libs/other/libicu/recipe.toml @@ -12,6 +12,7 @@ compiler = "no-lto" template = "custom" script = """ DYNAMIC_INIT +CPPFLAGS+=" -fno-lto" COOKBOOK_CONFIGURE="${COOKBOOK_SOURCE}/source/configure" COOKBOOK_CONFIGURE_FLAGS+=( icu_cv_host_frag=mh-linux diff --git a/recipes/wip/libs/other/libmypaint/recipe.toml b/recipes/wip/libs/other/libmypaint/recipe.toml index 49968016c..3e14a1e6b 100644 --- a/recipes/wip/libs/other/libmypaint/recipe.toml +++ b/recipes/wip/libs/other/libmypaint/recipe.toml @@ -1,9 +1,17 @@ -#TODO probably missing dependencies: https://github.com/mypaint/libmypaint/#dependencies +#TODO compiled but not tested [source] tar = "https://github.com/mypaint/libmypaint/releases/download/v1.6.0/libmypaint-1.6.0.tar.xz" +script = """ +GNU_CONFIG_GET config.sub +""" [build] -template = "configure" +template = "custom" +script = """ +DYNAMIC_INIT +export CPPFLAGS+=" -I${COOKBOOK_SYSROOT}/include/glib-2.0 -I${COOKBOOK_SYSROOT}/lib/glib-2.0/include" +cookbook_configure +""" dependencies = [ "glib", - "gobject-introspection", + "json-c", ] diff --git a/recipes/wip/libs/other/libnsgif/recipe.toml b/recipes/wip/libs/other/libnsgif/recipe.toml new file mode 100644 index 000000000..2ba4cc019 --- /dev/null +++ b/recipes/wip/libs/other/libnsgif/recipe.toml @@ -0,0 +1,22 @@ +[source] +tar = "https://download.netsurf-browser.org/libs/releases/libnsgif-1.0.0-src.tar.gz" + +[build] +template = "custom" +dev-dependencies = [ + "netsurf-buildsystem" +] +script = """ +DYNAMIC_INIT + +# Netsurf does not currently support out-of-tree builds :( +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ + +# netsurf mixes up CFLAGS for host and build +export CC="${CC} ${CPPFLAGS}" +export NSSHARED=${COOKBOOK_SYSROOT}/usr/share/netsurf-buildsystem +export PREFIX=/usr +export COMPONENT_TYPE=lib-shared +"$COOKBOOK_MAKE" V=1 -j"$COOKBOOK_MAKE_JOBS" +"$COOKBOOK_MAKE" DESTDIR="$COOKBOOK_STAGE" install -j"$COOKBOOK_MAKE_JOBS" +""" diff --git a/recipes/wip/libs/other/libstemmer/recipe.toml b/recipes/wip/libs/other/libstemmer/recipe.toml new file mode 100644 index 000000000..0ad0ce334 --- /dev/null +++ b/recipes/wip/libs/other/libstemmer/recipe.toml @@ -0,0 +1,16 @@ + +[source] +tar = "https://snowballstem.org/dist/libstemmer_c-3.1.1.tar.gz" + +[build] +template = "custom" +compiler = "no-lto" +script = """ +DYNAMIC_INIT +rsync -a --delete "${COOKBOOK_SOURCE}/" ./ +mkdir -p ${COOKBOOK_STAGE}/usr/bin ${COOKBOOK_STAGE}/usr/lib ${COOKBOOK_STAGE}/usr/include +make CFLAGS="-O2 -fPIC $CPPFLAGS" +cp libstemmer.a ${COOKBOOK_STAGE}/usr/lib +cp stemwords ${COOKBOOK_STAGE}/usr/bin +cp include/* ${COOKBOOK_STAGE}/usr/include +""" diff --git a/recipes/wip/libs/other/libxmlb/recipe.toml b/recipes/wip/libs/other/libxmlb/recipe.toml new file mode 100644 index 000000000..5b24aa8d5 --- /dev/null +++ b/recipes/wip/libs/other/libxmlb/recipe.toml @@ -0,0 +1,13 @@ + +[source] +tar = "https://github.com/hughsie/libxmlb/releases/download/0.3.29/libxmlb-0.3.29.tar.xz" + +[build] +template = "meson" +mesonflags = [ + "-Dintrospection=false" +] +dependencies = [ + "glib", + "zstd", +] \ No newline at end of file diff --git a/recipes/wip/libs/other/mypaint-brushes/recipe.toml b/recipes/wip/libs/other/mypaint-brushes/recipe.toml new file mode 100644 index 000000000..ab02060b0 --- /dev/null +++ b/recipes/wip/libs/other/mypaint-brushes/recipe.toml @@ -0,0 +1,6 @@ +#TODO compiled but not tested +[source] +tar = "https://github.com/mypaint/mypaint-brushes/releases/download/v2.0.2/mypaint-brushes-2.0.2.tar.xz" +[build] +template = "configure" + diff --git a/recipes/wip/libs/other/netsurf-buildsystem/recipe.toml b/recipes/wip/libs/other/netsurf-buildsystem/recipe.toml new file mode 100644 index 000000000..a5b9781c4 --- /dev/null +++ b/recipes/wip/libs/other/netsurf-buildsystem/recipe.toml @@ -0,0 +1,11 @@ +[source] +tar = "https://download.netsurf-browser.org/libs/releases/buildsystem-1.10.tar.gz" + +[build] +template = "custom" +script = """ +# Netsurf does not currently support out-of-tree builds :( +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ + +make install PREFIX=/usr DESTDIR="${COOKBOOK_STAGE}" +""" diff --git a/recipes/wip/libs/other/poly2tri-c/recipe.toml b/recipes/wip/libs/other/poly2tri-c/recipe.toml new file mode 100644 index 000000000..7fd078006 --- /dev/null +++ b/recipes/wip/libs/other/poly2tri-c/recipe.toml @@ -0,0 +1,24 @@ +[source] +git = "https://github.com/KyleLink/poly2tri-c" +shallow_clone = true +patches = [ + "redox.patch" +] +script = """ +# find . -type d -exec touch {}/Makefile.in \\; +# touch aclocal.m4 configure configure.ac Makefile.am +autotools_recursive_regenerate +""" + +[build] +template = "custom" +dependencies = [ + "glib", +] +script = """ +DYNAMIC_INIT + +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +COOKBOOK_CONFIGURE="./configure" +cookbook_configure +""" \ No newline at end of file diff --git a/recipes/wip/libs/other/poly2tri-c/redox.patch b/recipes/wip/libs/other/poly2tri-c/redox.patch new file mode 100644 index 000000000..3ad4623fb --- /dev/null +++ b/recipes/wip/libs/other/poly2tri-c/redox.patch @@ -0,0 +1,49 @@ +diff --git a/Makefile.am b/Makefile.am +index c6f694e..6082285 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + SUBDIRS = poly2tri-c bin + +-ACLOCAL_AMFLAGS = -I m4 ++ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = poly2tri-c.pc +diff --git a/configure.ac b/configure.ac +index 8ba632f..a52b355 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -83,9 +83,6 @@ AC_PROG_CC + # -Werror, so we will only add that option afterwards. For more information, see + # the discussion at http://lists.gnu.org/archive/html/bug-autoconf/2010-01/msg00031.html + +-# Pedantic errors please +-CFLAGS="$CFLAGS -Wall -ansi -pedantic" +- + # Find the standard math functions + # Taken from http://www.flameeyes.eu/autotools-mythbuster/autoconf/finding.html + AC_CHECK_HEADERS([math.h]) +@@ -93,9 +90,6 @@ AC_SEARCH_LIBS([log10], [m], [], [ + AC_MSG_ERROR([unable to find the log10() function]) + ]) + +-# Warnings as errors please +-CFLAGS="$CFLAGS -Werror" +- + # Find GLib support via pkg-config + PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28]) + +diff --git a/poly2tri-c/refine/Makefile.am b/poly2tri-c/refine/Makefile.am +index 8701b0d..74edd34 100644 +--- a/poly2tri-c/refine/Makefile.am ++++ b/poly2tri-c/refine/Makefile.am +@@ -1,6 +1,6 @@ + noinst_LTLIBRARIES = libp2tc-refine.la + +-libp2tc_refine_la_SOURCES = bounded-line.c bounded-line.h cdt.c cdt.h cdt-flipfix.c cdt-flipfix.h circle.c circle.h cluster.c cluster.h delaunay-terminator.c delaunay-terminator.h edge.c edge.h line.c line.h rmath.c rmath.h mesh.c mesh.h mesh-action.c mesh-action.h point.c point.h pslg.c pslg.h refine.h refiner.c refiner.h triangle.c triangle.h triangulation.h utils.c utils.h vector2.c vector2.h vedge.c vedge.h vtriangle.c vtriangle.h visibility.c visibility.h ++libp2tc_refine_la_SOURCES = bounded-line.c bounded-line.h cdt-flipfix.c cdt-flipfix.h circle.c circle.h cluster.c cluster.h delaunay-terminator.c delaunay-terminator.h edge.c edge.h line.c line.h rmath.c rmath.h mesh.c mesh.h mesh-action.c mesh-action.h point.c point.h pslg.c pslg.h refine.h refiner.c refiner.h rcdt.c rcdt.h rutils.c rutils.h triangle.c triangle.h triangulation.h vector2.c vector2.h vedge.c vedge.h vtriangle.c vtriangle.h visibility.c visibility.h + + P2TC_REFINE_publicdir = $(P2TC_publicdir)/refine +-P2TC_REFINE_public_HEADERS = bounded-line.h cdt.h circle.h cluster.h edge.h line.h mesh.h mesh-action.h point.h pslg.h refine.h refiner.h rmath.h triangle.h triangulation.h utils.h vector2.h vedge.h vtriangle.h visibility.h ++P2TC_REFINE_public_HEADERS = bounded-line.h circle.h cluster.h edge.h line.h mesh.h mesh-action.h point.h pslg.h rcdt.h refine.h refiner.h rmath.h rutils.h triangle.h triangulation.h vector2.h vedge.h vtriangle.h visibility.h diff --git a/recipes/wip/libs/text/inih/recipe.toml b/recipes/wip/libs/text/inih/recipe.toml index 6e950d061..e36bb5bb2 100644 --- a/recipes/wip/libs/text/inih/recipe.toml +++ b/recipes/wip/libs/text/inih/recipe.toml @@ -1,5 +1,4 @@ -#TODO not compiled or tested -# build instructions: https://github.com/benhoyt/inih#meson-notes +#TODO compiled but not tested [source] git = "https://github.com/benhoyt/inih" rev = "r62" From 8ca6693b9de177847f7ad1a1c14c07412be05f56 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Tue, 6 Oct 2026 06:30:55 +0700 Subject: [PATCH 25/63] Update GIMP launcher --- config/x86_64/ci.toml | 1 + recipes/wip/gnome/gimp/gimp.desktop | 15 +++++++++++++++ recipes/wip/gnome/gimp/gimp.sh | 12 ++++++++++++ recipes/wip/gnome/gimp/icons/16x16.png | Bin 0 -> 679 bytes recipes/wip/gnome/gimp/icons/256x256.png | Bin 0 -> 31922 bytes recipes/wip/gnome/gimp/icons/32x32.png | Bin 0 -> 1572 bytes recipes/wip/gnome/gimp/icons/48x48.png | Bin 0 -> 3052 bytes recipes/wip/gnome/gimp/icons/64x64.png | Bin 0 -> 5199 bytes recipes/wip/gnome/gimp/recipe.toml | 19 +++++++++++++++++++ 9 files changed, 47 insertions(+) create mode 100644 recipes/wip/gnome/gimp/gimp.desktop create mode 100755 recipes/wip/gnome/gimp/gimp.sh create mode 100644 recipes/wip/gnome/gimp/icons/16x16.png create mode 100644 recipes/wip/gnome/gimp/icons/256x256.png create mode 100644 recipes/wip/gnome/gimp/icons/32x32.png create mode 100644 recipes/wip/gnome/gimp/icons/48x48.png create mode 100644 recipes/wip/gnome/gimp/icons/64x64.png diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml index c5723aab4..6d655fa20 100644 --- a/config/x86_64/ci.toml +++ b/config/x86_64/ci.toml @@ -100,6 +100,7 @@ generaluser-gs = {} gettext = {} gigalomania = {} git = {} +gimp = {} glib = {} glutin = {} gnu-binutils = {} diff --git a/recipes/wip/gnome/gimp/gimp.desktop b/recipes/wip/gnome/gimp/gimp.desktop new file mode 100644 index 000000000..f65f6370c --- /dev/null +++ b/recipes/wip/gnome/gimp/gimp.desktop @@ -0,0 +1,15 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=GIMP +GenericName=Image Editor +Comment=Create images and edit photographs +Keywords=GIMP;graphic;design;illustration;painting; +Exec=gimp +TryExec=gimp +Icon=gimp +Terminal=false +Categories=Graphics;2DGraphics;RasterGraphics;GTK; +StartupNotify=true +MimeType=image/x-xcf; +StartupWMClass=gimp diff --git a/recipes/wip/gnome/gimp/gimp.sh b/recipes/wip/gnome/gimp/gimp.sh new file mode 100755 index 000000000..25b63a60f --- /dev/null +++ b/recipes/wip/gnome/gimp/gimp.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +export GTK_USE_PORTAL=0 + +export GDK_PIXBUF_MODULE_FILE="$HOME/.cache/gimp-gdk-pixbuf-loaders.cache" + +if [ ! -f "$GDK_PIXBUF_MODULE_FILE" ]; then + echo "Generating GdkPixbuf loaders cache..." + gdk-pixbuf-query-loaders > "$GDK_PIXBUF_MODULE_FILE" +fi + +exec /usr/bin/gimp-3.2 "$@" diff --git a/recipes/wip/gnome/gimp/icons/16x16.png b/recipes/wip/gnome/gimp/icons/16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..e48e6088132d8208a48965d0595da14269ec9f83 GIT binary patch literal 679 zcmV;Y0$BZtP)HFJd0VB9g^wICd>omg@{l)SLL{8r6M}aryoFM$TvV*S`yBlJ%el4uJXEZ!x}t&`V>FQiQ`95R+^32NWXr-h!G=n z6qJ;nh>1%GGqbYr{P}Z;L{(K4$B!Kn0eD@wa3Rdi&2aY2N#tfFATc^n1P~6GICC`5*MBGA`KNB~aJYLTEf@O97fu*&`}les;NXlSB-(ag$AO-`44!DqNvKB zFGnLQO~3H=u;&t^{SX!6NH`RxXtjvCSdHH}}07M3fyqvO}0%_(lEYnGJ zKhgW-bRUUcrRG!HzDz?yV>vKJf?@h7$&G{!00KrJ<^W<=AZEs<1^}Tmtt+kIK}!Gt N002ovPDHLkV1oYOJ6!+( literal 0 HcmV?d00001 diff --git a/recipes/wip/gnome/gimp/icons/256x256.png b/recipes/wip/gnome/gimp/icons/256x256.png new file mode 100644 index 0000000000000000000000000000000000000000..8e39e7b8068cb694f011d4ad14341f8579418505 GIT binary patch literal 31922 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 PdIRL8m8HrhO@jU(=brFI literal 0 HcmV?d00001 diff --git a/recipes/wip/gnome/gimp/icons/32x32.png b/recipes/wip/gnome/gimp/icons/32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..6b8aa7bb9cfdbf771465a3d3df4cf6152e7ce7e7 GIT binary patch literal 1572 zcmV+<2HW|GP)kcyadGSM@$rA8_ub^E z`$aE)9^U=#cj8TNdJ|ZdMKn4KiXPwo_Sf)}pZtK{&!MZk8%K^D!PL|ki5n;9Rx~+H zaM$V4P^CeQT?so0pq^NML;-OL32(MnRIb1J^>2XMXhKqQ^4gIjhkyIp*S!LvP!M zKK}6!;Ka$3c-C{C3%N>-lF|}HB7+Yrz^D^I>%eCoQ2?d?CvSN3o3XXEg@KVPkSbJA z>kY`r$iVpIbzHd61c$SZ8u1FoulG?Frt#*tyav~=52K)<0Hu3N5o!&f&EG&Ju zbH5TORs1@`2_uiz1HzX8oI(RTxztV#bbfbVSGRnN_l?e9M7|lCSYH7cJ{5t=4Mn>)!@+4 zW2kLtfYoY+f;)@e)&}&oJJEkPeQgf(gd5P?=0ZoX9^vzqXmMLmZCAvizhC-Quu=VK zBU&XN@sGL?k?GRX(iYtw&(76r*D*L0OK<*e8r%If=nT}NGg!Av2fdDc)_SoD!Inz+ zo62F<%aE0s4$+yzaMs)xJ+I(zpA<1qq45iexJO+F$cm{SJ{g~ou$`Qoyd$UR1I-l( zQH1v==CGL>EjHDvta2PaSc1fa1T@I9p*x-eN4c<@4YMH@J-e2Yl47K>PY`*Jxe$?M z5=T#oM9-rob-lV$kMPA>O1BSv9gXM+IT2{NE9H(FEvyC>I+b`g1Afa9JlB>047EU zFm|mU1Kk(U7NF*%&wUOHExl?qm>C4Lg?O$z8y{-VS?|@PeE!;S_xnPjKnIOk@VJ&@ zvK-pZ`=OB2j92x+~+;>d67sY<#Fu=WU0h{LPV&Eij=gp;GX>l zpMCh`srQ}{i+{jK*;U$Pwi%gh>GV0#w~ib;_Lh=;`=ZoGZu-5M;06cUUO>zD#`nJe z-L1vNMFfMv&4Gb|KkePSxAk!y$;eWOV&WJfCggjKs z-e@#ZL_2EFwd-9Ks;sj{pyY??Xmh(KHf9lk!XnubF5{dolzwKT?mO=CoIZxb-o)GYafWH76 W(!Id+;(ZnX0000g2Qrz~|IG?MN-htU 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 E15pC86aWAK literal 0 HcmV?d00001 diff --git a/recipes/wip/gnome/gimp/recipe.toml b/recipes/wip/gnome/gimp/recipe.toml index 96ce04ae9..8cd62ac8e 100644 --- a/recipes/wip/gnome/gimp/recipe.toml +++ b/recipes/wip/gnome/gimp/recipe.toml @@ -3,6 +3,9 @@ # all build options: https://gitlab.gnome.org/GNOME/gimp/-/blob/master/meson_options.txt?ref_type=heads [source] tar = "https://download.gimp.org/gimp/v3.2/gimp-3.2.4.tar.xz" +patches = [ + "redox.patch" +] [build] template = "custom" script = """ @@ -18,6 +21,22 @@ COOKBOOK_MESON_FLAGS+=( -Dshmem-type=posix ) cookbook_meson + +# plugins causes hang (undo these mv to test) +mv "${COOKBOOK_STAGE}/usr/lib/gimp/3.0/extensions" "${COOKBOOK_STAGE}/usr/lib/gimp/3.0/extensions.disabled" +mv "${COOKBOOK_STAGE}/usr/lib/gimp/3.0/plug-ins" "${COOKBOOK_STAGE}/usr/lib/gimp/3.0/plug-ins.disabled" + +# icons are not converted to png (see patches) +HICOLOR="${COOKBOOK_STAGE}/usr/share/icons/hicolor" +for size in 16 32 48 64 256; do + mkdir -p "${HICOLOR}/${size}x${size}/apps" + cp -f "${COOKBOOK_RECIPE}/icons/${size}x${size}.png" "${HICOLOR}/${size}x${size}/apps/gimp.png" +done +# TODO: /usr/share/gimp/3.0/images/gimp-splash.png + +rm "${COOKBOOK_STAGE}/usr/bin/gimp" # symlink to gimp-3.2 +cp "${COOKBOOK_RECIPE}/gimp.desktop" "${COOKBOOK_STAGE}/usr/share/applications/gimp.desktop" +cp "${COOKBOOK_RECIPE}/gimp.sh" "${COOKBOOK_STAGE}/usr/bin/gimp" """ dependencies = [ "appstream", From a01dc721cdb28d97633d119975c0728f068342dd Mon Sep 17 00:00:00 2001 From: Wildan M Date: Tue, 6 Oct 2026 14:21:12 +0700 Subject: [PATCH 26/63] cookbook: Apply rules before deriving build deps --- src/bin/repo/main.rs | 274 +++++++++++++++++++++++++++++-------------- src/recipe.rs | 60 +++++++++- 2 files changed, 245 insertions(+), 89 deletions(-) diff --git a/src/bin/repo/main.rs b/src/bin/repo/main.rs index 2b34847de..8d9a07a48 100644 --- a/src/bin/repo/main.rs +++ b/src/bin/repo/main.rs @@ -11,7 +11,7 @@ use cookbook::cook::tree::{self, DisplayOptions, TreeData, TreeItem, TreeOptions use cookbook::cook::tui::join_logs; use cookbook::cook::{fetch_repo, ident}; use cookbook::recipe::{ - CookRecipe, SourceRecipe, recipes_flatten_package_names, recipes_mark_as_deps, + CookRecipe, RecipeRule, SourceRecipe, recipes_flatten_package_names, recipes_mark_as_deps, validate_filesystem_rules, }; use cookbook::{Error, Result, staged_pkg}; @@ -625,15 +625,22 @@ fn parse_args(args: Vec) -> Result<(CliConfig, CliCommand, Vec = Vec::new(); let mut binary_names: Vec = Vec::new(); - let mut special_rules: HashMap = HashMap::new(); - let default_rule = if repo_binary { "binary" } else { "source" }; + let mut special_rules: HashMap = HashMap::new(); + let default_rule = RecipeRule::from_repo_binary(repo_binary); for (recipe_name, recipe_lock) in lock.iter().filter(|(_, v)| v.fsrule.is_some()) { let Ok(recipe_name) = PackageName::new(recipe_name) else { continue; }; - let rule = recipe_lock.fsrule.as_ref().unwrap(); - special_rules.insert(recipe_name.clone(), rule.to_string()); + let rule = recipe_lock.fsrule.as_deref().unwrap(); + let Ok(rule) = RecipeRule::try_from(rule) else { + bail_other_err!( + "Invalid pkg config {} = {:?}\nExpecting either 'source', 'local', 'binary' or 'ignore'", + recipe_name.as_str(), + rule + ); + }; + special_rules.insert(recipe_name.clone(), rule); // lock rules does not recurse as it's done already in the file } if let Some(conf) = config.filesystem.as_ref() { @@ -643,79 +650,96 @@ fn parse_args(args: Vec) -> Result<(CliConfig, CliCommand, Vec = source_names.into_iter().collect(); let binary_names: HashSet = binary_names.into_iter().collect(); + let recipe_names_with_pkg = if command.is_building() || command.is_pushing() { + // include all package deps (TODO: ignored recipes should be exempted) + CookRecipe::get_package_deps_recursive(&recipe_names, true)? + } else { + recipe_names.clone() + }; + // These are list that derived from recipe_names - let mut source_recipe_names: Vec = Vec::new(); - let mut binary_recipe_names: Vec = Vec::new(); - let mut ignore_recipe_names: Vec = Vec::new(); - for recipe_name in recipe_names.iter() { - if special_rules - .get(recipe_name) - .is_some_and(|s| s == "ignore") - { - ignore_recipe_names.push(recipe_name.clone()); - } else if source_names.contains(recipe_name) { - source_recipe_names.push(recipe_name.clone()); - } else if binary_names.contains(recipe_name) { - binary_recipe_names.push(recipe_name.clone()); + let mut recipe_name_rules = BTreeMap::new(); + for recipe_name in recipe_names_with_pkg { + let new_rule = if let Some(&rule) = special_rules.get(&recipe_name) { + rule + } else if source_names.contains(&recipe_name) { + RecipeRule::Source + } else if binary_names.contains(&recipe_name) { + RecipeRule::Binary } else if repo_binary { - binary_recipe_names.push(recipe_name.clone()); + RecipeRule::Binary } else { - source_recipe_names.push(recipe_name.clone()); - } + RecipeRule::Source + }; + recipe_name_rules.insert(recipe_name, new_rule); } - if command.is_building() || command.is_pushing() { - source_recipe_names = - CookRecipe::get_package_deps_recursive(&source_recipe_names, true)?; - binary_recipe_names = - CookRecipe::get_package_deps_recursive(&binary_recipe_names, true)?; + // apply rules on root recipe names + apply_special_rules_by_names( + &special_rules, + default_rule, + &source_names, + &binary_names, + &mut recipe_name_rules, + &config, + ); + + macro_rules! filter_recipes { + ($rules:expr, $pat:pat) => { + $rules + .iter() + .filter_map(|(k, v)| { + if matches!(v, $pat) { + Some(k.clone()) + } else { + None + } + }) + .collect::>() + }; } + // split map into lists of separate recipes names to apply different build deps logic + let source_recipe_names = + filter_recipes!(recipe_name_rules, RecipeRule::Source | RecipeRule::Local); + let binary_recipe_names = filter_recipes!(recipe_name_rules, RecipeRule::Binary); + let ignore_recipe_names = filter_recipes!(recipe_name_rules, RecipeRule::Ignore); + let mut recipes = if matches!(config.all, Some(AllOption::AllBinaries)) { // Removes all source-compiled recipes Vec::new() } else if command.is_building() || command.is_pushing() { // Pushing do not need dev deps, so does binary recipes at building let include_dev = command.is_building(); - if include_dev && default_rule == "source" { - // try to lookup if this recipe eventually changed to "binary" so that dev recipes - // don't really get included. TODO: move this logic down after special rules applied. - let mut i = 0; - let (_, repository) = fetch_repo::get_binary_repo(); - while i < source_recipe_names.len() { - let name = &source_recipe_names[i]; - if (binary_names.contains(name) - || special_rules - .get(name) - .is_some_and(|s| s.as_str() == "binary")) - && repository.packages.contains_key(name.as_str()) - { - binary_recipe_names.push(source_recipe_names.remove(i)); - continue; - } - i += 1; - } - } CookRecipe::get_build_deps_recursive(&source_recipe_names, include_dev)? } else { CookRecipe::from_list(source_recipe_names.clone())? @@ -733,36 +757,15 @@ fn parse_args(args: Vec) -> Result<(CliConfig, CliCommand, Vec { - // both lists: flip logic - if repo_binary { "source" } else { "binary" } - } - (true, false) => "source", - (false, true) => "binary", - (false, false) => default_rule, - }; - if recipe.name.is_host() && rule == "binary" { - // host recipe binaries is currently not supported - continue; - } - - recipe.apply_filesystem_config(rule)?; - } + // reapply rules again for build/package deps + apply_special_rules( + &special_rules, + default_rule, + &source_names, + &binary_names, + &mut recipes, + &config, + )?; validate_filesystem_rules(&recipes)?; @@ -789,11 +792,62 @@ fn parse_args(args: Vec) -> Result<(CliConfig, CliCommand, Vec, + default_rule: RecipeRule, + source_names: &HashSet, + binary_names: &HashSet, + recipes: &mut Vec, + config: &CliConfig, +) -> Result<()> { + for recipe in recipes.iter_mut() { + if !recipe.rule.is_empty() { + continue; + } + if let Some(&special_rule) = special_rules.get(recipe.canon_recipe_name().without_prefix()) + { + if recipe.name.is_host() && special_rule == RecipeRule::Binary { + // host recipe binaries is currently not supported + continue; + } + recipe.apply_filesystem_config(special_rule.into())?; + continue; + } + let rule = match ( + source_names.contains(&recipe.name), + binary_names.contains(&recipe.name), + ) { + (true, true) => { + // both lists: flip logic + default_rule.inverted_default() + } + (true, false) => RecipeRule::Source, + (false, true) => RecipeRule::Binary, + (false, false) => default_rule, + }; + if recipe.name.is_host() && rule == RecipeRule::Binary { + // host recipe binaries is currently not supported + continue; + } + + recipe.apply_filesystem_config(rule.into())?; + } + + // check if binary repositories are valid + if recipes.iter().any(|r| r.rule == "binary") { let (_, repository) = fetch_repo::get_binary_repo(); for recipe in recipes.iter_mut() { if recipe.rule == "binary" && !repository.packages.contains_key(recipe.name.as_str()) { - if config.cook.verbose && !(config.cook.tui && command == CliCommand::Cook) { + if config.cook.verbose { // TODO: this should be printed at fetch log, not here println!( "DEBUG: Recipe {:?} has no binary package", @@ -806,12 +860,56 @@ fn parse_args(args: Vec) -> Result<(CliConfig, CliCommand, Vec, + default_rule: RecipeRule, + source_names: &HashSet, + binary_names: &HashSet, + recipes: &mut BTreeMap, + config: &CliConfig, +) { + for (recipe, rule) in recipes.iter_mut() { + if let Some(&special_rule) = special_rules.get(recipe.without_prefix()) { + if recipe.is_host() && special_rule == RecipeRule::Binary { + // host recipe binaries is currently not supported + continue; + } + *rule = special_rule; + continue; + } + let new_rule = match (source_names.contains(recipe), binary_names.contains(recipe)) { + (true, true) => { + // both lists: flip logic + default_rule.inverted_default() + } + (true, false) => RecipeRule::Source, + (false, true) => RecipeRule::Binary, + (false, false) => default_rule, + }; + if recipe.is_host() && new_rule == RecipeRule::Binary { + // host recipe binaries is currently not supported + continue; + } + + *rule = new_rule; } - Ok((config, command, recipes)) + // check if binary rules are valid + if recipes.values().any(|&r| r == RecipeRule::Binary) { + let (_, repository) = fetch_repo::get_binary_repo(); + for (name, rule) in recipes.iter_mut() { + if *rule == RecipeRule::Binary && !repository.packages.contains_key(name.as_str()) { + if config.cook.verbose { + // TODO: this should be printed at fetch log, not here + println!("DEBUG: Recipe {:?} has no binary package", name.as_str()); + } + *rule = RecipeRule::Source; + } + } + } } fn handle_fetch( @@ -1141,4 +1239,10 @@ macro_rules! bail_options_err { }; } +macro_rules! bail_other_err { + ($($arg:tt)*) => { + return Err(cookbook::Error::Other(format!($($arg)*))) + }; +} use bail_options_err; +use bail_other_err; diff --git a/src/recipe.rs b/src/recipe.rs index a66e45249..d93eaac9a 100644 --- a/src/recipe.rs +++ b/src/recipe.rs @@ -215,6 +215,56 @@ impl BuildRecipe { } } +#[derive(Debug, Clone, Copy, PartialEq)] +pub enum RecipeRule { + Source, + Binary, + Local, + Ignore, +} + +impl RecipeRule { + pub fn inverted_default(self) -> Self { + if self == RecipeRule::Binary { + RecipeRule::Source + } else { + RecipeRule::Binary + } + } + pub fn from_repo_binary(repo_binary: bool) -> Self { + if repo_binary { + RecipeRule::Binary + } else { + RecipeRule::Source + } + } +} + +impl<'a> TryFrom<&'a str> for RecipeRule { + type Error = &'a str; + + fn try_from(value: &'a str) -> Result { + Ok(match value { + "source" => Self::Source, + "binary" => Self::Binary, + "local" => Self::Local, + "ignore" => Self::Ignore, + v => return Err(v), + }) + } +} + +impl From for &'static str { + fn from(value: RecipeRule) -> Self { + match value { + RecipeRule::Source => "source", + RecipeRule::Binary => "binary", + RecipeRule::Local => "local", + RecipeRule::Ignore => "ignore", + } + } +} + #[derive(Debug, Clone, PartialEq)] pub struct CookRecipe { pub name: PackageName, @@ -223,6 +273,7 @@ pub struct CookRecipe { pub target: &'static str, /// If false, it's listed on install config pub is_deps: bool, + // TODO: change to Option pub rule: String, /// whether if this recipe is pinned from cookbook.lock pub pinned: bool, @@ -642,7 +693,7 @@ pub fn validate_filesystem_rules(recipes: &[CookRecipe]) -> crate::Result<()> { let ignored: BTreeSet = recipes .iter() .filter(|r| r.rule == "ignore") - .map(|r| r.canon_recipe_name().without_prefix().to_string()) + .map(|r| r.name.without_prefix().to_string()) .collect(); if ignored.is_empty() { return Ok(()); @@ -651,9 +702,10 @@ pub fn validate_filesystem_rules(recipes: &[CookRecipe]) -> crate::Result<()> { if recipe.rule == "ignore" { continue; } - if recipe.recipe.build.kind == BuildKind::None - || recipe.recipe.build.kind == BuildKind::Remote - { + if matches!( + recipe.recipe.build.kind, + BuildKind::None | BuildKind::Remote + ) { // Not built from source, so build dependencies are irrelevant. continue; } From e2a4098aa14829f019cdc3876e6ffd3287b44ec2 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Tue, 6 Oct 2026 07:00:07 -0300 Subject: [PATCH 27/63] Add, fix, update some recipes and remove abandoned recipes --- recipes/wip/libs/other/opencv4/recipe.toml | 3 +-- recipes/wip/tests/aflplusplus/recipe.toml | 8 +++++++- recipes/wip/tests/arclight/recipe.toml | 6 ------ recipes/wip/tests/catch2/recipe.toml | 2 +- recipes/wip/tests/check/recipe.toml | 2 +- recipes/wip/tests/cunit/recipe.toml | 3 +++ recipes/wip/tests/gtest/recipe.toml | 2 +- recipes/wip/tests/memtester/recipe.toml | 8 +++++++- recipes/wip/tests/pjdfstest-rs/recipe.toml | 8 ++++++++ recipes/wip/tests/pjdfstest/recipe.toml | 3 ++- recipes/wip/tests/radamsa/recipe.toml | 8 +++++++- recipes/wip/tests/sqlite-test/recipe.toml | 1 + recipes/wip/tests/zzuf/recipe.toml | 2 +- 13 files changed, 40 insertions(+), 16 deletions(-) delete mode 100644 recipes/wip/tests/arclight/recipe.toml create mode 100644 recipes/wip/tests/pjdfstest-rs/recipe.toml diff --git a/recipes/wip/libs/other/opencv4/recipe.toml b/recipes/wip/libs/other/opencv4/recipe.toml index ec61c8d46..6af5bf372 100644 --- a/recipes/wip/libs/other/opencv4/recipe.toml +++ b/recipes/wip/libs/other/opencv4/recipe.toml @@ -1,5 +1,4 @@ -#TODO not compiled or tested -#TODO determine if bundled dependencies need patches, if they need, use recipes +#TODO need "#import " [source] git = "https://github.com/opencv/opencv" branch = "4.x" diff --git a/recipes/wip/tests/aflplusplus/recipe.toml b/recipes/wip/tests/aflplusplus/recipe.toml index 6c75309ef..c10274bc1 100644 --- a/recipes/wip/tests/aflplusplus/recipe.toml +++ b/recipes/wip/tests/aflplusplus/recipe.toml @@ -1,4 +1,4 @@ -#TODO add script for gnu make: +#TODO not compiled or tested # https://aflplus.plus/building/ # https://github.com/AFLplusplus/AFLplusplus/blob/stable/docs/INSTALL.md # has feature flags [source] @@ -7,3 +7,9 @@ rev = "v5.00c" shallow_clone = true [build] template = "custom" +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" distrib -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/tests/arclight/recipe.toml b/recipes/wip/tests/arclight/recipe.toml deleted file mode 100644 index f39635ea3..000000000 --- a/recipes/wip/tests/arclight/recipe.toml +++ /dev/null @@ -1,6 +0,0 @@ -#TODO not compiled or tested -[source] -git = "https://github.com/josd/arclight" -shallow_clone = true -[build] -template = "cargo" diff --git a/recipes/wip/tests/catch2/recipe.toml b/recipes/wip/tests/catch2/recipe.toml index 713c04fa8..d2eeb49b5 100644 --- a/recipes/wip/tests/catch2/recipe.toml +++ b/recipes/wip/tests/catch2/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but not tested [source] git = "https://github.com/catchorg/Catch2" rev = "v3.13.0" diff --git a/recipes/wip/tests/check/recipe.toml b/recipes/wip/tests/check/recipe.toml index 2f1021a7b..e0c09710b 100644 --- a/recipes/wip/tests/check/recipe.toml +++ b/recipes/wip/tests/check/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO compiled but not tested [source] tar = "https://github.com/libcheck/check/releases/download/0.15.2/check-0.15.2.tar.gz" [build] diff --git a/recipes/wip/tests/cunit/recipe.toml b/recipes/wip/tests/cunit/recipe.toml index fc1f239f9..6c43d714e 100644 --- a/recipes/wip/tests/cunit/recipe.toml +++ b/recipes/wip/tests/cunit/recipe.toml @@ -1,5 +1,8 @@ #TODO not compiled or tested [source] tar = "https://downloads.sourceforge.net/project/cunit/CUnit/2.1-3/CUnit-2.1-3.tar.bz2" +script = """ +autotools_recursive_regenerate +""" [build] template = "configure" diff --git a/recipes/wip/tests/gtest/recipe.toml b/recipes/wip/tests/gtest/recipe.toml index 822359e98..eb16499bb 100644 --- a/recipes/wip/tests/gtest/recipe.toml +++ b/recipes/wip/tests/gtest/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but not tested # build instructions: https://github.com/google/googletest/blob/main/googletest/README.md [source] tar = "https://github.com/google/googletest/releases/download/v1.17.0/googletest-1.17.0.tar.gz" diff --git a/recipes/wip/tests/memtester/recipe.toml b/recipes/wip/tests/memtester/recipe.toml index c4535b095..35eaf1ec6 100644 --- a/recipes/wip/tests/memtester/recipe.toml +++ b/recipes/wip/tests/memtester/recipe.toml @@ -1,5 +1,11 @@ -#TODO add script for gnu make: https://pyropus.ca./software/memtester/ +#TODO not compiled or tested [source] tar = "https://pyropus.ca./software/memtester/old-versions/memtester-4.7.1.tar.gz" [build] template = "custom" +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/tests/pjdfstest-rs/recipe.toml b/recipes/wip/tests/pjdfstest-rs/recipe.toml new file mode 100644 index 000000000..c604432bf --- /dev/null +++ b/recipes/wip/tests/pjdfstest-rs/recipe.toml @@ -0,0 +1,8 @@ +#TODO not compiled or tested +[source] +git = "https://github.com/saidsay-so/pjdfstest" +shallow_clone = true +[build] +template = "cargo" +cargopath = "rust" +compiler = "no-lto" diff --git a/recipes/wip/tests/pjdfstest/recipe.toml b/recipes/wip/tests/pjdfstest/recipe.toml index c8219daad..4507d40a3 100644 --- a/recipes/wip/tests/pjdfstest/recipe.toml +++ b/recipes/wip/tests/pjdfstest/recipe.toml @@ -1,6 +1,7 @@ -#TODO not compiled or tested +#TODO compilation error, warnings treated as errors [source] git = "https://github.com/pjd/pjdfstest" +rev = "85a8aea" shallow_clone = true script = """ autotools_recursive_regenerate diff --git a/recipes/wip/tests/radamsa/recipe.toml b/recipes/wip/tests/radamsa/recipe.toml index 0609a01cb..ba2c776fc 100644 --- a/recipes/wip/tests/radamsa/recipe.toml +++ b/recipes/wip/tests/radamsa/recipe.toml @@ -1,5 +1,11 @@ -#TODO add script for gnu make:https://gitlab.com/akihe/radamsa#building-radamsa +#TODO not compiled or tested [source] tar = "https://gitlab.com/akihe/radamsa/-/archive/v0.7/radamsa-v0.7.tar.bz2" [build] template = "custom" +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/tests/sqlite-test/recipe.toml b/recipes/wip/tests/sqlite-test/recipe.toml index c1f86d052..3b75a3454 100644 --- a/recipes/wip/tests/sqlite-test/recipe.toml +++ b/recipes/wip/tests/sqlite-test/recipe.toml @@ -1,3 +1,4 @@ +#TODO test [source] git = "https://github.com/sqlite/sqlite" shallow_clone = true diff --git a/recipes/wip/tests/zzuf/recipe.toml b/recipes/wip/tests/zzuf/recipe.toml index 2b4d3cc5a..cd07a2c66 100644 --- a/recipes/wip/tests/zzuf/recipe.toml +++ b/recipes/wip/tests/zzuf/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO can't recognize redox [source] tar = "https://github.com/samhocevar/zzuf/releases/download/v0.15/zzuf-0.15.tar.bz2" [build] From 013707b4652fe3efe889b4999d0d1f83c8179b2d Mon Sep 17 00:00:00 2001 From: auronandace Date: Tue, 6 Oct 2026 13:52:38 +0100 Subject: [PATCH 28/63] update wasmtime from v36 to v49 --- recipes/wip/wasm/wasmtime/recipe.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/wip/wasm/wasmtime/recipe.toml b/recipes/wip/wasm/wasmtime/recipe.toml index bf417cf53..9740a73a8 100644 --- a/recipes/wip/wasm/wasmtime/recipe.toml +++ b/recipes/wip/wasm/wasmtime/recipe.toml @@ -1,8 +1,8 @@ -# TODO (willnode) push changes upstream -# TODO upgrade to latest v47 +# TODO upstream what we can: see https://gitlab.redox-os.org/redox-os/redox/-/work_items/1839 +# TODO upgrade to v49.0.2 (curently on v49.0.0) [source] -git = "https://github.com/willnode/wasmtime" -branch = "v36-redox" +git = "https://github.com/auronandace/wasmtime" +branch = "redox-49" shallow_clone = true [build] From 79482cbab12c490487e9e605a1f96dee92de3483 Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Thu, 8 Oct 2026 10:57:35 +0000 Subject: [PATCH 29/63] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Ribbon --- recipes/wip/gnome/gimp/recipe.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/wip/gnome/gimp/recipe.toml b/recipes/wip/gnome/gimp/recipe.toml index 8cd62ac8e..9a912d825 100644 --- a/recipes/wip/gnome/gimp/recipe.toml +++ b/recipes/wip/gnome/gimp/recipe.toml @@ -1,4 +1,4 @@ -#TODO compiled but not tested +#TODO test more # build instructions: https://developer.gimp.org/core/setup/build/3.0/INSTALL # all build options: https://gitlab.gnome.org/GNOME/gimp/-/blob/master/meson_options.txt?ref_type=heads [source] From 76b1de0c65f5b1aff85e939ae8b5a30c1749aecc Mon Sep 17 00:00:00 2001 From: Ribbon Date: Thu, 8 Oct 2026 13:11:41 -0300 Subject: [PATCH 30/63] Fix and remove more recipes, and update more TODOs --- .../wip/emu/game-console/gecko/recipe.toml | 4 ++- recipes/wip/emu/game-console/mame/recipe.toml | 29 ++++++++++++++----- .../game-console/ps1/swanstation/recipe.toml | 10 +++---- .../game-console/ps1/trapezoid/recipe.toml | 2 +- recipes/wip/emu/pc/lightspark/recipe.toml | 22 +++++++------- .../graphics/editors/blender-lts/recipe.toml | 27 +++++++++++------ .../wip/graphics/viewers/exhibit/recipe.toml | 3 ++ recipes/wip/graphics/viewers/meov/recipe.toml | 18 ++++++++---- recipes/wip/libs/other/libusb/recipe.toml | 3 +- .../wip/libs/other/openimageio/recipe.toml | 7 +++-- recipes/wip/sys-info/bb/recipe.toml | 2 +- recipes/wip/sys-info/btop/recipe.toml | 2 +- recipes/wip/sys-info/cpu-x/recipe.toml | 3 +- recipes/wip/sys-info/cyme/recipe.toml | 3 +- recipes/wip/sys-info/dmidecode-rs/recipe.toml | 2 +- recipes/wip/sys-info/dmidecode/recipe.toml | 8 ++++- recipes/wip/sys-info/fastfetch/recipe.toml | 2 +- recipes/wip/sys-info/ffetch/recipe.toml | 3 +- recipes/wip/sys-info/freshfetch/recipe.toml | 2 ++ recipes/wip/sys-info/macchina/recipe.toml | 1 + recipes/wip/sys-info/neofetch/recipe.toml | 11 ------- recipes/wip/sys-info/pciutils/recipe.toml | 13 +++++++-- recipes/wip/sys-info/pfetch-rs/recipe.toml | 1 + .../wip/sys-info/process-viewer/recipe.toml | 3 +- recipes/wip/sys-info/procps-ng/recipe.toml | 3 +- recipes/wip/sys-info/procs/recipe.toml | 1 + recipes/wip/sys-info/rfetch/recipe.toml | 1 + recipes/wip/sys-info/rsftch/recipe.toml | 1 + recipes/wip/sys-info/zeitfetch/recipe.toml | 3 +- .../wip/sys/desktop-file-utils/recipe.toml | 2 +- recipes/wip/tests/memtester/recipe.toml | 2 +- recipes/wip/tests/pjdfstest-rs/recipe.toml | 2 +- 32 files changed, 124 insertions(+), 72 deletions(-) delete mode 100644 recipes/wip/sys-info/neofetch/recipe.toml diff --git a/recipes/wip/emu/game-console/gecko/recipe.toml b/recipes/wip/emu/game-console/gecko/recipe.toml index 5a3b6df9f..efd11818a 100644 --- a/recipes/wip/emu/game-console/gecko/recipe.toml +++ b/recipes/wip/emu/game-console/gecko/recipe.toml @@ -1,7 +1,9 @@ -#TODO compile and test +#TODO disasm crate error +#TODO make sdl3-sys crate use sdl3 recipe [source] git = "https://github.com/ioncodes/gecko" shallow_clone = true [build] template = "cargo" cargopackages = ["tinyapp"] +dependencies = ["sdl3"] diff --git a/recipes/wip/emu/game-console/mame/recipe.toml b/recipes/wip/emu/game-console/mame/recipe.toml index 5428ced96..9f1ba777c 100644 --- a/recipes/wip/emu/game-console/mame/recipe.toml +++ b/recipes/wip/emu/game-console/mame/recipe.toml @@ -1,14 +1,27 @@ -#TODO missing script for gnu make: https://docs.mamedev.org/initialsetup/compilingmame.html +#TODO compile and test +# cross-compilation doc: https://docs.mamedev.org/initialsetup/compilingmame.html#cross-compiling-mame [source] git = "https://github.com/mamedev/mame" rev = "mame0282" shallow_clone = true [build] template = "custom" -dependencies = [ - "sdl2", - "sdl2-ttf", - "fontconfig", - "qt5-base", - "qt5-tools", -] +#dependencies = [ +# "sdl2", +# "sdl2-ttf", +# "fontconfig", +# "qt5-base", +# "qt5-tools", +#] +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +MAKEFLAGS=( + CROSS_BUILD=1 + NO_OPENGL=1 + NO_USE_PORTAUDIO=1 + NO_USE_PULSEAUDIO=1 +) +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" "${MAKEFLAGS[@]}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/emu/game-console/ps1/swanstation/recipe.toml b/recipes/wip/emu/game-console/ps1/swanstation/recipe.toml index e6276279e..81412753c 100644 --- a/recipes/wip/emu/game-console/ps1/swanstation/recipe.toml +++ b/recipes/wip/emu/game-console/ps1/swanstation/recipe.toml @@ -1,6 +1,5 @@ # using DuckStation fork from when it was licensed as GPLv3 and the fork still had the Qt and ImGui? frontends (libretro fork don't have them anymore) -#TODO not compiled or tested yet -#TODO determine minimum dependencies from cmake log +#TODO can't fetch submodules # build instructions: https://github.com/piepacker/swanstation#linux-1 [source] git = "https://github.com/piepacker/swanstation" @@ -15,9 +14,10 @@ cmakeflags = [ "-DBUILD_QT_FRONTEND=OFF", "-DBUILD_MINI_FRONTEND=ON", ] -#dependencies = [ - #"sdl2", +dependencies = [ + "sdl2", + "curl", #"qt6-base", #"qt6-svg", #"qt6-tools", -#] +] diff --git a/recipes/wip/emu/game-console/ps1/trapezoid/recipe.toml b/recipes/wip/emu/game-console/ps1/trapezoid/recipe.toml index 55253803e..8a89a76c9 100644 --- a/recipes/wip/emu/game-console/ps1/trapezoid/recipe.toml +++ b/recipes/wip/emu/game-console/ps1/trapezoid/recipe.toml @@ -1,4 +1,4 @@ -#TODO sccache error +#TODO sccache server shutdown error causes rust abort because can't catch foreign exceptions [source] git = "https://github.com/Amjad50/Trapezoid" shallow_clone = true diff --git a/recipes/wip/emu/pc/lightspark/recipe.toml b/recipes/wip/emu/pc/lightspark/recipe.toml index 6abf5672a..864f97333 100644 --- a/recipes/wip/emu/pc/lightspark/recipe.toml +++ b/recipes/wip/emu/pc/lightspark/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO build error [source] git = "https://github.com/lightspark/lightspark" rev = "ff478b8a6a349a6d919e342d04793dad454fdf5c" @@ -12,14 +12,16 @@ cmakeflags = [ "-DENABLE_LIBAVCODEC=FALSE", "-DENABLE_RTMP=FALSE", ] -#dependencies = [ - #"mesa", - #"curl", - #"zlib", +dependencies = [ + "mesa", + "curl", + "zlib", #"ffmpeg6", #"rtmpdump", - #"sdl2", - #"libjpeg", - #"xz", - #"fontconfig", -#] + "sdl2", + "libjpeg", + "libpng", + "freetype2", + "xz", + "fontconfig", +] diff --git a/recipes/wip/graphics/editors/blender-lts/recipe.toml b/recipes/wip/graphics/editors/blender-lts/recipe.toml index 8b578bdb3..76057a405 100644 --- a/recipes/wip/graphics/editors/blender-lts/recipe.toml +++ b/recipes/wip/graphics/editors/blender-lts/recipe.toml @@ -1,4 +1,5 @@ -#TODO not compiled or tested +#TODO fix openimageio dependency +#TODO enable brotli support in freetype2 recipe #TODO determine the minimum dependencies from cmake log # build instructions: https://developer.blender.org/docs/handbook/building_blender/ [source] @@ -11,22 +12,30 @@ cmakeflags = [ "-DWITH_GHOST_SDL=ON", "-DWITH_SDL=ON", "-DWITH_EXPERIMENTAL_FEATURES=OFF", + "-DWITH_VULKAN_BACKEND=OFF", + "-DWITH_INTERNATIONAL=OFF", + "-DWITH_PYTHON=OFF", + "-DWITH_LIBS_PRECOMPILED=OFF", ] -# dependencies = [ +dependencies = [ # "dbus", # "libdecor", -# "libjpeg", -# "libpng", -# "freetype2", + "libjpeg", + "libpng", + "zlib", + "libtiff", + "openimageio", +# "libvulkan", + "freetype2", # "fontconfig", -# "zstd", + "zstd", # "bzip2", # "xz", -# "sdl2", -# "libepoxy", + "sdl2", + "libepoxy", # "shaderc", # "libxml2", # "libharu", # "mesa-x11", # "libxkbcommon", -# ] +] diff --git a/recipes/wip/graphics/viewers/exhibit/recipe.toml b/recipes/wip/graphics/viewers/exhibit/recipe.toml index 9bdf621ef..17fb4081b 100644 --- a/recipes/wip/graphics/viewers/exhibit/recipe.toml +++ b/recipes/wip/graphics/viewers/exhibit/recipe.toml @@ -4,3 +4,6 @@ git = "https://github.com/Nokse22/Exhibit" rev = "v1.5.1" [build] template = "meson" +dev-dependencies = [ + "host:itstool", +] diff --git a/recipes/wip/graphics/viewers/meov/recipe.toml b/recipes/wip/graphics/viewers/meov/recipe.toml index 5c54b0a3f..daa3bb513 100644 --- a/recipes/wip/graphics/viewers/meov/recipe.toml +++ b/recipes/wip/graphics/viewers/meov/recipe.toml @@ -1,15 +1,21 @@ -#TODO make it use sdl2 recipe -#TODO determine if/what bundled dependencies need to be patched +#TODO make it use sdl2 recipe instead of bundled sdl2 # dependencies: https://github.com/seigtm/meov/tree/Baranov_0.3.0_Linux_Builds/dependencies [source] git = "https://github.com/seigtm/meov" branch = "Baranov_0.3.0_Linux_Builds" shallow_clone = true [build] -template = "cmake" -cmakeflags = [ - "-DMEOV_USING_OPENGL=false" -] +template = "custom" dependencies = [ "sdl2", ] +script = """ +DYNAMIC_INIT +COOKBOOK_CMAKE_FLAGS+=( + -DMEOV_USING_OPENGL=false + -DOPENGL_opengl_LIBRARY="/dev/null" + -DOPENGL_glx_LIBRARY="/dev/null" + +) +cookbook_cmake +""" diff --git a/recipes/wip/libs/other/libusb/recipe.toml b/recipes/wip/libs/other/libusb/recipe.toml index 3d0f73f6b..40ba76a5a 100644 --- a/recipes/wip/libs/other/libusb/recipe.toml +++ b/recipes/wip/libs/other/libusb/recipe.toml @@ -1,5 +1,6 @@ +# libudev dependency is mandatory since version 1.0.30 #TODO compiled but not tested [source] -tar = "https://github.com/libusb/libusb/releases/download/v1.0.30/libusb-1.0.30.tar.bz2" +tar = "https://github.com/libusb/libusb/releases/download/v1.0.29/libusb-1.0.29.tar.bz2" [build] template = "configure" diff --git a/recipes/wip/libs/other/openimageio/recipe.toml b/recipes/wip/libs/other/openimageio/recipe.toml index c27be8618..c5bacd8bd 100644 --- a/recipes/wip/libs/other/openimageio/recipe.toml +++ b/recipes/wip/libs/other/openimageio/recipe.toml @@ -1,6 +1,5 @@ -#TODO not compiled or tested +#TODO can't find python3 # build instructions: https://github.com/AcademySoftwareFoundation/OpenImageIO/blob/master/INSTALL.md#building-openimageio-on-linux-or-os-x -# the dependencies are optional [source] tar = "https://github.com/AcademySoftwareFoundation/OpenImageIO/releases/download/v3.1.11.0/OpenImageIO-3.1.11.0.tar.gz" [build] @@ -14,7 +13,9 @@ dependencies = [ "libtiff", "libjpeg", "openexr", - "opencolorio", + "zlib", + "python312", + #"opencolorio", "libfmt", #"libpng", #"boost", diff --git a/recipes/wip/sys-info/bb/recipe.toml b/recipes/wip/sys-info/bb/recipe.toml index 147c196e9..3aa685eb3 100644 --- a/recipes/wip/sys-info/bb/recipe.toml +++ b/recipes/wip/sys-info/bb/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO outdated nix crate? (after cargo update) [source] git = "https://github.com/epilys/bb" [build] diff --git a/recipes/wip/sys-info/btop/recipe.toml b/recipes/wip/sys-info/btop/recipe.toml index edb370b16..9ecdbe770 100644 --- a/recipes/wip/sys-info/btop/recipe.toml +++ b/recipes/wip/sys-info/btop/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO port: UnixPaths is not supported [source] git = "https://github.com/aristocratos/btop" rev = "v1.4.7" diff --git a/recipes/wip/sys-info/cpu-x/recipe.toml b/recipes/wip/sys-info/cpu-x/recipe.toml index 12af058c2..32e3159d0 100644 --- a/recipes/wip/sys-info/cpu-x/recipe.toml +++ b/recipes/wip/sys-info/cpu-x/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO fix libstatgrab dep # build instructions: https://github.com/TheTumultuousUnicornOfDarkness/CPU-X/wiki/manual-build#build-and-install-cpu-x [source] git = "https://github.com/TheTumultuousUnicornOfDarkness/CPU-X" @@ -16,7 +16,6 @@ dependencies = [ ] script = """ DYNAMIC_INIT -export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include/ncurses" COOKBOOK_CMAKE_FLAGS+=( "-DWITH_GTK=0", "-DWITH_LIBGLFW=0", diff --git a/recipes/wip/sys-info/cyme/recipe.toml b/recipes/wip/sys-info/cyme/recipe.toml index dfb039fea..21404e6e3 100644 --- a/recipes/wip/sys-info/cyme/recipe.toml +++ b/recipes/wip/sys-info/cyme/recipe.toml @@ -1,5 +1,6 @@ -#TODO port to Redox +#TODO port [source] git = "https://github.com/tuna-f1sh/cyme" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/sys-info/dmidecode-rs/recipe.toml b/recipes/wip/sys-info/dmidecode-rs/recipe.toml index 67669a2c4..7af784438 100644 --- a/recipes/wip/sys-info/dmidecode-rs/recipe.toml +++ b/recipes/wip/sys-info/dmidecode-rs/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO port [source] git = "https://github.com/jrgerber/dmidecode-rs" shallow_clone = true diff --git a/recipes/wip/sys-info/dmidecode/recipe.toml b/recipes/wip/sys-info/dmidecode/recipe.toml index cbafcc726..0bd675be1 100644 --- a/recipes/wip/sys-info/dmidecode/recipe.toml +++ b/recipes/wip/sys-info/dmidecode/recipe.toml @@ -1,5 +1,11 @@ -#TODO add script for gnu make: https://cgit.git.savannah.nongnu.org/cgit/dmidecode.git/tree/README#n22 +#TODO compile and test [source] tar = "https://download.savannah.gnu.org/releases/dmidecode/dmidecode-3.7.tar.xz" [build] template = "custom" +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/sys-info/fastfetch/recipe.toml b/recipes/wip/sys-info/fastfetch/recipe.toml index 9b69bd24a..31a96e82e 100644 --- a/recipes/wip/sys-info/fastfetch/recipe.toml +++ b/recipes/wip/sys-info/fastfetch/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO port [source] git = "https://github.com/fastfetch-cli/fastfetch" rev = "2.69.0" diff --git a/recipes/wip/sys-info/ffetch/recipe.toml b/recipes/wip/sys-info/ffetch/recipe.toml index 8b23aada9..4804efeec 100644 --- a/recipes/wip/sys-info/ffetch/recipe.toml +++ b/recipes/wip/sys-info/ffetch/recipe.toml @@ -1,5 +1,6 @@ -#TODO not compiled or tested +#TODO compiled but not tested [source] git = "https://github.com/0l3d/ffetch" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/sys-info/freshfetch/recipe.toml b/recipes/wip/sys-info/freshfetch/recipe.toml index 4e254a515..f5ea6adf1 100644 --- a/recipes/wip/sys-info/freshfetch/recipe.toml +++ b/recipes/wip/sys-info/freshfetch/recipe.toml @@ -1,8 +1,10 @@ #TODO mlua crate error [source] git = "https://github.com/K4rakara/freshfetch" +shallow_clone = true [build] template = "custom" script = """ +DYNAMIC_INIT cookbook_cargo_packages freshfetch """ diff --git a/recipes/wip/sys-info/macchina/recipe.toml b/recipes/wip/sys-info/macchina/recipe.toml index 524a1d555..0d2b80dba 100644 --- a/recipes/wip/sys-info/macchina/recipe.toml +++ b/recipes/wip/sys-info/macchina/recipe.toml @@ -1,5 +1,6 @@ #TODO if-addrs crate error [source] git = "https://github.com/Macchina-CLI/macchina" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/sys-info/neofetch/recipe.toml b/recipes/wip/sys-info/neofetch/recipe.toml deleted file mode 100644 index a93875549..000000000 --- a/recipes/wip/sys-info/neofetch/recipe.toml +++ /dev/null @@ -1,11 +0,0 @@ -#TODO Add Redox OS on the Bash script -[source] -git = "https://github.com/dylanaraps/neofetch" -rev = "60d07dee6b76769d8c487a40639fb7b5a1a7bc85" -[build] -template = "custom" -script = """ -mkdir -pv "${COOKBOOK_STAGE}"/usr/bin -cp "${COOKBOOK_SOURCE}"/neofetch "${COOKBOOK_STAGE}"/usr/bin/neofetch -chmod +x "${COOKBOOK_STAGE}"/usr/bin/neofetch -""" diff --git a/recipes/wip/sys-info/pciutils/recipe.toml b/recipes/wip/sys-info/pciutils/recipe.toml index 9494d79fd..7e09fc5d3 100644 --- a/recipes/wip/sys-info/pciutils/recipe.toml +++ b/recipes/wip/sys-info/pciutils/recipe.toml @@ -1,8 +1,17 @@ -#TODO missing script for "make", see https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/tree/README#n52 +#TODO compile and test [source] tar = "https://mirrors.edge.kernel.org/pub/software/utils/pciutils/pciutils-3.9.0.tar.xz" [build] -template = "cmake" +template = "custom" dependencies = [ "zlib", ] +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +#MAKEFLAGS=( + # CROSS_COMPILE= +#) +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" #"${MAKEFLAGS[@]}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/sys-info/pfetch-rs/recipe.toml b/recipes/wip/sys-info/pfetch-rs/recipe.toml index 14a10962f..bfbeae855 100644 --- a/recipes/wip/sys-info/pfetch-rs/recipe.toml +++ b/recipes/wip/sys-info/pfetch-rs/recipe.toml @@ -1,5 +1,6 @@ #TODO if-addrs crate error [source] git = "https://github.com/Gobidev/pfetch-rs" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/sys-info/process-viewer/recipe.toml b/recipes/wip/sys-info/process-viewer/recipe.toml index bf48af600..53de6ede0 100644 --- a/recipes/wip/sys-info/process-viewer/recipe.toml +++ b/recipes/wip/sys-info/process-viewer/recipe.toml @@ -1,6 +1,7 @@ -#TODO make GTK4 work +#TODO compile and test [source] git = "https://github.com/GuillaumeGomez/process-viewer" +shallow_clone = true [build] template = "cargo" dependencies = [ diff --git a/recipes/wip/sys-info/procps-ng/recipe.toml b/recipes/wip/sys-info/procps-ng/recipe.toml index fc247ee48..76f293260 100644 --- a/recipes/wip/sys-info/procps-ng/recipe.toml +++ b/recipes/wip/sys-info/procps-ng/recipe.toml @@ -1,5 +1,6 @@ -#TODO not compiled or tested +#TODO build error, disable tests? [source] tar = "https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-4.0.4.tar.xz/download" [build] template = "configure" +dependencies = ["ncursesw"] diff --git a/recipes/wip/sys-info/procs/recipe.toml b/recipes/wip/sys-info/procs/recipe.toml index da481c03c..7bb222481 100644 --- a/recipes/wip/sys-info/procs/recipe.toml +++ b/recipes/wip/sys-info/procs/recipe.toml @@ -1,5 +1,6 @@ #TODO async-io and rustix crates error (after cargo update) [source] git = "https://github.com/dalance/procs" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/sys-info/rfetch/recipe.toml b/recipes/wip/sys-info/rfetch/recipe.toml index 3a1287cb8..5c7fad60e 100644 --- a/recipes/wip/sys-info/rfetch/recipe.toml +++ b/recipes/wip/sys-info/rfetch/recipe.toml @@ -1,5 +1,6 @@ #TODO nix crate error (after cargo update) [source] git = "https://github.com/kamui-fin/rfetch" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/sys-info/rsftch/recipe.toml b/recipes/wip/sys-info/rsftch/recipe.toml index e0758a6ef..95abfab4a 100644 --- a/recipes/wip/sys-info/rsftch/recipe.toml +++ b/recipes/wip/sys-info/rsftch/recipe.toml @@ -1,5 +1,6 @@ #TODO source code error [source] git = "https://github.com/charklie/rsftch" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/sys-info/zeitfetch/recipe.toml b/recipes/wip/sys-info/zeitfetch/recipe.toml index a78a1c4c0..5d9188350 100644 --- a/recipes/wip/sys-info/zeitfetch/recipe.toml +++ b/recipes/wip/sys-info/zeitfetch/recipe.toml @@ -1,5 +1,6 @@ -#TODO not compiled or tested +#TODO compiled but not tested [source] git = "https://github.com/nidnogg/zeitfetch" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/sys/desktop-file-utils/recipe.toml b/recipes/wip/sys/desktop-file-utils/recipe.toml index 330e384a1..8da204616 100644 --- a/recipes/wip/sys/desktop-file-utils/recipe.toml +++ b/recipes/wip/sys/desktop-file-utils/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO compiled but not tested [source] git = "https://gitlab.freedesktop.org/xdg/desktop-file-utils" rev = "0.28" diff --git a/recipes/wip/tests/memtester/recipe.toml b/recipes/wip/tests/memtester/recipe.toml index 35eaf1ec6..9bf009442 100644 --- a/recipes/wip/tests/memtester/recipe.toml +++ b/recipes/wip/tests/memtester/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but not tested [source] tar = "https://pyropus.ca./software/memtester/old-versions/memtester-4.7.1.tar.gz" [build] diff --git a/recipes/wip/tests/pjdfstest-rs/recipe.toml b/recipes/wip/tests/pjdfstest-rs/recipe.toml index c604432bf..3465e4958 100644 --- a/recipes/wip/tests/pjdfstest-rs/recipe.toml +++ b/recipes/wip/tests/pjdfstest-rs/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO port exacl crate [source] git = "https://github.com/saidsay-so/pjdfstest" shallow_clone = true From 72f0a39083750818225948d8611078d3c78ce050 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Thu, 8 Oct 2026 15:52:17 -0300 Subject: [PATCH 31/63] Fix and improve many recipes --- recipes/wip/demos/ascii-rain/recipe.toml | 2 +- .../wip/games/engines/ioquake3/recipe.toml | 12 +++++-- .../fps/{assaultcube => acr}/recipe.toml | 0 recipes/wip/games/fps/et-legacy/recipe.toml | 5 +++ recipes/wip/games/fps/openarena/recipe.toml | 8 ++++- .../wip/games/fps/openspades-free/recipe.toml | 31 ------------------- recipes/wip/games/fps/smokin-guns/recipe.toml | 12 +++++-- recipes/wip/games/fps/xonotic/recipe.toml | 12 +++++-- recipes/wip/games/sim/egregoria/recipe.toml | 2 ++ recipes/wip/games/sim/ferroliquid/recipe.toml | 2 +- .../games/sim/game-of-life-piston/recipe.toml | 1 + .../wip/games/sim/game-of-life-rs/recipe.toml | 1 + recipes/wip/games/sim/nbodysim/recipe.toml | 2 ++ recipes/wip/games/sim/termfarm/recipe.toml | 2 +- .../wip/games/space/endless-sky/recipe.toml | 5 +-- recipes/wip/games/space/naev/recipe.toml | 2 +- recipes/wip/games/strategy/0ad/recipe.toml | 2 +- .../games/strategy/brutal-chess/recipe.toml | 2 +- recipes/wip/games/strategy/go-tui/recipe.toml | 2 +- .../wip/games/strategy/hammurabi/recipe.toml | 1 + .../wip/games/strategy/stockfish/recipe.toml | 12 +++++-- recipes/wip/libs/other/gpgme/recipe.toml | 2 +- recipes/wip/libs/other/libmad/recipe.toml | 2 +- recipes/wip/security/capstone/recipe.toml | 11 +++++-- recipes/wip/security/clamav/recipe.toml | 19 ++++++------ recipes/wip/security/cotp/recipe.toml | 9 ++---- recipes/wip/security/fakeroot/recipe.toml | 2 +- recipes/wip/security/hydra/recipe.toml | 2 +- .../wip/security/john-the-ripper/recipe.toml | 9 +++++- recipes/wip/security/openpgp-ca/recipe.toml | 2 ++ recipes/wip/security/openvas/recipe.toml | 15 ++++----- recipes/wip/security/pass-tui/recipe.toml | 2 +- recipes/wip/security/pass/recipe.toml | 8 ++++- recipes/wip/security/please/recipe.toml | 1 + .../wip/security/plutus-rustus/recipe.toml | 1 + recipes/wip/security/rage/recipe.toml | 2 ++ recipes/wip/security/retdec/recipe.toml | 8 ++++- .../wip/security/rowhammer-test/recipe.toml | 11 ++++++- recipes/wip/security/rshijack/recipe.toml | 1 + recipes/wip/security/rustyvault/recipe.toml | 1 + recipes/wip/security/sn0int/recipe.toml | 1 + recipes/wip/security/sniffglue/recipe.toml | 1 + recipes/wip/security/sq/recipe.toml | 4 ++- 43 files changed, 146 insertions(+), 86 deletions(-) rename recipes/wip/games/fps/{assaultcube => acr}/recipe.toml (100%) delete mode 100644 recipes/wip/games/fps/openspades-free/recipe.toml diff --git a/recipes/wip/demos/ascii-rain/recipe.toml b/recipes/wip/demos/ascii-rain/recipe.toml index eb2757b23..90c36a65d 100644 --- a/recipes/wip/demos/ascii-rain/recipe.toml +++ b/recipes/wip/demos/ascii-rain/recipe.toml @@ -7,8 +7,8 @@ shallow_clone = true template = "custom" dependencies = ["ncursesw"] script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/rain.c" ./ mkdir -pv "${COOKBOOK_STAGE}/usr/bin" DYNAMIC_INIT "${COOKBOOK_CC}" rain.c -o "${COOKBOOK_STAGE}"/usr/bin/rain -lncurses -cp -rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/usr/bin" """ diff --git a/recipes/wip/games/engines/ioquake3/recipe.toml b/recipes/wip/games/engines/ioquake3/recipe.toml index 8872ae5ea..6370f3b41 100644 --- a/recipes/wip/games/engines/ioquake3/recipe.toml +++ b/recipes/wip/games/engines/ioquake3/recipe.toml @@ -1,8 +1,14 @@ #TODO missing script for "make", see https://github.com/ioquake/ioq3#compilation-and-installation [source] git = "https://github.com/ioquake/ioq3" +rev = "83a7762" +shallow_clone = true [build] -template = "custom" -dependencies = [ - "sdl2", +template = "cmake" +cmakeflags = [ + "-DBUILD_SERVER=OFF", + "-DUSE_VOIP=OFF", + "-DUSE_MUMBLE=OFF", + "-DUSE_INTERNAL_LIBS=OFF", ] +dependencies = ["sdl2"] diff --git a/recipes/wip/games/fps/assaultcube/recipe.toml b/recipes/wip/games/fps/acr/recipe.toml similarity index 100% rename from recipes/wip/games/fps/assaultcube/recipe.toml rename to recipes/wip/games/fps/acr/recipe.toml diff --git a/recipes/wip/games/fps/et-legacy/recipe.toml b/recipes/wip/games/fps/et-legacy/recipe.toml index ba6cd301a..49339943c 100644 --- a/recipes/wip/games/fps/et-legacy/recipe.toml +++ b/recipes/wip/games/fps/et-legacy/recipe.toml @@ -6,6 +6,11 @@ rev = "v2.83.2" shallow_clone = true [build] template = "cmake" +cmakeflags = [ + "-DBUILD_SERVER=OFF", + "-DBUILD_MOD=OFF", + "-DBUNDLED_LIBS=OFF", +] dependencies = [ "sdl2", "openssl3", diff --git a/recipes/wip/games/fps/openarena/recipe.toml b/recipes/wip/games/fps/openarena/recipe.toml index c1f423638..cb95dea34 100644 --- a/recipes/wip/games/fps/openarena/recipe.toml +++ b/recipes/wip/games/fps/openarena/recipe.toml @@ -1,4 +1,4 @@ -#TODO missing script for building, lacking build instructions +#TODO build and test #TODO what is game code? - http://files.poulsander.com/~poul19/public_files/oa/dev088/oa-0.8.8.tar.bz2 [source] tar = "http://files.poulsander.com/~poul19/public_files/oa/dev088/openarena-engine-source-0.8.8.tar.bz2" @@ -10,3 +10,9 @@ dependencies = [ "libvorbis", "mesa", ] +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/games/fps/openspades-free/recipe.toml b/recipes/wip/games/fps/openspades-free/recipe.toml deleted file mode 100644 index ea7476f6a..000000000 --- a/recipes/wip/games/fps/openspades-free/recipe.toml +++ /dev/null @@ -1,31 +0,0 @@ -#TODO not compiled or tested -# build instructions: https://github.com/yvt/openspades#on-unixes-from-source -[source] -git = "https://github.com/yvt/openspades" -shallow_clone = true -[build] -template = "custom" -dependencies = [ - "glew", - "openssl3", - "sdl2", - "sdl2-image", - "freealut", - "freetype2", - # "opus", - "opusfile", - "libjpeg", - "openal", - "curl", - "libxinerama", - "libxft", -] -script = """ -DYNAMIC_INIT -COOKBOOK_CMAKE_FLAGS+=( - -DOPENSPADES_NONFREE_RESOURCES=OFF -) -cookbook_cmake -wget https://github.com/DeathByDenim/openspades-free-pak/releases/download/latest/pak001-Free.pak \ -"${COOKBOOK_STAGE}"/usr/share/openspades/Resources -""" diff --git a/recipes/wip/games/fps/smokin-guns/recipe.toml b/recipes/wip/games/fps/smokin-guns/recipe.toml index 1ffe7447c..6239a1a74 100644 --- a/recipes/wip/games/fps/smokin-guns/recipe.toml +++ b/recipes/wip/games/fps/smokin-guns/recipe.toml @@ -1,7 +1,15 @@ -#TODO missing script for "make", see https://trac.smokin-guns.org/wiki/SmokinGuns/Building/linux -#TODO bundled with the ioquake3 engine? +#TODO build and test +# bundled with the ioquake3 engine? #TODO determine dependencies [source] git = "https://github.com/smokin-guns/SmokinGuns" +rev = "v1.1" +shallow_clone = true [build] template = "custom" +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/games/fps/xonotic/recipe.toml b/recipes/wip/games/fps/xonotic/recipe.toml index ee3584953..4f2ebf401 100644 --- a/recipes/wip/games/fps/xonotic/recipe.toml +++ b/recipes/wip/games/fps/xonotic/recipe.toml @@ -1,7 +1,7 @@ -#TODO missing script for "make", see https://gitlab.com/xonotic/xonotic/-/wikis/Compiling +#TODO build and test +# build instructions: https://gitlab.com/xonotic/xonotic/-/wikis/Compiling [source] -git = "https://gitlab.com/xonotic/xonotic" -rev = "0100f2c8d7947267292db66714c1af55039809ad" +tar = "https://gitlab.com/xonotic/xonotic/-/archive/xonotic-v0.8.6/xonotic-xonotic-v0.8.6.tar.bz2" [build] template = "custom" dependencies = [ @@ -15,3 +15,9 @@ dependencies = [ "curl", "rsync", ] +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/games/sim/egregoria/recipe.toml b/recipes/wip/games/sim/egregoria/recipe.toml index 13e33904d..9c2072b1c 100644 --- a/recipes/wip/games/sim/egregoria/recipe.toml +++ b/recipes/wip/games/sim/egregoria/recipe.toml @@ -1,8 +1,10 @@ #TODO winit crate error [source] git = "https://github.com/Uriopass/Egregoria" +shallow_clone = true [build] template = "custom" script = """ +DYNAMIC_INIT cookbook_cargo_packages native_app """ diff --git a/recipes/wip/games/sim/ferroliquid/recipe.toml b/recipes/wip/games/sim/ferroliquid/recipe.toml index 089e490d2..d7a962760 100644 --- a/recipes/wip/games/sim/ferroliquid/recipe.toml +++ b/recipes/wip/games/sim/ferroliquid/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO glutin crate error [source] git = "https://github.com/tneukom/ferroliquid" shallow_clone = true diff --git a/recipes/wip/games/sim/game-of-life-piston/recipe.toml b/recipes/wip/games/sim/game-of-life-piston/recipe.toml index 92552bf8f..3a6e43df6 100644 --- a/recipes/wip/games/sim/game-of-life-piston/recipe.toml +++ b/recipes/wip/games/sim/game-of-life-piston/recipe.toml @@ -1,5 +1,6 @@ #TODO outdated libc crate [source] git = "https://github.com/Arcterus/game-of-life" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/games/sim/game-of-life-rs/recipe.toml b/recipes/wip/games/sim/game-of-life-rs/recipe.toml index 45d14fcb9..99b2df158 100644 --- a/recipes/wip/games/sim/game-of-life-rs/recipe.toml +++ b/recipes/wip/games/sim/game-of-life-rs/recipe.toml @@ -1,5 +1,6 @@ #TODO compiled but not tested [source] git = "https://github.com/kachark/game-of-life-rs" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/games/sim/nbodysim/recipe.toml b/recipes/wip/games/sim/nbodysim/recipe.toml index 9914a961f..569574c20 100644 --- a/recipes/wip/games/sim/nbodysim/recipe.toml +++ b/recipes/wip/games/sim/nbodysim/recipe.toml @@ -1,10 +1,12 @@ #TODO outdated crates [source] git = "https://github.com/timokoesters/nbodysim" +shallow_clone = true [build] template = "custom" script = """ mkdir -pv "${COOKBOOK_STAGE}"/usr/share/nbodysim cp -rv "${COOKBOOK_SOURCE}"/examples/* "${COOKBOOK_STAGE}"/usr/share/nbodysim +DYNAMIC_INIT cookbook_cargo """ diff --git a/recipes/wip/games/sim/termfarm/recipe.toml b/recipes/wip/games/sim/termfarm/recipe.toml index 8d8b2448f..104f817e2 100644 --- a/recipes/wip/games/sim/termfarm/recipe.toml +++ b/recipes/wip/games/sim/termfarm/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO source code error [source] git = "https://github.com/indium114/termfarm" shallow_clone = true diff --git a/recipes/wip/games/space/endless-sky/recipe.toml b/recipes/wip/games/space/endless-sky/recipe.toml index de8798177..70bf5a1c0 100644 --- a/recipes/wip/games/space/endless-sky/recipe.toml +++ b/recipes/wip/games/space/endless-sky/recipe.toml @@ -1,8 +1,9 @@ -#TODO not compiled or tested +#TODO fix libmad dep # build instructions: https://github.com/endless-sky/endless-sky/blob/master/docs/readme-cmake.md#building-the-game [source] git = "https://github.com/endless-sky/endless-sky" -rev = "95e72950e1554392666fa41bb18c978868aa6611" +rev = "v0.11.2" +shallow_clone = true [build] template = "cmake" dependencies = [ diff --git a/recipes/wip/games/space/naev/recipe.toml b/recipes/wip/games/space/naev/recipe.toml index 994c24605..99946836f 100644 --- a/recipes/wip/games/space/naev/recipe.toml +++ b/recipes/wip/games/space/naev/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO fix openblas dep # build instructions: https://github.com/naev/naev/wiki/Compiling-on-*nix [source] tar = "https://github.com/naev/naev/releases/download/v0.10.6/naev-0.10.6-source.tar.xz" diff --git a/recipes/wip/games/strategy/0ad/recipe.toml b/recipes/wip/games/strategy/0ad/recipe.toml index dea0fc534..5d9a6d1ab 100644 --- a/recipes/wip/games/strategy/0ad/recipe.toml +++ b/recipes/wip/games/strategy/0ad/recipe.toml @@ -1,4 +1,4 @@ -#TODO Missing script for a make build system, see https://trac.wildfiregames.com/wiki/BuildInstructions#Linux +#TODO add script for gnu make: https://gitea.wildfiregames.com/0ad/0ad/wiki/BuildInstructions#linux #TODO The Atlas editor needs to be disabled with the build option "--disable-atlas" to avoid GTK3 dependency (WxWidgetsGTK) #TODO Maybe needs to run update-workspaces.sh before #TODO Require recipes for SpiderMonkey and libicu (Unicode) diff --git a/recipes/wip/games/strategy/brutal-chess/recipe.toml b/recipes/wip/games/strategy/brutal-chess/recipe.toml index a2e73f170..98fbebc52 100644 --- a/recipes/wip/games/strategy/brutal-chess/recipe.toml +++ b/recipes/wip/games/strategy/brutal-chess/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO can't recognize redox [source] tar = "https://sourceforge.net/projects/brutalchess/files/brutalchess-alpha/brutalchess-alpha-0.5.2/brutalchess-alpha-0.5.2-src.tar.gz/download" [build] diff --git a/recipes/wip/games/strategy/go-tui/recipe.toml b/recipes/wip/games/strategy/go-tui/recipe.toml index a0fb14361..3e6c25f47 100644 --- a/recipes/wip/games/strategy/go-tui/recipe.toml +++ b/recipes/wip/games/strategy/go-tui/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO compiled but not tested [source] git = "https://github.com/rs-jensen/go-game-tui" shallow_clone = true diff --git a/recipes/wip/games/strategy/hammurabi/recipe.toml b/recipes/wip/games/strategy/hammurabi/recipe.toml index 079b89bb7..96582b10f 100644 --- a/recipes/wip/games/strategy/hammurabi/recipe.toml +++ b/recipes/wip/games/strategy/hammurabi/recipe.toml @@ -1,5 +1,6 @@ #TODO compiled but not tested [source] git = "https://github.com/stjepangolemac/hammurabi" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/games/strategy/stockfish/recipe.toml b/recipes/wip/games/strategy/stockfish/recipe.toml index 61fc0a4ea..0c6ca09d3 100644 --- a/recipes/wip/games/strategy/stockfish/recipe.toml +++ b/recipes/wip/games/strategy/stockfish/recipe.toml @@ -1,6 +1,14 @@ -#TODO missing script for "make", see https://disservin.github.io/stockfish-docs/pages/Compiling-from-source.html +#TODO build and test +# build instructions: https://github.com/official-stockfish/Stockfish/wiki/Compiling-from-source [source] git = "https://github.com/official-stockfish/Stockfish" -rev = "68e1e9b3811e16cad014b590d7443b9063b3eb52" +rev = "sf_19" +shallow_clone = true [build] template = "custom" +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/src" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" build -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/libs/other/gpgme/recipe.toml b/recipes/wip/libs/other/gpgme/recipe.toml index acf6e5959..7f96ed3b2 100644 --- a/recipes/wip/libs/other/gpgme/recipe.toml +++ b/recipes/wip/libs/other/gpgme/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO can't find libgpg-error from libgcrypt dep [source] tar = "https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.20.0.tar.bz2" [build] diff --git a/recipes/wip/libs/other/libmad/recipe.toml b/recipes/wip/libs/other/libmad/recipe.toml index 2912e2f46..5e95edb84 100644 --- a/recipes/wip/libs/other/libmad/recipe.toml +++ b/recipes/wip/libs/other/libmad/recipe.toml @@ -1,4 +1,4 @@ -#TODO the redox target is not supported on the configure script +#TODO can't recognize redox [source] tar = "https://sourceforge.net/projects/mad/files/libmad/0.15.1b/libmad-0.15.1b.tar.gz/download" [build] diff --git a/recipes/wip/security/capstone/recipe.toml b/recipes/wip/security/capstone/recipe.toml index c0cef7518..01ef3bf57 100644 --- a/recipes/wip/security/capstone/recipe.toml +++ b/recipes/wip/security/capstone/recipe.toml @@ -1,6 +1,11 @@ -#TODO missing script for building, see https://github.com/capstone-engine/capstone/blob/next/COMPILE.TXT +#TODO build and test +# build instructions: https://github.com/capstone-engine/capstone/blob/next/BUILDING.md [source] git = "https://github.com/capstone-engine/capstone" -rev = "097c04d9413c59a58b00d4d1c8d5dc0ac158ffaa" +rev = "release-5.0.9" +shallow_clone = true [build] -template = "custom" +template = "cmake" +cmakeflags = [ + "-DCAPSTONE_ARCHITECTURE_DEFAULT=OFF", +] diff --git a/recipes/wip/security/clamav/recipe.toml b/recipes/wip/security/clamav/recipe.toml index d9a9a3bdb..aa37899c6 100644 --- a/recipes/wip/security/clamav/recipe.toml +++ b/recipes/wip/security/clamav/recipe.toml @@ -1,10 +1,16 @@ -#TODO not compiled or tested +#TODO try to disable libcheck? # build instructions: https://docs.clamav.net/manual/Installing/Installing-from-source-Unix.html -#TODO missing Sendmail Mail Filter API (Milter) [source] -tar = "https://www.clamav.net/downloads/production/clamav-1.5.0.tar.gz" +tar = "https://www.clamav.net/downloads/production/clamav-1.5.4.tar.gz" [build] -template = "custom" +template = "cmake" +cmakeflags = [ + "-DENABLE_MILTER_DEFAULT=OFF", + "-DENABLE_TESTS_DEFAULT=OFF", + "-DENABLE_MAN_PAGES_DEFAULT=OFF", + "-DENABLE_UNRAR_DEFAULT=OFF", + "-DENABLE_SYSTEMD_DEFAULT=OFF", +] dependencies = [ "curl", "ncursesw", @@ -15,8 +21,3 @@ dependencies = [ "libxml2", "zlib", ] -script = """ -DYNAMIC_INIT -export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include/ncurses" -cookbook_cmake -""" diff --git a/recipes/wip/security/cotp/recipe.toml b/recipes/wip/security/cotp/recipe.toml index 70abd2029..899d53402 100644 --- a/recipes/wip/security/cotp/recipe.toml +++ b/recipes/wip/security/cotp/recipe.toml @@ -1,12 +1,9 @@ -#TODO not compiled or tested +#TODO outdated nix crate? [source] git = "https://github.com/replydev/cotp" +shallow_clone = true [build] -template = "custom" +template = "cargo" dependencies = [ "libxkbcommon", ] -script = """ -DYNAMIC_INIT -cookbook_cargo -""" diff --git a/recipes/wip/security/fakeroot/recipe.toml b/recipes/wip/security/fakeroot/recipe.toml index 18352fb69..b1c4bafa1 100644 --- a/recipes/wip/security/fakeroot/recipe.toml +++ b/recipes/wip/security/fakeroot/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO configuration problem [source] git = "https://salsa.debian.org/clint/fakeroot" rev = "upstream/1.37.2" diff --git a/recipes/wip/security/hydra/recipe.toml b/recipes/wip/security/hydra/recipe.toml index b1d66d7eb..9438562f3 100644 --- a/recipes/wip/security/hydra/recipe.toml +++ b/recipes/wip/security/hydra/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO makefile can't be found [source] git = "https://github.com/vanhauser-thc/thc-hydra" rev = "v9.7" diff --git a/recipes/wip/security/john-the-ripper/recipe.toml b/recipes/wip/security/john-the-ripper/recipe.toml index 5dee8c601..c82160539 100644 --- a/recipes/wip/security/john-the-ripper/recipe.toml +++ b/recipes/wip/security/john-the-ripper/recipe.toml @@ -1,4 +1,5 @@ -#TODO missing script for GNU Autotools, see https://github.com/openwall/john/blob/bleeding-jumbo/doc/INSTALL +#TODO missing script for GNU Autotools, see +# build instructions: https://github.com/openwall/john/blob/bleeding-jumbo/doc/INSTALL [source] tar = "https://www.openwall.com/john/k/john-1.9.0-jumbo-1.tar.xz" [build] @@ -9,3 +10,9 @@ dependencies = [ "kerberos5", "libgmp", ] +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/src" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/security/openpgp-ca/recipe.toml b/recipes/wip/security/openpgp-ca/recipe.toml index 2bb2d3bde..f1cdbb956 100644 --- a/recipes/wip/security/openpgp-ca/recipe.toml +++ b/recipes/wip/security/openpgp-ca/recipe.toml @@ -1,9 +1,11 @@ #TODO make the libpcsclite dependency work [source] git = "https://gitlab.com/openpgp-ca/openpgp-ca" +shallow_clone = true [build] template = "custom" script = """ +DYNAMIC_INIT cookbook_cargo_packages openpgp-ca openpgp-ca-restd """ dependencies = [ diff --git a/recipes/wip/security/openvas/recipe.toml b/recipes/wip/security/openvas/recipe.toml index 686ee8b1c..5fe49fd59 100644 --- a/recipes/wip/security/openvas/recipe.toml +++ b/recipes/wip/security/openvas/recipe.toml @@ -1,3 +1,4 @@ +#TODO fix krb5 dep #TODO discover minimum dependencies from cmake log # build instructions: https://github.com/greenbone/openvas-scanner/blob/main/INSTALL.md [source] @@ -6,20 +7,20 @@ rev = "v23.45.6" shallow_clone = true [build] template = "cmake" -#dependencies = [ +dependencies = [ #"net-snmp", #"libpcap", - #"glib", - #"json-glib", + "glib", + "json-glib", #"libgcrypt", #"gpgme", #"redis", #"libssh", #"libksba", - #"gnutls", - #"curl", + "gnutls3", + "curl", #"libbsd", - #"krb5", + "krb5", #"gvm-libs", #"file", -#] +] diff --git a/recipes/wip/security/pass-tui/recipe.toml b/recipes/wip/security/pass-tui/recipe.toml index 5fc508e5b..38ca0edab 100644 --- a/recipes/wip/security/pass-tui/recipe.toml +++ b/recipes/wip/security/pass-tui/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO fix gpgme dep [source] git = "https://codeberg.org/frofor/pass-tui" shallow_clone = true diff --git a/recipes/wip/security/pass/recipe.toml b/recipes/wip/security/pass/recipe.toml index 95747375c..938ced1fe 100644 --- a/recipes/wip/security/pass/recipe.toml +++ b/recipes/wip/security/pass/recipe.toml @@ -1,6 +1,12 @@ -#TODO missing script for gnu make: https://git.zx2c4.com/password-store/tree/INSTALL +#TODO build and test #TODO determine compile-time and run-time dependencies: https://git.zx2c4.com/password-store/tree/README#n15 [source] tar = "https://git.zx2c4.com/password-store/snapshot/password-store-1.7.4.tar.xz" [build] template = "custom" +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/security/please/recipe.toml b/recipes/wip/security/please/recipe.toml index e681b3cce..456cafc90 100644 --- a/recipes/wip/security/please/recipe.toml +++ b/recipes/wip/security/please/recipe.toml @@ -1,5 +1,6 @@ #TODO users crate error (after cargo update) [source] git = "https://gitlab.com/edneville/please" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/security/plutus-rustus/recipe.toml b/recipes/wip/security/plutus-rustus/recipe.toml index 5df54054a..695c9aeb7 100644 --- a/recipes/wip/security/plutus-rustus/recipe.toml +++ b/recipes/wip/security/plutus-rustus/recipe.toml @@ -1,5 +1,6 @@ #TODO Not compiled or tested [source] git = "https://github.com/a137x/plutus-rustus" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/security/rage/recipe.toml b/recipes/wip/security/rage/recipe.toml index 54f1fc033..cbe679547 100644 --- a/recipes/wip/security/rage/recipe.toml +++ b/recipes/wip/security/rage/recipe.toml @@ -1,8 +1,10 @@ #TODO compiled but not tested [source] git = "https://github.com/str4d/rage" +shallow_clone = true [build] template = "custom" script = """ +DYNAMIC_INIT cookbook_cargo_packages rage """ diff --git a/recipes/wip/security/retdec/recipe.toml b/recipes/wip/security/retdec/recipe.toml index ff74a4097..0593591ca 100644 --- a/recipes/wip/security/retdec/recipe.toml +++ b/recipes/wip/security/retdec/recipe.toml @@ -2,10 +2,16 @@ # build instructions: https://github.com/avast/retdec#process [source] git = "https://github.com/avast/retdec" -rev = "53e55b4b26e9b843787f0e06d867441e32b1604e" +rev = "9450585" +shallow_clone = true [build] template = "cmake" +cmakeflags = [ + "-DRETDEC_USE_SYSTEM_CAPSTONE=ON", + "-DRETDEC_ENABLE_ALL=OFF", +] dependencies = [ "openssl3", "zlib", + "capstone", ] diff --git a/recipes/wip/security/rowhammer-test/recipe.toml b/recipes/wip/security/rowhammer-test/recipe.toml index 3b859b959..151e7c767 100644 --- a/recipes/wip/security/rowhammer-test/recipe.toml +++ b/recipes/wip/security/rowhammer-test/recipe.toml @@ -1,5 +1,14 @@ -#TODO missing script for the "make.sh" file, see https://github.com/google/rowhammer-test#readme +#TODO build and test +# build script: https://github.com/google/rowhammer-test/blob/master/make.sh [source] git = "https://github.com/google/rowhammer-test" +rev = "c1d2bd9" +shallow_clone = true [build] template = "custom" +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/rowhammer_test.cc" ./ +mkdir -pv "${COOKBOOK_STAGE}/usr/bin" +DYNAMIC_INIT +"${COOKBOOK_CXX}" rowhammer_test.cc -o "${COOKBOOK_STAGE}"/usr/bin/rowhammer-test -g -Wall -Werror -O2 +""" diff --git a/recipes/wip/security/rshijack/recipe.toml b/recipes/wip/security/rshijack/recipe.toml index 3feeee34f..f751e2155 100644 --- a/recipes/wip/security/rshijack/recipe.toml +++ b/recipes/wip/security/rshijack/recipe.toml @@ -1,5 +1,6 @@ #TODO pnet_sys crate error (after cargo update) [source] git = "https://github.com/kpcyrd/rshijack" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/security/rustyvault/recipe.toml b/recipes/wip/security/rustyvault/recipe.toml index 175875b8a..14483d082 100644 --- a/recipes/wip/security/rustyvault/recipe.toml +++ b/recipes/wip/security/rustyvault/recipe.toml @@ -1,6 +1,7 @@ #TODO async-io and rustix crates error [source] git = "https://github.com/Tongsuo-Project/RustyVault" +shallow_clone = true [build] template = "cargo" dependencies = [ diff --git a/recipes/wip/security/sn0int/recipe.toml b/recipes/wip/security/sn0int/recipe.toml index 39292b7eb..67fc306b6 100644 --- a/recipes/wip/security/sn0int/recipe.toml +++ b/recipes/wip/security/sn0int/recipe.toml @@ -1,6 +1,7 @@ #TODO outdated redox_syscall crate [source] git = "https://github.com/kpcyrd/sn0int" +shallow_clone = true [build] template = "cargo" dependencies = [ diff --git a/recipes/wip/security/sniffglue/recipe.toml b/recipes/wip/security/sniffglue/recipe.toml index 9972734ee..51447ff30 100644 --- a/recipes/wip/security/sniffglue/recipe.toml +++ b/recipes/wip/security/sniffglue/recipe.toml @@ -1,6 +1,7 @@ #TODO make the libpcap dependency work [source] git = "https://github.com/kpcyrd/sniffglue" +shallow_clone = true [build] template = "cargo" dependencies = [ diff --git a/recipes/wip/security/sq/recipe.toml b/recipes/wip/security/sq/recipe.toml index db8fd5eb8..beb33b631 100644 --- a/recipes/wip/security/sq/recipe.toml +++ b/recipes/wip/security/sq/recipe.toml @@ -1,8 +1,10 @@ -#TODO make libnettle work +#TODO nettle-sys crate error [source] git = "https://gitlab.com/sequoia-pgp/sequoia-sq" +shallow_clone = true [build] template = "cargo" +cargopackages = ["sequoia-sq"] dependencies = [ "openssl3", "libnettle", From 71a87aa750de5aef529eb3bc376eed38c5c2a086 Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Thu, 8 Oct 2026 22:11:06 +0000 Subject: [PATCH 32/63] Apply 1 suggestion(s) to 1 file(s) --- recipes/wip/libs/other/libfyaml/recipe.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/wip/libs/other/libfyaml/recipe.toml b/recipes/wip/libs/other/libfyaml/recipe.toml index 69d32b071..c22b729fc 100644 --- a/recipes/wip/libs/other/libfyaml/recipe.toml +++ b/recipes/wip/libs/other/libfyaml/recipe.toml @@ -1,6 +1,9 @@ [source] tar = "https://github.com/pantoniou/libfyaml/releases/download/v0.9.6/libfyaml-0.9.6.tar.gz" +patches = [ + "redox.patch" +] [build] template = "cmake" From 45dc9463fb5393b8c187f1f129775925618cf863 Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Fri, 9 Oct 2026 11:25:12 +0000 Subject: [PATCH 33/63] Apply 1 suggestion(s) to 1 file(s) --- recipes/wip/gnome/gimp/gimp.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/wip/gnome/gimp/gimp.sh b/recipes/wip/gnome/gimp/gimp.sh index 25b63a60f..28158e359 100755 --- a/recipes/wip/gnome/gimp/gimp.sh +++ b/recipes/wip/gnome/gimp/gimp.sh @@ -6,6 +6,7 @@ export GDK_PIXBUF_MODULE_FILE="$HOME/.cache/gimp-gdk-pixbuf-loaders.cache" if [ ! -f "$GDK_PIXBUF_MODULE_FILE" ]; then echo "Generating GdkPixbuf loaders cache..." + mkdir -p "$HOME/.cache" gdk-pixbuf-query-loaders > "$GDK_PIXBUF_MODULE_FILE" fi From 5add974b8630fc2db02ad7743c8b05185fdd9e39 Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Fri, 9 Oct 2026 11:26:59 +0000 Subject: [PATCH 34/63] Apply 1 suggestion(s) to 1 file(s) --- recipes/wip/libs/gnome/gegl/recipe.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes/wip/libs/gnome/gegl/recipe.toml b/recipes/wip/libs/gnome/gegl/recipe.toml index 51b101218..0df9c929c 100644 --- a/recipes/wip/libs/gnome/gegl/recipe.toml +++ b/recipes/wip/libs/gnome/gegl/recipe.toml @@ -2,6 +2,10 @@ # build instructions: https://gitlab.gnome.org/GNOME/gegl/-/blob/master/docs/development.adoc?ref_type=heads#user-content-debugging [source] tar = "https://download.gimp.org/pub/gegl/0.4/gegl-0.4.72.tar.xz" +patches = [ + "redox.patch" +] + [build] template = "custom" mesonflags = [ From 6921e5bb67c9d825027638819fbe066ad527c114 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Sat, 10 Oct 2026 12:54:44 -0300 Subject: [PATCH 35/63] Fix and update many recipes --- recipes/wip/image/converters/dipc/recipe.toml | 3 ++- .../wip/image/converters/icy-sixel/recipe.toml | 10 +++++++--- recipes/wip/image/editors/inkscape/recipe.toml | 17 +++++++++-------- .../image/editors/photo-editor-rs/recipe.toml | 2 +- recipes/wip/image/editors/svguru/recipe.toml | 2 +- .../wip/image/editors/watermarker/recipe.toml | 1 + .../wip/image/upscaling/rscale2x/recipe.toml | 1 + .../wip/image/upscaling/upscaler-rs/recipe.toml | 1 + .../image/upscaling/upscayl-ncnn/recipe.toml | 3 +-- recipes/wip/image/upscaling/video2x/recipe.toml | 1 + recipes/wip/image/viewers/sdl-img/recipe.toml | 3 ++- recipes/wip/image/viewers/svgtail/recipe.toml | 2 +- recipes/wip/libs/other/libgsl/recipe.toml | 3 ++- recipes/wip/math/bcal/recipe.toml | 9 ++++++++- .../wip/math/cosmic-ext-calculator/recipe.toml | 9 ++++++--- recipes/wip/math/fend/recipe.toml | 2 +- recipes/wip/math/fractal-explorer/recipe.toml | 3 ++- recipes/wip/math/gnumeric/recipe.toml | 7 ++++++- recipes/wip/math/grace/recipe.toml | 1 + recipes/wip/math/kalc/recipe.toml | 1 + recipes/wip/math/kalker/recipe.toml | 9 ++++----- recipes/wip/math/numbat/recipe.toml | 8 +++----- recipes/wip/math/numr/recipe.toml | 12 +++++++----- recipes/wip/math/octave/recipe.toml | 2 +- recipes/wip/math/primesieve/recipe.toml | 5 +++-- recipes/wip/math/qalculate-gtk/recipe.toml | 2 +- recipes/wip/math/ratex/recipe.toml | 7 ++++--- recipes/wip/math/rink/recipe.toml | 9 ++++----- recipes/wip/math/scilab/recipe.toml | 2 +- recipes/wip/term/zellij/recipe.toml | 3 ++- 30 files changed, 85 insertions(+), 55 deletions(-) diff --git a/recipes/wip/image/converters/dipc/recipe.toml b/recipes/wip/image/converters/dipc/recipe.toml index a4bdfb619..b21b21ac8 100644 --- a/recipes/wip/image/converters/dipc/recipe.toml +++ b/recipes/wip/image/converters/dipc/recipe.toml @@ -1,5 +1,6 @@ -#TODO not compiled or tested +#TODO compiled but untested [source] git = "https://github.com/doprz/dipc" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/image/converters/icy-sixel/recipe.toml b/recipes/wip/image/converters/icy-sixel/recipe.toml index 10e02eed8..fb3e526ab 100644 --- a/recipes/wip/image/converters/icy-sixel/recipe.toml +++ b/recipes/wip/image/converters/icy-sixel/recipe.toml @@ -1,7 +1,11 @@ -#TODO not compiled or tested +#TODO compiled but untested +#TODO need a command to copy the executable [source] git = "https://github.com/mkrueger/icy_sixel" shallow_clone = true [build] -template = "cargo" -cargopackages = ["icy_sixel-cli"] +template = "custom" +script = """ +DYNAMIC_INIT +cookbook_cargo_packages icy_sixel-cli +""" diff --git a/recipes/wip/image/editors/inkscape/recipe.toml b/recipes/wip/image/editors/inkscape/recipe.toml index 8c102dbe1..b183070fb 100644 --- a/recipes/wip/image/editors/inkscape/recipe.toml +++ b/recipes/wip/image/editors/inkscape/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO fix libgc dep #TODO discover minimum dependencies from cmake log # build instructions: https://inkscape.org/develop/getting-started/#compile # build options: https://gitlab.com/inkscape/inkscape/-/blob/master/CMakeLists.txt?ref_type=heads#L87 @@ -21,7 +21,7 @@ cmakeflags = [ "-DWITH_GSOURCEVIEW=OFF", "-DWITH_NLS=OFF", ] -# dependencies = [ +dependencies = [ # "boost", # "glib", # "glibmm", @@ -31,17 +31,17 @@ cmakeflags = [ # "gtksourceview", # "cairo", # "cairomm", -# "pango", + "pango", # "pangomm", # "readline", -# "fontconfig", + "fontconfig", # "freetype2", # "imagemagick", # "potrace", # "zlib", # "lib2geom", # "atkmm", -# "harfbuzz", + "harfbuzz", # "libblas", # "libsoup", # "libsigc++", @@ -53,9 +53,10 @@ cmakeflags = [ # "libxml2", # "libxslt", # "libcdr", -# "libgsl", + "libgsl", + "libgc", # "libgspell-gtk3", # "libjpeg", -# "liblcms", + "liblcms", # "liblapack", -# ] + ] diff --git a/recipes/wip/image/editors/photo-editor-rs/recipe.toml b/recipes/wip/image/editors/photo-editor-rs/recipe.toml index 13c24b2a2..e653ada29 100644 --- a/recipes/wip/image/editors/photo-editor-rs/recipe.toml +++ b/recipes/wip/image/editors/photo-editor-rs/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO compiled but untested [source] git = "https://codeberg.org/oscfri/photo-editor" shallow_clone = true diff --git a/recipes/wip/image/editors/svguru/recipe.toml b/recipes/wip/image/editors/svguru/recipe.toml index 7af000aaa..5276e155d 100644 --- a/recipes/wip/image/editors/svguru/recipe.toml +++ b/recipes/wip/image/editors/svguru/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO glutin crate error [source] git = "https://github.com/4383/svguru" shallow_clone = true diff --git a/recipes/wip/image/editors/watermarker/recipe.toml b/recipes/wip/image/editors/watermarker/recipe.toml index fcfd2ab74..28a3d62ec 100644 --- a/recipes/wip/image/editors/watermarker/recipe.toml +++ b/recipes/wip/image/editors/watermarker/recipe.toml @@ -1,5 +1,6 @@ #TODO compiled but not tested [source] git = "https://github.com/xomvio/watermarker" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/image/upscaling/rscale2x/recipe.toml b/recipes/wip/image/upscaling/rscale2x/recipe.toml index 769df6d50..061c9b6bf 100644 --- a/recipes/wip/image/upscaling/rscale2x/recipe.toml +++ b/recipes/wip/image/upscaling/rscale2x/recipe.toml @@ -1,5 +1,6 @@ #TODO compiled but not tested (after cargo update) [source] git = "https://github.com/ahmetmutlugun/rscale2x" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/image/upscaling/upscaler-rs/recipe.toml b/recipes/wip/image/upscaling/upscaler-rs/recipe.toml index ecb4e7aa5..0b771833b 100644 --- a/recipes/wip/image/upscaling/upscaler-rs/recipe.toml +++ b/recipes/wip/image/upscaling/upscaler-rs/recipe.toml @@ -1,5 +1,6 @@ #TODO compiled but not tested (after cargo update) [source] git = "https://github.com/DhruvDh/upscaler" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/image/upscaling/upscayl-ncnn/recipe.toml b/recipes/wip/image/upscaling/upscayl-ncnn/recipe.toml index 1955bff3d..5a3744698 100644 --- a/recipes/wip/image/upscaling/upscayl-ncnn/recipe.toml +++ b/recipes/wip/image/upscaling/upscayl-ncnn/recipe.toml @@ -10,7 +10,6 @@ dependencies = [ "openmp", ] script = """ -COOKBOOK_SOURCE="${COOKBOOK_SOURCE}/src" DYNAMIC_INIT -cookbook_cmake +cookbook_cmake "${COOKBOOK_SOURCE}"/src """ diff --git a/recipes/wip/image/upscaling/video2x/recipe.toml b/recipes/wip/image/upscaling/video2x/recipe.toml index a591bee56..4f4a5b8d9 100644 --- a/recipes/wip/image/upscaling/video2x/recipe.toml +++ b/recipes/wip/image/upscaling/video2x/recipe.toml @@ -1,6 +1,7 @@ #TODO maybe incomplete script [source] git = "https://github.com/k4yt3x/video2x" +shallow_clone = true [build] template = "custom" script = """ diff --git a/recipes/wip/image/viewers/sdl-img/recipe.toml b/recipes/wip/image/viewers/sdl-img/recipe.toml index 88c26b957..cc704cae4 100644 --- a/recipes/wip/image/viewers/sdl-img/recipe.toml +++ b/recipes/wip/image/viewers/sdl-img/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO can't find SDL.h [source] git = "https://github.com/rswinkle/sdl_img" rev = "0.101.0" @@ -7,6 +7,7 @@ shallow_clone = true template = "custom" dependencies = [ "sdl2", + "curl", ] script = """ rsync -av --delete "${COOKBOOK_SOURCE}/" ./ diff --git a/recipes/wip/image/viewers/svgtail/recipe.toml b/recipes/wip/image/viewers/svgtail/recipe.toml index 0fc6b8acd..b9bf57434 100644 --- a/recipes/wip/image/viewers/svgtail/recipe.toml +++ b/recipes/wip/image/viewers/svgtail/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO minifb crate error [source] git = "https://github.com/statusfailed/svgtail" shallow_clone = true diff --git a/recipes/wip/libs/other/libgsl/recipe.toml b/recipes/wip/libs/other/libgsl/recipe.toml index 2fdf67a3c..f582f4efd 100644 --- a/recipes/wip/libs/other/libgsl/recipe.toml +++ b/recipes/wip/libs/other/libgsl/recipe.toml @@ -1,5 +1,6 @@ -#TODO can't recognize Redox target +#TODO compiled but untested [source] tar = "https://ftp.gnu.org/gnu/gsl/gsl-2.7.1.tar.gz" +script = "GNU_CONFIG_GET config.sub" [build] template = "configure" diff --git a/recipes/wip/math/bcal/recipe.toml b/recipes/wip/math/bcal/recipe.toml index f4a95690f..13a214b51 100644 --- a/recipes/wip/math/bcal/recipe.toml +++ b/recipes/wip/math/bcal/recipe.toml @@ -1,4 +1,5 @@ -#TODO missing script for gnu make +#TODO build and test +#TODO does binary strip target is needed? # build instructions: https://github.com/jarun/bcal#installation [source] tar = "https://github.com/jarun/bcal/releases/download/v2.5/bcal-v2.5.tar.gz" @@ -7,3 +8,9 @@ template = "custom" dependencies = [ "readline", ] +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/math/cosmic-ext-calculator/recipe.toml b/recipes/wip/math/cosmic-ext-calculator/recipe.toml index 5dbbcf4c0..4e068a3a1 100644 --- a/recipes/wip/math/cosmic-ext-calculator/recipe.toml +++ b/recipes/wip/math/cosmic-ext-calculator/recipe.toml @@ -1,15 +1,18 @@ -#TODO not compiled or tested -#TODO verify if the desktop shortcut and icon configuration is correct +#TODO compiled but untested +#TODO fix configuration commands [source] git = "https://github.com/cosmic-utils/calculator" +shallow_clone = true [build] template = "custom" +dependencies = ["libxkbcommon"] script = """ +DYNAMIC_INIT +cookbook_cargo mkdir -pv "${COOKBOOK_STAGE}"/usr/share/applications mkdir -pv "${COOKBOOK_STAGE}"/usr/share/metainfo mkdir -pv "${COOKBOOK_STAGE}"/usr/share/icons/hicolor/scalable/apps cp -rv "${COOKBOOK_SOURCE}"/res/app.desktop "${COOKBOOK_STAGE}"/usr/share/applications/dev.edfloreshz.Calculator.desktop cp -rv "${COOKBOOK_SOURCE}"/res/metainfo.xml "${COOKBOOK_STAGE}"/usr/share/metainfo/dev.edfloreshz.Calculator.metainfo.xml cp -rv "${COOKBOOK_SOURCE}"/res/icons/hicolor/scalable/apps/icon.svg "${COOKBOOK_STAGE}"/usr/share/icons/hicolor/scalable/apps/dev.edfloreshz.Calculator.svg -cookbook_cargo """ diff --git a/recipes/wip/math/fend/recipe.toml b/recipes/wip/math/fend/recipe.toml index 9916c11bc..911beb753 100644 --- a/recipes/wip/math/fend/recipe.toml +++ b/recipes/wip/math/fend/recipe.toml @@ -1,7 +1,7 @@ #TODO compiled but not tested [source] git = "https://github.com/printfn/fend" - +shallow_clone = true [build] dependencies = [ "openssl3", diff --git a/recipes/wip/math/fractal-explorer/recipe.toml b/recipes/wip/math/fractal-explorer/recipe.toml index 7ea0cbfb9..863a2e4d9 100644 --- a/recipes/wip/math/fractal-explorer/recipe.toml +++ b/recipes/wip/math/fractal-explorer/recipe.toml @@ -1,5 +1,6 @@ -#TODO not compiled or tested +#TODO wayland-backend crate error [source] git = "https://github.com/boclair/fractal-explorer" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/math/gnumeric/recipe.toml b/recipes/wip/math/gnumeric/recipe.toml index 35aa3e546..ef29ef743 100644 --- a/recipes/wip/math/gnumeric/recipe.toml +++ b/recipes/wip/math/gnumeric/recipe.toml @@ -1,6 +1,11 @@ -#TODO not compiled or tested +#TODO missing dependencies #TODO discover minimum dependencies from configure log [source] tar = "https://download.gnome.org/sources/gnumeric/1.12/gnumeric-1.12.61.tar.xz" [build] template = "configure" +dependencies = [ + "zlib", + "gtk3", + "libxml2", +] diff --git a/recipes/wip/math/grace/recipe.toml b/recipes/wip/math/grace/recipe.toml index ef5f1627b..768dec042 100644 --- a/recipes/wip/math/grace/recipe.toml +++ b/recipes/wip/math/grace/recipe.toml @@ -1,3 +1,4 @@ +#TODO can't recognize redox #TODO determine minimum dependencies from configure log # build instructions: https://plasma-gate.weizmann.ac.il/Grace/doc/UsersGuide.html#ss2.1 [source] diff --git a/recipes/wip/math/kalc/recipe.toml b/recipes/wip/math/kalc/recipe.toml index 6217dc976..ab9858e6b 100644 --- a/recipes/wip/math/kalc/recipe.toml +++ b/recipes/wip/math/kalc/recipe.toml @@ -1,5 +1,6 @@ #TODO gmp-mpfr-sys crate error [source] git = "https://github.com/bgkillas/kalc" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/math/kalker/recipe.toml b/recipes/wip/math/kalker/recipe.toml index 242c9ccd6..f9229a957 100644 --- a/recipes/wip/math/kalker/recipe.toml +++ b/recipes/wip/math/kalker/recipe.toml @@ -1,13 +1,12 @@ -#TODO gmp-mpfr-sys crate error (after cargo update) +#TODO gmp-mpfr-sys crate error: redox unsupported [source] git = "https://github.com/PaddiM8/kalker" +shallow_clone = true [build] -template = "custom" +template = "cargo" +cargopackages = ["kalker"] dependencies = [ "libgmp", "libmpfr", "mpc", ] -script = """ -cookbook_cargo_packages kalker -""" diff --git a/recipes/wip/math/numbat/recipe.toml b/recipes/wip/math/numbat/recipe.toml index 9b5ee67e4..1958795ad 100644 --- a/recipes/wip/math/numbat/recipe.toml +++ b/recipes/wip/math/numbat/recipe.toml @@ -1,9 +1,7 @@ #TODO compiled but not tested -#TODO missing script to properly move the binary [source] git = "https://github.com/sharkdp/numbat" +shallow_clone = true [build] -template = "custom" -script = """ -cookbook_cargo_packages numbat-cli -""" +template = "cargo" +cargopackages = ["numbat-cli"] diff --git a/recipes/wip/math/numr/recipe.toml b/recipes/wip/math/numr/recipe.toml index 083b509d4..da2378dac 100644 --- a/recipes/wip/math/numr/recipe.toml +++ b/recipes/wip/math/numr/recipe.toml @@ -1,8 +1,10 @@ -#TODO not compiled or tested +#TODO atomic-write-file and nix crates error [source] git = "https://github.com/nasedkinpv/numr" +shallow_clone = true [build] -template = "custom" -script = """ -cookbook_cargo_packages numr-cli numr-tui -""" +template = "cargo" +cargopackages = [ + "numr-cli", + "numr-tui", +] diff --git a/recipes/wip/math/octave/recipe.toml b/recipes/wip/math/octave/recipe.toml index b202e3d11..884218b3f 100644 --- a/recipes/wip/math/octave/recipe.toml +++ b/recipes/wip/math/octave/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO enable gcc fortran frontend #TODO discover minimum dependencies from configure log [source] tar = "https://ftp.gnu.org/gnu/octave/octave-11.1.0.tar.lz" diff --git a/recipes/wip/math/primesieve/recipe.toml b/recipes/wip/math/primesieve/recipe.toml index 75b9866d3..7e93feda0 100644 --- a/recipes/wip/math/primesieve/recipe.toml +++ b/recipes/wip/math/primesieve/recipe.toml @@ -1,7 +1,8 @@ -#TODO not compiled or tested +#TODO compiled but untested # build instructions: https://github.com/kimwalisch/primesieve/blob/master/doc/BUILD.md [source] git = "https://github.com/kimwalisch/primesieve" -rev = "f3114488ddded8edf2c201e31ad308ed9e6a9f78" +rev = "v12.16" +shallow_clone = true [build] template = "cmake" diff --git a/recipes/wip/math/qalculate-gtk/recipe.toml b/recipes/wip/math/qalculate-gtk/recipe.toml index b46413b9a..c0c28aca2 100644 --- a/recipes/wip/math/qalculate-gtk/recipe.toml +++ b/recipes/wip/math/qalculate-gtk/recipe.toml @@ -1,4 +1,4 @@ -#TODO make gtk3 work +#TODO build error [source] tar = "https://github.com/Qalculate/qalculate-gtk/releases/download/v4.9.0/qalculate-gtk-4.9.0.tar.gz" [build] diff --git a/recipes/wip/math/ratex/recipe.toml b/recipes/wip/math/ratex/recipe.toml index ca8d40a07..eae7e5b4e 100644 --- a/recipes/wip/math/ratex/recipe.toml +++ b/recipes/wip/math/ratex/recipe.toml @@ -1,12 +1,13 @@ -#TODO compile and test +#TODO compiled but untested +#TODO add script for installation [source] git = "https://github.com/erweixin/RaTeX" shallow_clone = true [build] template = "cargo" cargopackages = [ - "ratex-render", + #"ratex-render", "ratex-pdf", "ratex-svg", ] -cargoflags = ["--features cli embed-fonts"] +cargoflags = ["--features=cli,embed-fonts"] diff --git a/recipes/wip/math/rink/recipe.toml b/recipes/wip/math/rink/recipe.toml index 7379c8cf1..1504f42f0 100644 --- a/recipes/wip/math/rink/recipe.toml +++ b/recipes/wip/math/rink/recipe.toml @@ -1,11 +1,10 @@ -#TODO async-io and rustix crates error +#TODO compiled but untested [source] git = "https://github.com/tiffany352/rink-rs" +shallow_clone = true [build] -template = "custom" +template = "cargo" +cargopackages = ["rink"] dependencies = [ "openssl3", ] -script = """ -cookbook_cargo_packages rink -""" diff --git a/recipes/wip/math/scilab/recipe.toml b/recipes/wip/math/scilab/recipe.toml index 60ba7f3d9..239ee1420 100644 --- a/recipes/wip/math/scilab/recipe.toml +++ b/recipes/wip/math/scilab/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO fix source path in script #TODO discover minimum dependencies from configure log [source] tar = "https://gitlab.com/scilab/scilab/-/archive/2026.0.1/scilab-2026.0.1.tar.bz2" diff --git a/recipes/wip/term/zellij/recipe.toml b/recipes/wip/term/zellij/recipe.toml index ead436fc7..db3070f38 100644 --- a/recipes/wip/term/zellij/recipe.toml +++ b/recipes/wip/term/zellij/recipe.toml @@ -1,5 +1,6 @@ -#TODO openssl-sys crate error (after cargo update) +#TODO fs-set-times crate error [source] git = "https://github.com/zellij-org/zellij" +shallow_clone = true [build] template = "cargo" From 66edc7a917340b56d44d9d69a1c711a18cb4e708 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Sun, 11 Oct 2026 05:21:15 -0300 Subject: [PATCH 36/63] Add zonetimeline recipe --- recipes/wip/time/zonetimeline/recipe.toml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 recipes/wip/time/zonetimeline/recipe.toml diff --git a/recipes/wip/time/zonetimeline/recipe.toml b/recipes/wip/time/zonetimeline/recipe.toml new file mode 100644 index 000000000..da46a0530 --- /dev/null +++ b/recipes/wip/time/zonetimeline/recipe.toml @@ -0,0 +1,6 @@ +#TODO compile and test +[source] +git = "https://github.com/findyourexit/zonetimeline-tui" +shallow_clone = true +[build] +template = "cargo" From 21008dcf211bd0ede539cdb098e5ad6eefde6d7e Mon Sep 17 00:00:00 2001 From: Ribbon Date: Sun, 11 Oct 2026 13:06:09 -0300 Subject: [PATCH 37/63] Fix and update many more recipes --- recipes/wip/games/fps/acr/recipe.toml | 16 ++++++++---- .../wip/games/fps/betterspades/recipe.toml | 2 ++ .../games/math/cosmic-ext-2048/recipe.toml | 5 ++-- recipes/wip/games/math/t4kcommon/recipe.toml | 8 ++++-- recipes/wip/games/math/tuxmath/recipe.toml | 3 ++- recipes/wip/games/music/oshu/recipe.toml | 2 +- .../music/performous-composer/recipe.toml | 10 -------- .../games/open-world/asciicker/recipe.toml | 25 ++++++++++++++----- .../wip/games/open-world/leafish/recipe.toml | 3 ++- .../wip/games/open-world/teloren/recipe.toml | 1 + .../games/platform/dinorunner-sdl/recipe.toml | 2 +- recipes/wip/games/rpg/kingslayer/recipe.toml | 1 + .../wip/games/servers/cuberite/recipe.toml | 4 ++- recipes/wip/games/space/osirion/recipe.toml | 2 +- recipes/wip/games/space/outfly/recipe.toml | 3 ++- .../games/space/rebels-in-the-sky/recipe.toml | 3 ++- recipes/wip/games/space/rust-belt/recipe.toml | 2 +- recipes/wip/libs/fs/physicsfs/recipe.toml | 2 +- .../gnome/gobject-introspection/recipe.toml | 1 + recipes/wip/libs/other/bullet/recipe.toml | 2 +- recipes/wip/libs/other/sdl-pango/recipe.toml | 4 ++- recipes/wip/math/scilab/recipe.toml | 2 +- recipes/wip/security/sqop/recipe.toml | 3 ++- recipes/wip/security/sqv/recipe.toml | 3 ++- recipes/wip/security/stegano/recipe.toml | 7 +++--- recipes/wip/security/sudo-rs/recipe.toml | 3 +-- recipes/wip/security/threatdeck/recipe.toml | 3 ++- recipes/wip/security/tiger/recipe.toml | 2 +- recipes/wip/security/tyr/recipe.toml | 2 ++ recipes/wip/security/vagga/recipe.toml | 3 ++- recipes/wip/security/veldora/recipe.toml | 1 + recipes/wip/security/weggli/recipe.toml | 3 ++- recipes/wip/security/whyno/recipe.toml | 3 ++- recipes/wip/security/yara-x/recipe.toml | 7 +++--- recipes/wip/security/zabbix-lts/recipe.toml | 2 +- recipes/wip/services/ala-lape/recipe.toml | 3 ++- recipes/wip/services/busd/recipe.toml | 2 +- recipes/wip/services/chrony/recipe.toml | 2 +- recipes/wip/services/colord/recipe.toml | 9 +++++-- recipes/wip/services/hickory-dns/recipe.toml | 21 +++++----------- recipes/wip/services/lemurs/recipe.toml | 3 ++- recipes/wip/services/limine/recipe.toml | 2 +- .../wip/services/networkmanager/recipe.toml | 9 ++++--- recipes/wip/services/ntpd-rs/recipe.toml | 2 +- recipes/wip/services/pipewire/recipe.toml | 6 +++-- recipes/wip/services/runst/recipe.toml | 2 +- recipes/wip/services/seatd/recipe.toml | 2 +- recipes/wip/services/wireguard-rs/recipe.toml | 2 +- .../wip/services/wireguard-tools/recipe.toml | 9 ++++++- recipes/wip/services/wireplumber/recipe.toml | 6 ++++- recipes/wip/sound/libpulse/recipe.toml | 6 ++--- recipes/wip/vm/qemu/recipe.toml | 3 ++- recipes/wip/wayland/gamescope-sdl/recipe.toml | 4 +++ recipes/wip/wayland/wev/recipe.toml | 4 +-- 54 files changed, 146 insertions(+), 96 deletions(-) delete mode 100644 recipes/wip/games/music/performous-composer/recipe.toml diff --git a/recipes/wip/games/fps/acr/recipe.toml b/recipes/wip/games/fps/acr/recipe.toml index 1d3ecbc04..ccd4ec1dc 100644 --- a/recipes/wip/games/fps/acr/recipe.toml +++ b/recipes/wip/games/fps/acr/recipe.toml @@ -1,10 +1,10 @@ -#TODO missing script for gnu make -# build instructions: https://wiki.cubers.net/action/view/Linux_Support#Compiling_AssaultCube +#TODO build and test [source] -git = "https://github.com/assaultcube/AC" -rev = "v1.3.0.2" +git = "https://github.com/acreloaded/acr" +rev = "v2.18.3" +shallow_clone = true [build] -template = "configure" +template = "custom" dependencies = [ "sdl1", "sdl1-image", @@ -14,3 +14,9 @@ dependencies = [ "curl", "libvorbis", ] +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/source/src" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" client -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" client_install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/games/fps/betterspades/recipe.toml b/recipes/wip/games/fps/betterspades/recipe.toml index d7ed6d1c0..fb3a40438 100644 --- a/recipes/wip/games/fps/betterspades/recipe.toml +++ b/recipes/wip/games/fps/betterspades/recipe.toml @@ -3,6 +3,8 @@ # build instructions: https://github.com/xtreme8000/BetterSpades#linux [source] git = "https://github.com/xtreme8000/BetterSpades" +rev = "v0.1.5" +shallow_clone = true [build] template = "cmake" dependencies = [ diff --git a/recipes/wip/games/math/cosmic-ext-2048/recipe.toml b/recipes/wip/games/math/cosmic-ext-2048/recipe.toml index f1ba4bbe2..d34481e63 100644 --- a/recipes/wip/games/math/cosmic-ext-2048/recipe.toml +++ b/recipes/wip/games/math/cosmic-ext-2048/recipe.toml @@ -1,15 +1,16 @@ #TODO app source error [source] git = "https://github.com/Kartonrealista/cosmic-ext-2048" +shallow_clone = true [build] template = "custom" script = """ +DYNAMIC_INIT +cookbook_cargo mkdir -pv "${COOKBOOK_STAGE}"/usr/share/applications mkdir -pv "${COOKBOOK_STAGE}"/usr/share/metainfo mkdir -pv "${COOKBOOK_STAGE}"/usr/share/icons cp -rv "${COOKBOOK_SOURCE}"/res/io.github.Kartonrealista.cosmic-ext-2048.desktop "${COOKBOOK_STAGE}"/usr/share/applications cp -rv "${COOKBOOK_SOURCE}"/res/io.github.Kartonrealista.cosmic-ext-2048.metainfo.xml "${COOKBOOK_STAGE}"/usr/share/metainfo cp -rv "${COOKBOOK_SOURCE}"/res/icons/hicolor "${COOKBOOK_STAGE}"/usr/share/icons -DYNAMIC_INIT -cookbook_cargo """ diff --git a/recipes/wip/games/math/t4kcommon/recipe.toml b/recipes/wip/games/math/t4kcommon/recipe.toml index 6e503e46b..e4c426706 100644 --- a/recipes/wip/games/math/t4kcommon/recipe.toml +++ b/recipes/wip/games/math/t4kcommon/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO find a way to disable speech-dispatcher dep # build instructions: https://github.com/tux4kids/t4kcommon/blob/master/INSTALL#L33 [source] git = "https://github.com/tux4kids/t4kcommon" @@ -9,12 +9,16 @@ autotools_recursive_regenerate """ [build] template = "configure" +configureflags = [ + "--without-sdlnet" +] dependencies = [ "sdl1", "sdl1-mixer", "sdl1-image", "sdl-pango", - "sdl2-net", + #"sdl1-net", "libpng", "libxml2", + "librsvg", ] diff --git a/recipes/wip/games/math/tuxmath/recipe.toml b/recipes/wip/games/math/tuxmath/recipe.toml index 901e63d76..07ea03668 100644 --- a/recipes/wip/games/math/tuxmath/recipe.toml +++ b/recipes/wip/games/math/tuxmath/recipe.toml @@ -1,7 +1,8 @@ -#TODO not compiled or tested +#TODO fix t4kcommon dep # build instructions: https://github.com/tux4kids/tuxmath/blob/master/doc/INSTALL [source] git = "https://github.com/tux4kids/tuxmath" +rev = "febcf7b" shallow_clone = true script = """ autotools_recursive_regenerate diff --git a/recipes/wip/games/music/oshu/recipe.toml b/recipes/wip/games/music/oshu/recipe.toml index 4e8df3eb8..cd3fd0d74 100644 --- a/recipes/wip/games/music/oshu/recipe.toml +++ b/recipes/wip/games/music/oshu/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO compiled but untested [source] git = "https://github.com/fmang/oshu" rev = "2.0.3" diff --git a/recipes/wip/games/music/performous-composer/recipe.toml b/recipes/wip/games/music/performous-composer/recipe.toml deleted file mode 100644 index 5393e0f2c..000000000 --- a/recipes/wip/games/music/performous-composer/recipe.toml +++ /dev/null @@ -1,10 +0,0 @@ -#TODO not compiled or tested -# build instructions - https://github.com/performous/performous/wiki/Composer -[source] -git = "https://github.com/performous/composer" -[build] -template = "cmake" -dependencies = [ - "qt5-base", - "ffmpeg6", -] diff --git a/recipes/wip/games/open-world/asciicker/recipe.toml b/recipes/wip/games/open-world/asciicker/recipe.toml index 2d6e1c9b0..336f3221a 100644 --- a/recipes/wip/games/open-world/asciicker/recipe.toml +++ b/recipes/wip/games/open-world/asciicker/recipe.toml @@ -1,14 +1,27 @@ -#TODO missing script for gnu make -#TODO build the game, term and server -#TODO build the terminal and sdl2 frontends -# makeflags: -DSERVER -DGAME -DUSE_SDL2 -DPURE_TERM -DUSE_GPM +# Y9 version have unnecessary v8 JS dependency +#TODO build and test +# build script: https://github.com/msokalski/asciicker/blob/y8/build.sh [source] git = "https://github.com/msokalski/asciicker" -rev = "8ff75d0c5a8d2745a8ad6a8a841dd31a46e81635" +rev = "Y8" +shallow_clone = true [build] template = "custom" dependencies = [ "mesa", - "sdl2", + "libx11", + "libxinerama", "libgpm", ] +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" -f makefile_asciiid +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" -f makefile_server +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" -f makefile_game +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" -f makefile_game_term +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" -f makefile_asciiid +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" -f makefile_server +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" -f makefile_game +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" -f makefile_game_term +""" diff --git a/recipes/wip/games/open-world/leafish/recipe.toml b/recipes/wip/games/open-world/leafish/recipe.toml index fb23475a8..9dfc551ed 100644 --- a/recipes/wip/games/open-world/leafish/recipe.toml +++ b/recipes/wip/games/open-world/leafish/recipe.toml @@ -1,6 +1,7 @@ -#TODO make gtk3 work +#TODO glutin crate error (after cargo update) [source] git = "https://github.com/Lea-fish/Leafish" +shallow_clone = true [build] template = "cargo" dependencies = [ diff --git a/recipes/wip/games/open-world/teloren/recipe.toml b/recipes/wip/games/open-world/teloren/recipe.toml index bc7e1dafc..cf8a61cfb 100644 --- a/recipes/wip/games/open-world/teloren/recipe.toml +++ b/recipes/wip/games/open-world/teloren/recipe.toml @@ -1,5 +1,6 @@ #TODO quinn-udp crate error [source] git = "https://github.com/zesterer/teloren" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/games/platform/dinorunner-sdl/recipe.toml b/recipes/wip/games/platform/dinorunner-sdl/recipe.toml index eaa30775c..c4bbd2813 100644 --- a/recipes/wip/games/platform/dinorunner-sdl/recipe.toml +++ b/recipes/wip/games/platform/dinorunner-sdl/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO can't find CMakeLists.txt file [source] git = "https://github.com/AKJ7/dinorunner" rev = "v1.3.2" diff --git a/recipes/wip/games/rpg/kingslayer/recipe.toml b/recipes/wip/games/rpg/kingslayer/recipe.toml index e1d1df0f7..b2ba1ebad 100644 --- a/recipes/wip/games/rpg/kingslayer/recipe.toml +++ b/recipes/wip/games/rpg/kingslayer/recipe.toml @@ -1,5 +1,6 @@ #TODO compiled but not tested [source] git = "https://github.com/Zaechus/kingslayer" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/games/servers/cuberite/recipe.toml b/recipes/wip/games/servers/cuberite/recipe.toml index 7b19d796a..df24af3b4 100644 --- a/recipes/wip/games/servers/cuberite/recipe.toml +++ b/recipes/wip/games/servers/cuberite/recipe.toml @@ -1,6 +1,8 @@ -#TODO not compiled or tested +#TODO bundled mbedtls build error # build instructions: https://github.com/cuberite/cuberite/blob/master/COMPILING.md#building-1 [source] git = "https://github.com/cuberite/cuberite" +rev = "7fd3fa5" +shallow_clone = true [build] template = "cmake" diff --git a/recipes/wip/games/space/osirion/recipe.toml b/recipes/wip/games/space/osirion/recipe.toml index b8707c179..754ec40cf 100644 --- a/recipes/wip/games/space/osirion/recipe.toml +++ b/recipes/wip/games/space/osirion/recipe.toml @@ -6,7 +6,7 @@ tar = "http://osirion.org/files/osirion-0.2.8-src.tar.bz2" template = "configure" dependencies = [ "zlib", - "bullet-physics", + "bullet", "libpng", "libjpeg", "sdl2", diff --git a/recipes/wip/games/space/outfly/recipe.toml b/recipes/wip/games/space/outfly/recipe.toml index a5bd5537d..ccebb4ff9 100644 --- a/recipes/wip/games/space/outfly/recipe.toml +++ b/recipes/wip/games/space/outfly/recipe.toml @@ -1,5 +1,6 @@ -#TODO not compiled or tested +#TODO bevy_embedded_assets crate error [source] git = "https://codeberg.org/outfly/outfly" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/games/space/rebels-in-the-sky/recipe.toml b/recipes/wip/games/space/rebels-in-the-sky/recipe.toml index 607a298a1..75c831235 100644 --- a/recipes/wip/games/space/rebels-in-the-sky/recipe.toml +++ b/recipes/wip/games/space/rebels-in-the-sky/recipe.toml @@ -1,5 +1,6 @@ -#TODO async-io and rustix crate error +#TODO libz-ng-sys crate error, use zlib-ng recipe? [source] git = "https://github.com/ricott1/rebels-in-the-sky" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/games/space/rust-belt/recipe.toml b/recipes/wip/games/space/rust-belt/recipe.toml index 37a10b5be..eed3c64f7 100644 --- a/recipes/wip/games/space/rust-belt/recipe.toml +++ b/recipes/wip/games/space/rust-belt/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO outdated winit crate (after cargo update) [source] git = "https://github.com/johnthagen/rust-belt" [build] diff --git a/recipes/wip/libs/fs/physicsfs/recipe.toml b/recipes/wip/libs/fs/physicsfs/recipe.toml index ff7cca8f6..97055e162 100644 --- a/recipes/wip/libs/fs/physicsfs/recipe.toml +++ b/recipes/wip/libs/fs/physicsfs/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but untested # build instructions: https://github.com/icculus/physfs/blob/main/docs/INSTALL.txt [source] git = "https://github.com/icculus/physfs" diff --git a/recipes/wip/libs/gnome/gobject-introspection/recipe.toml b/recipes/wip/libs/gnome/gobject-introspection/recipe.toml index 3b1a74738..9e543246a 100644 --- a/recipes/wip/libs/gnome/gobject-introspection/recipe.toml +++ b/recipes/wip/libs/gnome/gobject-introspection/recipe.toml @@ -1,3 +1,4 @@ +#TODO build assertion error [source] tar = "https://download.gnome.org/sources/gobject-introspection/1.84/gobject-introspection-1.84.0.tar.xz" blake3 = "e01a810629b11b2fa415ba47d2df3ba521286e9933f6c2b364e959c26401eb96" diff --git a/recipes/wip/libs/other/bullet/recipe.toml b/recipes/wip/libs/other/bullet/recipe.toml index ad41e9a41..1ef0187dc 100644 --- a/recipes/wip/libs/other/bullet/recipe.toml +++ b/recipes/wip/libs/other/bullet/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO gwen dep build error # build instructions: https://github.com/bulletphysics/bullet3#build-instructions-for-bullet-using-premake-you-can-also-use-cmake-instead [source] git = "https://github.com/bulletphysics/bullet3" diff --git a/recipes/wip/libs/other/sdl-pango/recipe.toml b/recipes/wip/libs/other/sdl-pango/recipe.toml index 479210a98..d129096ef 100644 --- a/recipes/wip/libs/other/sdl-pango/recipe.toml +++ b/recipes/wip/libs/other/sdl-pango/recipe.toml @@ -1,5 +1,7 @@ -#TODO can't recognize the redox target +#TODO compiled but untested [source] tar = "https://sourceforge.net/projects/sdlpango/files/SDL_Pango/0.1.2/SDL_Pango-0.1.2.tar.gz/download" +script = "GNU_CONFIG_GET config.sub" [build] template = "configure" +dependencies = ["pango"] diff --git a/recipes/wip/math/scilab/recipe.toml b/recipes/wip/math/scilab/recipe.toml index 239ee1420..911e53d19 100644 --- a/recipes/wip/math/scilab/recipe.toml +++ b/recipes/wip/math/scilab/recipe.toml @@ -5,7 +5,7 @@ tar = "https://gitlab.com/scilab/scilab/-/archive/2026.0.1/scilab-2026.0.1.tar.b [build] template = "custom" script = """ -COOKBOOK_SOURCE="${COOKBOOK_SOURCE}/scilab" +COOKBOOK_CONFIGURE=${COOKBOOK_SOURCE}/scilab/configure DYNAMIC_INIT cookbook_configure """ diff --git a/recipes/wip/security/sqop/recipe.toml b/recipes/wip/security/sqop/recipe.toml index 8d567852c..8dc40cd83 100644 --- a/recipes/wip/security/sqop/recipe.toml +++ b/recipes/wip/security/sqop/recipe.toml @@ -1,6 +1,7 @@ -#TODO make libnettle work +#TODO nettle-sys crate error (after cargo update) [source] git = "https://gitlab.com/sequoia-pgp/sequoia-sop" +shallow_clone = true [build] template = "cargo" dependencies = [ diff --git a/recipes/wip/security/sqv/recipe.toml b/recipes/wip/security/sqv/recipe.toml index 90fe20244..696d0363c 100644 --- a/recipes/wip/security/sqv/recipe.toml +++ b/recipes/wip/security/sqv/recipe.toml @@ -1,6 +1,7 @@ -#TODO make libnettle work +#TODO nettle-sys crate error [source] git = "https://gitlab.com/sequoia-pgp/sequoia-sqv" +shallow_clone = true [build] template = "cargo" dependencies = [ diff --git a/recipes/wip/security/stegano/recipe.toml b/recipes/wip/security/stegano/recipe.toml index 1e67ce410..4e05054ae 100644 --- a/recipes/wip/security/stegano/recipe.toml +++ b/recipes/wip/security/stegano/recipe.toml @@ -1,8 +1,7 @@ #TODO require a command to move the binary [source] git = "https://github.com/steganogram/stegano-rs" +shallow_clone = true [build] -template = "custom" -script = """ -cookbook_cargo_packages stegano-cli -""" +template = "cargo" +cargopackages = ["stegano-cli"] diff --git a/recipes/wip/security/sudo-rs/recipe.toml b/recipes/wip/security/sudo-rs/recipe.toml index f0daeb473..abfe22de6 100644 --- a/recipes/wip/security/sudo-rs/recipe.toml +++ b/recipes/wip/security/sudo-rs/recipe.toml @@ -1,5 +1,4 @@ -#TODO libc crate error -#TODO requires Linux PAM +#TODO port [source] git = "https://github.com/memorysafety/sudo-rs" [build] diff --git a/recipes/wip/security/threatdeck/recipe.toml b/recipes/wip/security/threatdeck/recipe.toml index 12955a6b1..cf283c166 100644 --- a/recipes/wip/security/threatdeck/recipe.toml +++ b/recipes/wip/security/threatdeck/recipe.toml @@ -1,6 +1,7 @@ -#TODO compile and test +#TODO compiled but untested [source] git = "https://github.com/gripebomb/ThreatDeck" shallow_clone = true [build] template = "cargo" +dependencies = ["openssl3"] diff --git a/recipes/wip/security/tiger/recipe.toml b/recipes/wip/security/tiger/recipe.toml index fadbea992..848732c17 100644 --- a/recipes/wip/security/tiger/recipe.toml +++ b/recipes/wip/security/tiger/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO missing "getpermit" make target for "all" target # installation instructions: https://cgit.git.savannah.gnu.org/cgit/tiger.git/tree/USING#n80 [source] tar = "https://download.savannah.gnu.org/releases/tiger/tiger_3.2.4rc1.tar.gz" diff --git a/recipes/wip/security/tyr/recipe.toml b/recipes/wip/security/tyr/recipe.toml index 29b21d9fb..1f54ffa35 100644 --- a/recipes/wip/security/tyr/recipe.toml +++ b/recipes/wip/security/tyr/recipe.toml @@ -1,5 +1,7 @@ #TODO not compiled or tested [source] git = "https://gitlab.com/cyberactivity/tyr" +shallow_clone = true [build] template = "cargo" +cargopackages = ["baldur"] diff --git a/recipes/wip/security/vagga/recipe.toml b/recipes/wip/security/vagga/recipe.toml index e284538b8..92e72fa7e 100644 --- a/recipes/wip/security/vagga/recipe.toml +++ b/recipes/wip/security/vagga/recipe.toml @@ -1,5 +1,6 @@ -#TODO libc and nix crate errors (after cargo update) +#TODO very outdated nix crate (after cargo update) [source] git = "https://github.com/tailhook/vagga" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/security/veldora/recipe.toml b/recipes/wip/security/veldora/recipe.toml index c6eb25b5a..a643d986d 100644 --- a/recipes/wip/security/veldora/recipe.toml +++ b/recipes/wip/security/veldora/recipe.toml @@ -1,5 +1,6 @@ #TODO compiled but not tested [source] git = "https://github.com/tamton-aquib/veldora" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/security/weggli/recipe.toml b/recipes/wip/security/weggli/recipe.toml index 7347cd43e..7432870c0 100644 --- a/recipes/wip/security/weggli/recipe.toml +++ b/recipes/wip/security/weggli/recipe.toml @@ -1,5 +1,6 @@ -#TODO source code error +#TODO compiled but untested [source] git = "https://github.com/weggli-rs/weggli" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/security/whyno/recipe.toml b/recipes/wip/security/whyno/recipe.toml index a79882822..52bfd99b1 100644 --- a/recipes/wip/security/whyno/recipe.toml +++ b/recipes/wip/security/whyno/recipe.toml @@ -1,6 +1,7 @@ #TODO not compiled or tested [source] -git = "https://gnu.foo/projects/whyno" +git = "https://github.com/gnufood/whyno" shallow_clone = true [build] template = "cargo" +cargopackages = ["whyno-cli"] diff --git a/recipes/wip/security/yara-x/recipe.toml b/recipes/wip/security/yara-x/recipe.toml index fe61456ae..8d2ec8249 100644 --- a/recipes/wip/security/yara-x/recipe.toml +++ b/recipes/wip/security/yara-x/recipe.toml @@ -1,8 +1,7 @@ #TODO not compiled or tested [source] git = "https://github.com/VirusTotal/yara-x" +shallow_clone = true [build] -template = "custom" -script = """ -cookbook_cargo_packages yara-x-cli -""" +template = "cargo" +cargopackages = ["yara-x-cli"] diff --git a/recipes/wip/security/zabbix-lts/recipe.toml b/recipes/wip/security/zabbix-lts/recipe.toml index 8afa1a735..cffb66618 100644 --- a/recipes/wip/security/zabbix-lts/recipe.toml +++ b/recipes/wip/security/zabbix-lts/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO Unable to do DNS lookups (libresolv check failed) #TODO discover minimum dependencies from configure log # build and configuration instructions: https://www.zabbix.com/documentation/7.0/en/manual/installation/install [source] diff --git a/recipes/wip/services/ala-lape/recipe.toml b/recipes/wip/services/ala-lape/recipe.toml index 429b8963c..2db49520d 100644 --- a/recipes/wip/services/ala-lape/recipe.toml +++ b/recipes/wip/services/ala-lape/recipe.toml @@ -1,5 +1,6 @@ -#TODO not compiled or tested +#TODO outdated nix crate (after cargo update) [source] git = "https://git.madhouse-project.org/algernon/ala-lape" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/services/busd/recipe.toml b/recipes/wip/services/busd/recipe.toml index 29c15e627..14ac4cf47 100644 --- a/recipes/wip/services/busd/recipe.toml +++ b/recipes/wip/services/busd/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but untested [source] git = "https://github.com/jackpot51/busd" shallow_clone = true diff --git a/recipes/wip/services/chrony/recipe.toml b/recipes/wip/services/chrony/recipe.toml index 59b2284d6..2a073af0a 100644 --- a/recipes/wip/services/chrony/recipe.toml +++ b/recipes/wip/services/chrony/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO can't open makefiles # build instructions: https://gitlab.com/chrony/chrony/-/blob/master/doc/installation.adoc?ref_type=heads [source] tar = "https://chrony-project.org/releases/chrony-4.8.tar.gz" diff --git a/recipes/wip/services/colord/recipe.toml b/recipes/wip/services/colord/recipe.toml index d25604152..c49354dc3 100644 --- a/recipes/wip/services/colord/recipe.toml +++ b/recipes/wip/services/colord/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO add gusb dep #TODO discover minimum dependencies from meson log [source] git = "https://github.com/hughsie/colord" @@ -8,9 +8,14 @@ shallow_clone = true template = "meson" mesonflags = [ "-Dsystemd=false", - "-Dudev-rules=false", + #"-Dudev-rules=false", "-Dintrospection=false", "-Dtests=false", "-Ddocs=false", "-Dman=false", ] +dependencies = [ + "glib", + "liblcms", + "sqlite3", +] diff --git a/recipes/wip/services/hickory-dns/recipe.toml b/recipes/wip/services/hickory-dns/recipe.toml index 90d6b11bb..ff8ef45dd 100644 --- a/recipes/wip/services/hickory-dns/recipe.toml +++ b/recipes/wip/services/hickory-dns/recipe.toml @@ -1,22 +1,13 @@ -#TODO compiled but not tested +#TODO build and test [source] git = "https://github.com/hickory-dns/hickory-dns" shallow_clone = true [build] -template = "custom" +template = "cargo" +cargopackages = [ + "hickory-dns", + "hickory-util", +] dependencies = [ "openssl3", ] -script = """ -DYNAMIC_INIT -binary=hickory-dns -"${COOKBOOK_CARGO}" build \ - --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \ - --bin "${binary}" \ - --release - --all-features - mkdir -pv "${COOKBOOK_STAGE}/usr/bin" - cp -v \ - "target/${TARGET}/release/${binary}" \ - "${COOKBOOK_STAGE}/usr/bin/${binary}" -""" diff --git a/recipes/wip/services/lemurs/recipe.toml b/recipes/wip/services/lemurs/recipe.toml index cd16956de..d298eb214 100644 --- a/recipes/wip/services/lemurs/recipe.toml +++ b/recipes/wip/services/lemurs/recipe.toml @@ -1,6 +1,7 @@ -#TODO not compiled or tested +#TODO outdated users crate [source] git = "https://github.com/coastalwhite/lemurs" +shallow_clone = true [build] template = "custom" script = """ diff --git a/recipes/wip/services/limine/recipe.toml b/recipes/wip/services/limine/recipe.toml index ca4084b24..fab143119 100644 --- a/recipes/wip/services/limine/recipe.toml +++ b/recipes/wip/services/limine/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but untested # build instructions: https://github.com/limine-bootloader/limine#building-the-bootloader [source] tar = "https://github.com/limine-bootloader/limine/releases/download/v7.2.0/limine-7.2.0.tar.xz" diff --git a/recipes/wip/services/networkmanager/recipe.toml b/recipes/wip/services/networkmanager/recipe.toml index 6078d90b5..1cd666e06 100644 --- a/recipes/wip/services/networkmanager/recipe.toml +++ b/recipes/wip/services/networkmanager/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO patch to disable libudev #TODO discover minimum dependencies from meson log # build instructions: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/CONTRIBUTING.md#building-from-source # freebsd has a shim to bypass linux dependencies: https://github.com/freebsd/freebsd-ports/blob/main/net-mgmt/networkmanager-shim/Makefile @@ -17,7 +17,7 @@ mesonflags = [ "-Dmodem_manager=false", "-Dnm_cloud_setup=false", "-Dnbft=false", - "-Dclat=false", + #"-Dclat=false", "-Dintrospection=false", "-Dman=false", "-Dtests=no", @@ -32,8 +32,9 @@ mesonflags = [ "-Dcrypto=null", "-Dppp=false", ] -#dependencies = [ +dependencies = [ + "libuuid", #"libpsl", #"readline", #"gnutls3", -#] +] diff --git a/recipes/wip/services/ntpd-rs/recipe.toml b/recipes/wip/services/ntpd-rs/recipe.toml index 1ca8496ed..2fa8822c2 100644 --- a/recipes/wip/services/ntpd-rs/recipe.toml +++ b/recipes/wip/services/ntpd-rs/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO clock-steering and libc crate errors #TODO configure the service: https://docs.ntpd-rs.pendulum-project.org/guide/installation/#running-as-a-system-service [source] git = "https://github.com/pendulum-project/ntpd-rs" diff --git a/recipes/wip/services/pipewire/recipe.toml b/recipes/wip/services/pipewire/recipe.toml index ea85fd534..4a909fc02 100644 --- a/recipes/wip/services/pipewire/recipe.toml +++ b/recipes/wip/services/pipewire/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO fix gobject-introspection dep # build instructions: https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/INSTALL.md [source] git = "https://gitlab.freedesktop.org/pipewire/pipewire" @@ -15,6 +15,8 @@ mesonflags = [ "-Dflatpak=disabled", ] dependencies = [ - "libpulse", + #"libpulse", "sdl2", + "glib", + "gobject-introspection", ] diff --git a/recipes/wip/services/runst/recipe.toml b/recipes/wip/services/runst/recipe.toml index 82fcee951..e08ef6a8f 100644 --- a/recipes/wip/services/runst/recipe.toml +++ b/recipes/wip/services/runst/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO pango and pango-sys crate errors [source] git = "https://github.com/orhun/runst" shallow_clone = true diff --git a/recipes/wip/services/seatd/recipe.toml b/recipes/wip/services/seatd/recipe.toml index 6bca5f047..bdb1060e0 100644 --- a/recipes/wip/services/seatd/recipe.toml +++ b/recipes/wip/services/seatd/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO test more [source] git = "https://github.com/jackpot51/seatd" branch = "redox" diff --git a/recipes/wip/services/wireguard-rs/recipe.toml b/recipes/wip/services/wireguard-rs/recipe.toml index b6563f625..e727f36b5 100644 --- a/recipes/wip/services/wireguard-rs/recipe.toml +++ b/recipes/wip/services/wireguard-rs/recipe.toml @@ -1,4 +1,4 @@ -#TODO update mio to 0.8 (after cargo update) +#TODO outdated mio crate (after cargo update) [source] git = "https://git.zx2c4.com/wireguard-rs" shallow_clone = true diff --git a/recipes/wip/services/wireguard-tools/recipe.toml b/recipes/wip/services/wireguard-tools/recipe.toml index b21300ef5..b58864d14 100644 --- a/recipes/wip/services/wireguard-tools/recipe.toml +++ b/recipes/wip/services/wireguard-tools/recipe.toml @@ -1,4 +1,5 @@ -#TODO missing script for gnu make: https://git.zx2c4.com/wireguard-tools/tree/README.md +#TODO build and test +# build instructions: https://git.zx2c4.com/wireguard-tools/tree/README.md [source] tar = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20260223.tar.xz" [build] @@ -7,3 +8,9 @@ template = "custom" dependencies = [ "wireguard-rs", ] +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/src" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/services/wireplumber/recipe.toml b/recipes/wip/services/wireplumber/recipe.toml index 80a9c0a4c..49ae674ab 100644 --- a/recipes/wip/services/wireplumber/recipe.toml +++ b/recipes/wip/services/wireplumber/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO fix pipewire dep #TODO discover minimum dependencies from cmake log [source] git = "https://gitlab.freedesktop.org/pipewire/wireplumber" @@ -10,3 +10,7 @@ mesonflags = [ "-Dtests=false", "-Ddbus-tests=false", ] +dependencies = [ + "glib", + "pipewire", +] diff --git a/recipes/wip/sound/libpulse/recipe.toml b/recipes/wip/sound/libpulse/recipe.toml index 59048a407..92ed3ef62 100644 --- a/recipes/wip/sound/libpulse/recipe.toml +++ b/recipes/wip/sound/libpulse/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO undefined references # build instructions: https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/PulseAudioFromGit/ [source] tar = "https://freedesktop.org/software/pulseaudio/releases/pulseaudio-17.0.tar.xz" @@ -6,9 +6,9 @@ tar = "https://freedesktop.org/software/pulseaudio/releases/pulseaudio-17.0.tar. template = "meson" mesonflags = [ "-Ddaemon=false", - "-Ddoxygen=disabled", + "-Ddoxygen=false", "-Dman=false", - "-Dtests=disabled", + "-Dtests=false", "-Drunning-from-build-tree=false", ] dependencies = [ diff --git a/recipes/wip/vm/qemu/recipe.toml b/recipes/wip/vm/qemu/recipe.toml index 2694bf73d..5a9440c3d 100644 --- a/recipes/wip/vm/qemu/recipe.toml +++ b/recipes/wip/vm/qemu/recipe.toml @@ -1,4 +1,5 @@ -#TODO: runtime crash +#STATUS: redox guest working in terminal mode and gtk frontend +#TODO: fix sdl frontend and linux guest boot [source] git = "https://github.com/jackpot51/qemu.git" shallow_clone = true diff --git a/recipes/wip/wayland/gamescope-sdl/recipe.toml b/recipes/wip/wayland/gamescope-sdl/recipe.toml index e173f1023..dab62f215 100644 --- a/recipes/wip/wayland/gamescope-sdl/recipe.toml +++ b/recipes/wip/wayland/gamescope-sdl/recipe.toml @@ -1,3 +1,4 @@ +#TODO fix libvulkan dep #TODO determine sdl2 backend dependencies from meson log [source] git = "https://github.com/ValveSoftware/gamescope" @@ -19,4 +20,7 @@ mesonflags = [ ] dependencies = [ "sdl2", + "libx11", + "libwayland", + "libvulkan", ] diff --git a/recipes/wip/wayland/wev/recipe.toml b/recipes/wip/wayland/wev/recipe.toml index c717c6fae..96401b895 100644 --- a/recipes/wip/wayland/wev/recipe.toml +++ b/recipes/wip/wayland/wev/recipe.toml @@ -1,5 +1,4 @@ #TODO compile and test -# probably wrong gnu make command [source] git = "https://git.sr.ht/~sircmpwn/wev" rev = "1.1.0" @@ -13,5 +12,6 @@ dependencies = [ script = """ rsync -av --delete "${COOKBOOK_SOURCE}/" ./ DYNAMIC_INIT -"${COOKBOOK_MAKE}" install -j"$COOKBOOK_MAKE_JOBS" "${MAKEFLAGS[@]}" DESTDIR="$COOKBOOK_STAGE/usr" +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" """ From cf5df97e85f13228b97ad2272c31453010dc7c46 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Sun, 11 Oct 2026 16:01:52 -0300 Subject: [PATCH 38/63] Fix and update more recipes --- recipes/wip/analysis/binsider/recipe.toml | 2 +- recipes/wip/analysis/cutter/recipe.toml | 8 ++++---- recipes/wip/analysis/email-sleuth/recipe.toml | 3 ++- recipes/wip/analysis/flowgger/recipe.toml | 4 +++- recipes/wip/analysis/mmdr/recipe.toml | 2 +- recipes/wip/analysis/netdata/recipe.toml | 2 +- recipes/wip/analysis/radare2/recipe.toml | 2 +- recipes/wip/analysis/rizin/recipe.toml | 5 ++++- recipes/wip/analysis/tmmpr/recipe.toml | 2 +- recipes/wip/dev/analysis/binwalk/recipe.toml | 2 +- recipes/wip/dev/analysis/codevis/recipe.toml | 2 +- recipes/wip/dev/analysis/cppcheck/recipe.toml | 2 +- recipes/wip/dev/analysis/debtmap/recipe.toml | 3 ++- recipes/wip/dev/analysis/feluda/recipe.toml | 2 +- recipes/wip/dev/analysis/hgrep/recipe.toml | 2 +- recipes/wip/dev/analysis/honggfuzz-rs/recipe.toml | 2 +- recipes/wip/dev/analysis/hx/recipe.toml | 8 +++++++- recipes/wip/dev/analysis/lnav/recipe.toml | 2 +- recipes/wip/dev/analysis/m-vis/recipe.toml | 2 +- recipes/wip/dev/analysis/pratdiff/recipe.toml | 2 +- recipes/wip/dev/analysis/statui/recipe.toml | 2 +- recipes/wip/dev/analysis/tinywatcher/recipe.toml | 2 +- recipes/wip/dev/analysis/zizmor/recipe.toml | 9 +++------ recipes/wip/dev/build-system/ccache/recipe.toml | 2 +- recipes/wip/dev/build-system/just/recipe.toml | 6 ++---- recipes/wip/dev/build-system/ninja-build/recipe.toml | 3 ++- recipes/wip/dev/build-system/werk/recipe.toml | 7 +++---- recipes/wip/dev/debug/dbgflow/recipe.toml | 2 +- recipes/wip/dev/debug/dr-memory/recipe.toml | 2 +- recipes/wip/dev/debug/nnd/recipe.toml | 7 +++---- recipes/wip/dev/debug/openocd/recipe.toml | 2 +- recipes/wip/dev/debug/rr-debugger/recipe.toml | 2 +- recipes/wip/dev/debug/strace-tui/recipe.toml | 2 +- recipes/wip/dev/debug/stratoshark/recipe.toml | 2 +- recipes/wip/dev/debug/termfu/recipe.toml | 9 +++++++-- recipes/wip/dev/debug/valgrind/recipe.toml | 2 +- recipes/wip/dev/graphics/bonzomatic/recipe.toml | 1 + recipes/wip/dev/graphics/sh4der-jockey/recipe.toml | 1 + recipes/wip/dev/ide/pragtical/recipe.toml | 2 +- recipes/wip/dev/ide/rust-analyzer/recipe.toml | 6 ++---- recipes/wip/dev/lang/brimstone/recipe.toml | 1 + recipes/wip/dev/lang/janet/recipe.toml | 2 +- recipes/wip/libs/other/libunwind/recipe.toml | 2 +- recipes/wip/net/analysis/wireshark/recipe.toml | 2 +- 44 files changed, 75 insertions(+), 62 deletions(-) diff --git a/recipes/wip/analysis/binsider/recipe.toml b/recipes/wip/analysis/binsider/recipe.toml index 5ae452ec2..7278d38d2 100644 --- a/recipes/wip/analysis/binsider/recipe.toml +++ b/recipes/wip/analysis/binsider/recipe.toml @@ -1,4 +1,4 @@ -#TODO async-io and rustix crates error +#TODO lurk-cli crate error [source] git = "https://github.com/orhun/binsider" shallow_clone = true diff --git a/recipes/wip/analysis/cutter/recipe.toml b/recipes/wip/analysis/cutter/recipe.toml index e90cf181f..2e2272f81 100644 --- a/recipes/wip/analysis/cutter/recipe.toml +++ b/recipes/wip/analysis/cutter/recipe.toml @@ -1,13 +1,13 @@ -#TODO not compiled or tested +#TODO can't find qt6 dep cmake config #TODO determine minimum dependencies from cmake log # build instructions: https://cutter.re/docs/building.html [source] tar = "https://github.com/rizinorg/cutter/releases/download/v2.4.1/Cutter-v2.4.1-src.tar.gz" [build] template = "cmake" -#dependencies = [ +dependencies = [ # "libzip", # "zlib", -# "qt6-base", + "qt6-base", # "qt6-svg", -#] +] diff --git a/recipes/wip/analysis/email-sleuth/recipe.toml b/recipes/wip/analysis/email-sleuth/recipe.toml index e06b0ab8a..c5207ffee 100644 --- a/recipes/wip/analysis/email-sleuth/recipe.toml +++ b/recipes/wip/analysis/email-sleuth/recipe.toml @@ -1,6 +1,7 @@ -#TODO openssl-sys crate error +#TODO openssl-sys crate error, make it use openssl3 recipe [source] git = "https://github.com/tokenizer-decode/email-sleuth" shallow_clone = true [build] template = "cargo" +dependencies = ["openssl3"] \ No newline at end of file diff --git a/recipes/wip/analysis/flowgger/recipe.toml b/recipes/wip/analysis/flowgger/recipe.toml index 6580d5b2b..0ff474859 100644 --- a/recipes/wip/analysis/flowgger/recipe.toml +++ b/recipes/wip/analysis/flowgger/recipe.toml @@ -1,7 +1,9 @@ -#TODO not compiled or tested +#TODO can't find protobuf # build instructions: https://github.com/awslabs/flowgger/wiki/Installation [source] git = "https://github.com/awslabs/flowgger" shallow_clone = true [build] template = "cargo" +dev-dependencies = ["host:protobuf"] +dependencies = ["openssl3"] diff --git a/recipes/wip/analysis/mmdr/recipe.toml b/recipes/wip/analysis/mmdr/recipe.toml index b6ed021a9..083cf0b65 100644 --- a/recipes/wip/analysis/mmdr/recipe.toml +++ b/recipes/wip/analysis/mmdr/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but untested [source] git = "https://github.com/1jehuang/mermaid-rs-renderer" shallow_clone = true diff --git a/recipes/wip/analysis/netdata/recipe.toml b/recipes/wip/analysis/netdata/recipe.toml index 632558adb..edb3753f0 100644 --- a/recipes/wip/analysis/netdata/recipe.toml +++ b/recipes/wip/analysis/netdata/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO port: unsupported platform, UnixPaths # build instructions: https://learn.netdata.cloud/docs/developer-and-contributor-corner/build-the-netdata-agent-yourself/compile-from-source-code#building-netdata [source] tar = "https://github.com/netdata/netdata/releases/download/v2.8.5/netdata-v2.8.5.tar.gz" diff --git a/recipes/wip/analysis/radare2/recipe.toml b/recipes/wip/analysis/radare2/recipe.toml index 6c1448cb9..6a0006a47 100644 --- a/recipes/wip/analysis/radare2/recipe.toml +++ b/recipes/wip/analysis/radare2/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO can't find exe_wrapper [source] tar = "https://github.com/radareorg/radare2/releases/download/6.1.4/radare2-6.1.4.tar.xz" [build] diff --git a/recipes/wip/analysis/rizin/recipe.toml b/recipes/wip/analysis/rizin/recipe.toml index f19402467..28a38fd48 100644 --- a/recipes/wip/analysis/rizin/recipe.toml +++ b/recipes/wip/analysis/rizin/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO can't find pcre2 dep # build instructions: https://github.com/rizinorg/rizin/blob/dev/BUILDING.md [source] tar = "https://github.com/rizinorg/rizin/releases/download/v0.8.1/rizin-src-v0.8.1.tar.xz" @@ -8,3 +8,6 @@ mesonflags = [ "-Denable_tests=false", "-Denable_rz_test=false", ] +dependencies = [ + "pcre2", +] diff --git a/recipes/wip/analysis/tmmpr/recipe.toml b/recipes/wip/analysis/tmmpr/recipe.toml index 21974edfd..152950a68 100644 --- a/recipes/wip/analysis/tmmpr/recipe.toml +++ b/recipes/wip/analysis/tmmpr/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but untested [source] git = "https://github.com/tanciaku/tmmpr" shallow_clone = true diff --git a/recipes/wip/dev/analysis/binwalk/recipe.toml b/recipes/wip/dev/analysis/binwalk/recipe.toml index 62044bed0..10a1a7d50 100644 --- a/recipes/wip/dev/analysis/binwalk/recipe.toml +++ b/recipes/wip/dev/analysis/binwalk/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compilation take too long, temporary crates.io problem? [source] git = "https://github.com/ReFirmLabs/binwalk" shallow_clone = true diff --git a/recipes/wip/dev/analysis/codevis/recipe.toml b/recipes/wip/dev/analysis/codevis/recipe.toml index 9c3cedb12..009bc3539 100644 --- a/recipes/wip/dev/analysis/codevis/recipe.toml +++ b/recipes/wip/dev/analysis/codevis/recipe.toml @@ -1,4 +1,4 @@ -#TODO open crate error (after cargo update) +#TODO very outdated "open" crate (after cargo update) [source] git = "https://github.com/sloganking/codevis" shallow_clone = true diff --git a/recipes/wip/dev/analysis/cppcheck/recipe.toml b/recipes/wip/dev/analysis/cppcheck/recipe.toml index 9fcb61452..998c7acd2 100644 --- a/recipes/wip/dev/analysis/cppcheck/recipe.toml +++ b/recipes/wip/dev/analysis/cppcheck/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO can't find ucontext.h, 'getloadavg' was not declared in this scope [source] git = "https://github.com/cppcheck-opensource/cppcheck" rev = "2.22.0" diff --git a/recipes/wip/dev/analysis/debtmap/recipe.toml b/recipes/wip/dev/analysis/debtmap/recipe.toml index 82095b2ce..5a58bcd49 100644 --- a/recipes/wip/dev/analysis/debtmap/recipe.toml +++ b/recipes/wip/dev/analysis/debtmap/recipe.toml @@ -1,6 +1,7 @@ -#TODO not compiled or tested +#TODO openssl-sys crate error, make it use openssl3 recipe [source] git = "https://github.com/iepathos/debtmap" shallow_clone = true [build] template = "cargo" +dependencies = ["openssl3"] diff --git a/recipes/wip/dev/analysis/feluda/recipe.toml b/recipes/wip/dev/analysis/feluda/recipe.toml index 977c3b46c..f2a91c456 100644 --- a/recipes/wip/dev/analysis/feluda/recipe.toml +++ b/recipes/wip/dev/analysis/feluda/recipe.toml @@ -1,4 +1,4 @@ -#TODO camino crate error +#TODO openssl-sys crate error, make it use openssl3 recipe [source] git = "https://github.com/anistark/feluda" shallow_clone = true diff --git a/recipes/wip/dev/analysis/hgrep/recipe.toml b/recipes/wip/dev/analysis/hgrep/recipe.toml index 6a71dbc64..3ee22242a 100644 --- a/recipes/wip/dev/analysis/hgrep/recipe.toml +++ b/recipes/wip/dev/analysis/hgrep/recipe.toml @@ -1,4 +1,4 @@ -#TODO compilation error, missing mimalloc sys/syscall.h +#TODO compiled but untested [source] git = "https://github.com/rhysd/hgrep" shallow_clone = true diff --git a/recipes/wip/dev/analysis/honggfuzz-rs/recipe.toml b/recipes/wip/dev/analysis/honggfuzz-rs/recipe.toml index 1ebd91a9a..428b19368 100644 --- a/recipes/wip/dev/analysis/honggfuzz-rs/recipe.toml +++ b/recipes/wip/dev/analysis/honggfuzz-rs/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO fix libunwind dep [source] git = "https://github.com/rust-fuzz/honggfuzz-rs" shallow_clone = true diff --git a/recipes/wip/dev/analysis/hx/recipe.toml b/recipes/wip/dev/analysis/hx/recipe.toml index 15983c0f2..fd9a52934 100644 --- a/recipes/wip/dev/analysis/hx/recipe.toml +++ b/recipes/wip/dev/analysis/hx/recipe.toml @@ -1,7 +1,13 @@ -#TODO missing script for gnu make: https://github.com/krpors/hx#compiling-and-running +#TODO build and test [source] git = "https://github.com/krpors/hx" rev = "v1.0.15" shallow_clone = true [build] template = "custom" +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/dev/analysis/lnav/recipe.toml b/recipes/wip/dev/analysis/lnav/recipe.toml index b83992bd6..6c4d7094d 100644 --- a/recipes/wip/dev/analysis/lnav/recipe.toml +++ b/recipes/wip/dev/analysis/lnav/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO fix libunistring dep # build instructions: https://github.com/tstack/lnav#building-from-source [source] tar = "https://github.com/tstack/lnav/releases/download/v0.14.0/lnav-0.14.0.tar.bz2" diff --git a/recipes/wip/dev/analysis/m-vis/recipe.toml b/recipes/wip/dev/analysis/m-vis/recipe.toml index 40509c836..df550c9c6 100644 --- a/recipes/wip/dev/analysis/m-vis/recipe.toml +++ b/recipes/wip/dev/analysis/m-vis/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO can't find PlatformMemory value in source [source] git = "https://github.com/SickleFire/m-vis" shallow_clone = true diff --git a/recipes/wip/dev/analysis/pratdiff/recipe.toml b/recipes/wip/dev/analysis/pratdiff/recipe.toml index 90a842d33..5fc63ba74 100644 --- a/recipes/wip/dev/analysis/pratdiff/recipe.toml +++ b/recipes/wip/dev/analysis/pratdiff/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but untested [source] git = "https://github.com/fowles/pratdiff" shallow_clone = true diff --git a/recipes/wip/dev/analysis/statui/recipe.toml b/recipes/wip/dev/analysis/statui/recipe.toml index 03ff1b084..d0576ad24 100644 --- a/recipes/wip/dev/analysis/statui/recipe.toml +++ b/recipes/wip/dev/analysis/statui/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but untested [source] git = "https://github.com/Mohamed-Badry/statui" shallow_clone = true diff --git a/recipes/wip/dev/analysis/tinywatcher/recipe.toml b/recipes/wip/dev/analysis/tinywatcher/recipe.toml index 6bbd38fff..2a648e62f 100644 --- a/recipes/wip/dev/analysis/tinywatcher/recipe.toml +++ b/recipes/wip/dev/analysis/tinywatcher/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO port daemon mode [source] git = "https://github.com/tinywatcher/tinywatcher" shallow_clone = true diff --git a/recipes/wip/dev/analysis/zizmor/recipe.toml b/recipes/wip/dev/analysis/zizmor/recipe.toml index b6ef326fb..8f6f0c7dc 100644 --- a/recipes/wip/dev/analysis/zizmor/recipe.toml +++ b/recipes/wip/dev/analysis/zizmor/recipe.toml @@ -1,10 +1,7 @@ -#TODO camino crate error +#TODO tikv-jemalloc-sys crate error: unsupported platform [source] git = "https://github.com/woodruffw/zizmor" shallow_clone = true [build] -template = "custom" -script = """ -DYNAMIC_INIT -cookbook_cargo_packages zizmor -""" +template = "cargo" +cargopackages = ["zizmor"] diff --git a/recipes/wip/dev/build-system/ccache/recipe.toml b/recipes/wip/dev/build-system/ccache/recipe.toml index 74601d948..311d97063 100644 --- a/recipes/wip/dev/build-system/ccache/recipe.toml +++ b/recipes/wip/dev/build-system/ccache/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO disable warnings being treated as errors #TODO missing dependencies: https://github.com/ccache/ccache/blob/master/doc/INSTALL.md#dependencies # build instructions: https://github.com/ccache/ccache/blob/master/doc/INSTALL.md [source] diff --git a/recipes/wip/dev/build-system/just/recipe.toml b/recipes/wip/dev/build-system/just/recipe.toml index b60502904..579846589 100644 --- a/recipes/wip/dev/build-system/just/recipe.toml +++ b/recipes/wip/dev/build-system/just/recipe.toml @@ -2,7 +2,5 @@ [source] git = "https://github.com/casey/just" [build] -template = "custom" -script = """ -cookbook_cargo_packages just -""" +template = "cargo" +cargopackages = ["just"] diff --git a/recipes/wip/dev/build-system/ninja-build/recipe.toml b/recipes/wip/dev/build-system/ninja-build/recipe.toml index d6e10e418..58a735226 100644 --- a/recipes/wip/dev/build-system/ninja-build/recipe.toml +++ b/recipes/wip/dev/build-system/ninja-build/recipe.toml @@ -1,7 +1,8 @@ -#TODO not compiled or tested +#TODO 'getloadavg' was not declared in this scope # build instructions: https://github.com/ninja-build/ninja#building-ninja-itself [source] git = "https://github.com/ninja-build/ninja" rev = "v1.13.1" +shallow_clone = true [build] template = "cmake" diff --git a/recipes/wip/dev/build-system/werk/recipe.toml b/recipes/wip/dev/build-system/werk/recipe.toml index 4635fa1a3..701d2839e 100644 --- a/recipes/wip/dev/build-system/werk/recipe.toml +++ b/recipes/wip/dev/build-system/werk/recipe.toml @@ -1,8 +1,7 @@ #TODO async and rustix crates error [source] git = "https://github.com/simonask/werk" +shallow_clone = true [build] -template = "custom" -script = """ -cookbook_cargo_packages werk-cli -""" +template = "cargo" +cargopackages = ["werk-cli"] diff --git a/recipes/wip/dev/debug/dbgflow/recipe.toml b/recipes/wip/dev/debug/dbgflow/recipe.toml index 2ebfe5cb9..db4465c7c 100644 --- a/recipes/wip/dev/debug/dbgflow/recipe.toml +++ b/recipes/wip/dev/debug/dbgflow/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but untested [source] git = "https://github.com/CbIRNik/dbgflow" shallow_clone = true diff --git a/recipes/wip/dev/debug/dr-memory/recipe.toml b/recipes/wip/dev/debug/dr-memory/recipe.toml index 3175b2c0f..fd25b0e9a 100644 --- a/recipes/wip/dev/debug/dr-memory/recipe.toml +++ b/recipes/wip/dev/debug/dr-memory/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO fix libunwind dep # lacking build instructions [source] git = "https://github.com/DynamoRIO/drmemory" diff --git a/recipes/wip/dev/debug/nnd/recipe.toml b/recipes/wip/dev/debug/nnd/recipe.toml index 4542522f3..27092c954 100644 --- a/recipes/wip/dev/debug/nnd/recipe.toml +++ b/recipes/wip/dev/debug/nnd/recipe.toml @@ -1,8 +1,7 @@ #TODO nnd crate error [source] git = "https://github.com/al13n321/nnd" +shallow_clone = true [build] -template = "custom" -script = """ -cookbook_cargo --profile=dbgo -""" +template = "cargo" +cargoflags = ["--profile=dbgo"] diff --git a/recipes/wip/dev/debug/openocd/recipe.toml b/recipes/wip/dev/debug/openocd/recipe.toml index e78faa201..81b776da2 100644 --- a/recipes/wip/dev/debug/openocd/recipe.toml +++ b/recipes/wip/dev/debug/openocd/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO fix jimtcl dep # build instructions: https://github.com/openocd-org/openocd/#building-openocd [source] tar = "https://sourceforge.net/projects/openocd/files/openocd/0.12.0/openocd-0.12.0.tar.bz2/download" diff --git a/recipes/wip/dev/debug/rr-debugger/recipe.toml b/recipes/wip/dev/debug/rr-debugger/recipe.toml index 91729d186..fd9bb4192 100644 --- a/recipes/wip/dev/debug/rr-debugger/recipe.toml +++ b/recipes/wip/dev/debug/rr-debugger/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO fix capnproto dep # build instructions: https://github.com/rr-debugger/rr/wiki/Building-And-Installing [source] git = "https://github.com/rr-debugger/rr" diff --git a/recipes/wip/dev/debug/strace-tui/recipe.toml b/recipes/wip/dev/debug/strace-tui/recipe.toml index 62e19396b..2e460c7ec 100644 --- a/recipes/wip/dev/debug/strace-tui/recipe.toml +++ b/recipes/wip/dev/debug/strace-tui/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but untested [source] git = "https://github.com/Rodrigodd/strace-tui" shallow_clone = true diff --git a/recipes/wip/dev/debug/stratoshark/recipe.toml b/recipes/wip/dev/debug/stratoshark/recipe.toml index dd61f4869..4f4569ee2 100644 --- a/recipes/wip/dev/debug/stratoshark/recipe.toml +++ b/recipes/wip/dev/debug/stratoshark/recipe.toml @@ -3,7 +3,7 @@ # build instructions: https://www.wireshark.org/docs/wsdg_html_chunked/ChSetupUNIX.html # build options: https://gitlab.com/wireshark/wireshark/-/blob/master/CMakeOptions.txt [source] -tar = "https://2.na.dl.wireshark.org/src/wireshark-4.6.5.tar.xz" +tar = "https://gitlab.com/wireshark/wireshark/-/archive/v4.7.4/wireshark-v4.7.4.tar.bz2" [build] template = "cmake" cmakeflags = [ diff --git a/recipes/wip/dev/debug/termfu/recipe.toml b/recipes/wip/dev/debug/termfu/recipe.toml index 7d64ce5da..98750c84a 100644 --- a/recipes/wip/dev/debug/termfu/recipe.toml +++ b/recipes/wip/dev/debug/termfu/recipe.toml @@ -1,5 +1,4 @@ -#TODO missing script for gnu make -# build instructions: https://github.com/jvalcher/termfu#installation +#TODO build and test [source] git = "https://github.com/jvalcher/termfu" rev = "v0.2.2" @@ -8,6 +7,12 @@ template = "custom" dependencies = [ "ncursesw", ] +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" [package] dependencies = [ "gdb", diff --git a/recipes/wip/dev/debug/valgrind/recipe.toml b/recipes/wip/dev/debug/valgrind/recipe.toml index 720d81fa8..3e1689de2 100644 --- a/recipes/wip/dev/debug/valgrind/recipe.toml +++ b/recipes/wip/dev/debug/valgrind/recipe.toml @@ -1,4 +1,4 @@ -#TODO port to redox +#TODO port [source] tar = "https://sourceware.org/pub/valgrind/valgrind-3.22.0.tar.bz2" [build] diff --git a/recipes/wip/dev/graphics/bonzomatic/recipe.toml b/recipes/wip/dev/graphics/bonzomatic/recipe.toml index d12b8a2d0..322e0bc83 100644 --- a/recipes/wip/dev/graphics/bonzomatic/recipe.toml +++ b/recipes/wip/dev/graphics/bonzomatic/recipe.toml @@ -3,6 +3,7 @@ # build instructions - https://github.com/Gargaj/Bonzomatic#linux [source] git = "https://github.com/Gargaj/Bonzomatic" +shallow_clone = true [build] template = "cmake" dependencies = [ diff --git a/recipes/wip/dev/graphics/sh4der-jockey/recipe.toml b/recipes/wip/dev/graphics/sh4der-jockey/recipe.toml index d3001c4c5..32e9b736d 100644 --- a/recipes/wip/dev/graphics/sh4der-jockey/recipe.toml +++ b/recipes/wip/dev/graphics/sh4der-jockey/recipe.toml @@ -1,5 +1,6 @@ #TODO winit crate error [source] git = "https://github.com/slerpyyy/sh4der-jockey" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/dev/ide/pragtical/recipe.toml b/recipes/wip/dev/ide/pragtical/recipe.toml index e2f64d482..c043d6178 100644 --- a/recipes/wip/dev/ide/pragtical/recipe.toml +++ b/recipes/wip/dev/ide/pragtical/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO fix sdl3 dep # build instructions: https://pragtical.dev/docs/setup/building [source] git = "https://github.com/pragtical/pragtical" diff --git a/recipes/wip/dev/ide/rust-analyzer/recipe.toml b/recipes/wip/dev/ide/rust-analyzer/recipe.toml index 016bf088d..a72dbe7da 100644 --- a/recipes/wip/dev/ide/rust-analyzer/recipe.toml +++ b/recipes/wip/dev/ide/rust-analyzer/recipe.toml @@ -3,7 +3,5 @@ git = "https://github.com/rust-lang/rust-analyzer" shallow_clone = true [build] -template = "custom" -script = """ -cookbook_cargo_packages rust-analyzer -""" +template = "cargo" +cargopackages = ["rust-analyzer"] diff --git a/recipes/wip/dev/lang/brimstone/recipe.toml b/recipes/wip/dev/lang/brimstone/recipe.toml index cbee54c1d..ec3a6e499 100644 --- a/recipes/wip/dev/lang/brimstone/recipe.toml +++ b/recipes/wip/dev/lang/brimstone/recipe.toml @@ -4,3 +4,4 @@ git = "https://github.com/Hans-Halverson/brimstone" shallow_clone = true [build] template = "cargo" +cargopackages = ["brimstone"] diff --git a/recipes/wip/dev/lang/janet/recipe.toml b/recipes/wip/dev/lang/janet/recipe.toml index 90e3afd71..f168fd6c6 100644 --- a/recipes/wip/dev/lang/janet/recipe.toml +++ b/recipes/wip/dev/lang/janet/recipe.toml @@ -11,7 +11,7 @@ mesonflags = [ script = """ DYNAMIC_INIT COOKBOOK_MESON_FLAGS+=( - -Dassembler=false + #-Dassembler=false # needed by bytecode compiler? -Dnet=false -Dipv6=false -Dkqueue=false diff --git a/recipes/wip/libs/other/libunwind/recipe.toml b/recipes/wip/libs/other/libunwind/recipe.toml index 6ef93f40f..59dfa50d2 100644 --- a/recipes/wip/libs/other/libunwind/recipe.toml +++ b/recipes/wip/libs/other/libunwind/recipe.toml @@ -1,4 +1,4 @@ -#TODO compilation error +#TODO can't find ucontext.h [source] tar = "https://download.savannah.nongnu.org/releases/libunwind/libunwind-1.6.2.tar.gz" [build] diff --git a/recipes/wip/net/analysis/wireshark/recipe.toml b/recipes/wip/net/analysis/wireshark/recipe.toml index b8071e5c8..81884587e 100644 --- a/recipes/wip/net/analysis/wireshark/recipe.toml +++ b/recipes/wip/net/analysis/wireshark/recipe.toml @@ -3,7 +3,7 @@ # build instructions: https://www.wireshark.org/docs/wsdg_html_chunked/ChSetupUNIX.html # build options: https://gitlab.com/wireshark/wireshark/-/blob/master/CMakeOptions.txt [source] -tar = "https://2.na.dl.wireshark.org/src/wireshark-4.6.5.tar.xz" +tar = "https://gitlab.com/wireshark/wireshark/-/archive/v4.7.4/wireshark-v4.7.4.tar.bz2" [build] template = "cmake" cmakeflags = [ From 003f6ce9d1e35fdfe9d53a6eec0b80499df9ae49 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Mon, 12 Oct 2026 11:01:56 -0300 Subject: [PATCH 39/63] Fix and update many more recipes --- recipes/wip/dev/ide/codelite/recipe.toml | 10 +++++----- recipes/wip/dev/ide/evcode/recipe.toml | 2 +- recipes/wip/dev/ide/rust-analyzer/recipe.toml | 3 ++- recipes/wip/dev/lang/blueprint/recipe.toml | 2 +- recipes/wip/dev/lang/brimstone/recipe.toml | 2 +- recipes/wip/dev/lang/gcl/recipe.toml | 2 +- recipes/wip/dev/lang/goiaba/recipe.toml | 2 +- recipes/wip/dev/lang/janet/recipe.toml | 2 +- recipes/wip/dev/lang/julia/recipe.toml | 8 +++++++- recipes/wip/dev/lang/lacc/recipe.toml | 3 ++- recipes/wip/dev/lang/micropython/recipe.toml | 5 ++--- recipes/wip/dev/lang/mono/recipe.toml | 3 ++- recipes/wip/dev/lang/r/recipe.toml | 2 +- recipes/wip/dev/lang/rhai/recipe.toml | 3 ++- recipes/wip/dev/lang/rilua/recipe.toml | 2 +- recipes/wip/dev/lang/ruby/recipe.toml | 2 +- recipes/wip/dev/lang/scc/recipe.toml | 13 ++++++++++++- recipes/wip/dev/lang/tcc/recipe.toml | 2 +- recipes/wip/dev/lang/tsuki/recipe.toml | 1 + recipes/wip/dev/lang/tur/recipe.toml | 12 ++++++------ recipes/wip/dev/lang/vala/recipe.toml | 8 ++------ recipes/wip/dev/lang/yasm/recipe.toml | 3 ++- recipes/wip/dev/patchers/hexpatch/recipe.toml | 1 + recipes/wip/dev/perf/flamelens/recipe.toml | 1 + recipes/wip/dev/perf/inferno/recipe.toml | 2 +- recipes/wip/dev/perf/redox-kprofiling/recipe.toml | 2 +- recipes/wip/dev/perf/samply/recipe.toml | 9 ++++----- recipes/wip/dev/perf/tracy/recipe.toml | 15 ++++++++++++++- recipes/wip/dev/perf/vkpeak/recipe.toml | 2 +- recipes/wip/libs/other/wxwidgets-gtk3/recipe.toml | 2 +- 30 files changed, 79 insertions(+), 47 deletions(-) diff --git a/recipes/wip/dev/ide/codelite/recipe.toml b/recipes/wip/dev/ide/codelite/recipe.toml index 85198778c..6af077a9d 100644 --- a/recipes/wip/dev/ide/codelite/recipe.toml +++ b/recipes/wip/dev/ide/codelite/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO fix wxwidgets-gtk3 dep #TODO discover minimum dependencies from cmake log # build instructions: https://docs.codelite.org/build/build_from_sources/#linux [source] @@ -7,8 +7,8 @@ rev = "18.3.0" shallow_clone = true [build] template = "cmake" -#dependencies = [ +dependencies = [ #"libssh", - #"sqlite3", - #"wxwidgets-gtk3", -#] + "sqlite3", + "wxwidgets-gtk3", +] diff --git a/recipes/wip/dev/ide/evcode/recipe.toml b/recipes/wip/dev/ide/evcode/recipe.toml index a87c72aad..682dea09f 100644 --- a/recipes/wip/dev/ide/evcode/recipe.toml +++ b/recipes/wip/dev/ide/evcode/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO compiled but untested [source] git = "https://github.com/poghdev/Evcode-ide" shallow_clone = true diff --git a/recipes/wip/dev/ide/rust-analyzer/recipe.toml b/recipes/wip/dev/ide/rust-analyzer/recipe.toml index a72dbe7da..d240e4f77 100644 --- a/recipes/wip/dev/ide/rust-analyzer/recipe.toml +++ b/recipes/wip/dev/ide/rust-analyzer/recipe.toml @@ -1,6 +1,7 @@ -#TODO not compiled or tested +#TODO compiled but untested [source] git = "https://github.com/rust-lang/rust-analyzer" +rev = "2026-05-25" shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/dev/lang/blueprint/recipe.toml b/recipes/wip/dev/lang/blueprint/recipe.toml index 747d6a5de..bcad93b04 100644 --- a/recipes/wip/dev/lang/blueprint/recipe.toml +++ b/recipes/wip/dev/lang/blueprint/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but untested [source] tar = "https://download.gnome.org/sources/blueprint-compiler/0.19/blueprint-compiler-0.19.0.tar.xz" [build] diff --git a/recipes/wip/dev/lang/brimstone/recipe.toml b/recipes/wip/dev/lang/brimstone/recipe.toml index ec3a6e499..0371defa7 100644 --- a/recipes/wip/dev/lang/brimstone/recipe.toml +++ b/recipes/wip/dev/lang/brimstone/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO tikv-jemalloc-sys crate error [source] git = "https://github.com/Hans-Halverson/brimstone" shallow_clone = true diff --git a/recipes/wip/dev/lang/gcl/recipe.toml b/recipes/wip/dev/lang/gcl/recipe.toml index 7b78f6182..da4531626 100644 --- a/recipes/wip/dev/lang/gcl/recipe.toml +++ b/recipes/wip/dev/lang/gcl/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO disable build tests # build instructions: https://cgit.git.savannah.gnu.org/cgit/gcl.git/tree/gcl/INSTALL [source] tar = "http://ftpmirror.gnu.org/gcl/gcl-2.7.1.tar.gz" diff --git a/recipes/wip/dev/lang/goiaba/recipe.toml b/recipes/wip/dev/lang/goiaba/recipe.toml index 234c137cb..e27a98bf0 100644 --- a/recipes/wip/dev/lang/goiaba/recipe.toml +++ b/recipes/wip/dev/lang/goiaba/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but untested [source] git = "https://github.com/raphamorim/goiaba" shallow_clone = true diff --git a/recipes/wip/dev/lang/janet/recipe.toml b/recipes/wip/dev/lang/janet/recipe.toml index f168fd6c6..b42765a33 100644 --- a/recipes/wip/dev/lang/janet/recipe.toml +++ b/recipes/wip/dev/lang/janet/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO compiled but untested [source] git = "https://github.com/janet-lang/janet" rev = "v1.42.1" diff --git a/recipes/wip/dev/lang/julia/recipe.toml b/recipes/wip/dev/lang/julia/recipe.toml index 51b86fafd..388a6f2ad 100644 --- a/recipes/wip/dev/lang/julia/recipe.toml +++ b/recipes/wip/dev/lang/julia/recipe.toml @@ -1,4 +1,4 @@ -#TODO missing script for gnu make: https://github.com/JuliaLang/julia#building-julia +#TODO fix openblas and libunwind deps #TODO missing dependencies: https://github.com/JuliaLang/julia/blob/master/doc/src/devdocs/build/build.md#required-build-tools-and-external-libraries [source] tar = "https://github.com/JuliaLang/julia/releases/download/v1.12.5/julia-1.12.5.tar.gz" @@ -16,3 +16,9 @@ dependencies = [ "openssl3", "libunwind", ] +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/dev/lang/lacc/recipe.toml b/recipes/wip/dev/lang/lacc/recipe.toml index 445575efa..50f647ca4 100644 --- a/recipes/wip/dev/lang/lacc/recipe.toml +++ b/recipes/wip/dev/lang/lacc/recipe.toml @@ -1,6 +1,7 @@ -#TODO not compiled or tested +#TODO missing files [source] git = "https://github.com/larmel/lacc" rev = "30839843daaff9d87574b5854854c9ee4610cdcd" +shallow_clone = true [build] template = "configure" diff --git a/recipes/wip/dev/lang/micropython/recipe.toml b/recipes/wip/dev/lang/micropython/recipe.toml index 86a15fd90..13e9748c7 100644 --- a/recipes/wip/dev/lang/micropython/recipe.toml +++ b/recipes/wip/dev/lang/micropython/recipe.toml @@ -1,5 +1,4 @@ #TODO compile and test -# probably wrong gnu make command # build instructions: # https://github.com/micropython/micropython#the-micropython-cross-compiler-mpy-cross # https://github.com/micropython/micropython/blob/master/ports/unix/README.md @@ -18,6 +17,6 @@ make -C ../../mpy-cross # build cross-compiler MAKEFLAGS=( VARIANT=minimal ) -"${COOKBOOK_MAKE}" install -j"$COOKBOOK_MAKE_JOBS" \ -"${MAKEFLAGS[@]}" DESTDIR="$COOKBOOK_STAGE/usr" +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" "${MAKEFLAGS[@]}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" """ diff --git a/recipes/wip/dev/lang/mono/recipe.toml b/recipes/wip/dev/lang/mono/recipe.toml index 9aefc5e6a..bd3f5fb8f 100644 --- a/recipes/wip/dev/lang/mono/recipe.toml +++ b/recipes/wip/dev/lang/mono/recipe.toml @@ -1,5 +1,6 @@ -#TODO can't recognize the redox target +#TODO build and test [source] tar = "https://dl.winehq.org/mono/sources/mono/mono-6.14.1.tar.xz" +script = "GNU_CONFIG_GET config.sub" [build] template = "configure" diff --git a/recipes/wip/dev/lang/r/recipe.toml b/recipes/wip/dev/lang/r/recipe.toml index c1b0b8dbd..9737aa210 100644 --- a/recipes/wip/dev/lang/r/recipe.toml +++ b/recipes/wip/dev/lang/r/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO enable gcc fortran frontend # build instructions: https://cran.r-project.org/doc/manuals/r-release/R-admin.html#Installing-R-under-Unix_002dalikes [source] tar = "https://cloud.r-project.org/src/base/R-4/R-4.5.3.tar.gz" diff --git a/recipes/wip/dev/lang/rhai/recipe.toml b/recipes/wip/dev/lang/rhai/recipe.toml index 71ed73c39..2f0ff5582 100644 --- a/recipes/wip/dev/lang/rhai/recipe.toml +++ b/recipes/wip/dev/lang/rhai/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO compiled but untested [source] git = "https://github.com/rhaiscript/rhai" shallow_clone = true @@ -7,6 +7,7 @@ template = "custom" script = """ DYNAMIC_INIT cookbook_cargo +COOKBOOK_CARGO_FLAGS=() cookbook_cargo_examples hello mkdir -pv "${COOKBOOK_STAGE}/usr/share/rhai" cp -rv "${COOKBOOK_SOURCE}"/scripts/* "${COOKBOOK_STAGE}/usr/share/rhai" diff --git a/recipes/wip/dev/lang/rilua/recipe.toml b/recipes/wip/dev/lang/rilua/recipe.toml index 7695aadf7..b780502b6 100644 --- a/recipes/wip/dev/lang/rilua/recipe.toml +++ b/recipes/wip/dev/lang/rilua/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO can't find stdin, stdout and stderr values [source] git = "https://github.com/wowemulation-dev/rilua" shallow_clone = true diff --git a/recipes/wip/dev/lang/ruby/recipe.toml b/recipes/wip/dev/lang/ruby/recipe.toml index dab053048..4107090fc 100644 --- a/recipes/wip/dev/lang/ruby/recipe.toml +++ b/recipes/wip/dev/lang/ruby/recipe.toml @@ -1,4 +1,4 @@ -#TODO compilation error +#TODO invalid application of 'sizeof' to incomplete type 'struct crypt_data' [source] tar = "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.tar.gz" [build] diff --git a/recipes/wip/dev/lang/scc/recipe.toml b/recipes/wip/dev/lang/scc/recipe.toml index 9e681b4e4..7fb6ddf3a 100644 --- a/recipes/wip/dev/lang/scc/recipe.toml +++ b/recipes/wip/dev/lang/scc/recipe.toml @@ -1,9 +1,20 @@ -#TODO missing script for gnu make +#TODO build and test +#TODO add command for installation # build instructions: https://git.simple-cc.org/scc/file/README.html [source] git = "https://git.simple-cc.org/scc/" rev = "1ed0ff0000999561feee336c289252faf2502a7e" +shallow_clone = true [build] template = "custom" [package] dependencies = ["qbe"] +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +MAKEFLAGS=( + CONF=$(gcc -dumpmachine) + CROSS_COMPILE=$TARGET +) +"${COOKBOOK_MAKE}" config -j "${COOKBOOK_MAKE_JOBS}" "${MAKEFLAGS[@]}" +""" diff --git a/recipes/wip/dev/lang/tcc/recipe.toml b/recipes/wip/dev/lang/tcc/recipe.toml index 76ca73072..f0faa7507 100644 --- a/recipes/wip/dev/lang/tcc/recipe.toml +++ b/recipes/wip/dev/lang/tcc/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO add cross-compilation flags # build instructions: https://repo.or.cz/tinycc.git/blob/HEAD:/README [source] tar = "https://download.savannah.nongnu.org/releases/tinycc/tcc-0.9.27.tar.bz2" diff --git a/recipes/wip/dev/lang/tsuki/recipe.toml b/recipes/wip/dev/lang/tsuki/recipe.toml index 6bc68d737..0a2c55cec 100644 --- a/recipes/wip/dev/lang/tsuki/recipe.toml +++ b/recipes/wip/dev/lang/tsuki/recipe.toml @@ -4,3 +4,4 @@ git = "https://github.com/ultimaweapon/tsuki" shallow_clone = true [build] template = "cargo" +cargoflags = ["--bench lua"] diff --git a/recipes/wip/dev/lang/tur/recipe.toml b/recipes/wip/dev/lang/tur/recipe.toml index 9371088e6..21d54ffcd 100644 --- a/recipes/wip/dev/lang/tur/recipe.toml +++ b/recipes/wip/dev/lang/tur/recipe.toml @@ -1,10 +1,10 @@ -#TODO not compiled or tested +#TODO compiled but untested [source] git = "https://github.com/rezigned/tur" shallow_clone = true [build] -template = "custom" -script = """ -DYNAMIC_INIT -cookbook_cargo_packages tur-cli tur-tui -""" +template = "cargo" +cargopackages = [ + "tur-cli", + "tur-tui", +] diff --git a/recipes/wip/dev/lang/vala/recipe.toml b/recipes/wip/dev/lang/vala/recipe.toml index e4201edd1..38d7f064d 100644 --- a/recipes/wip/dev/lang/vala/recipe.toml +++ b/recipes/wip/dev/lang/vala/recipe.toml @@ -1,14 +1,10 @@ -#TODO not compiled or tested +#TODO Unable to retrieve girdir from gobject-introspection-1.0.pc #TODO require bootstraping from another vala compiler # build instructions: https://gitlab.gnome.org/GNOME/vala#building-vala [source] tar = "https://download.gnome.org/sources/vala/0.56/vala-0.56.18.tar.xz" [build] -template = "custom" +template = "configure" dependencies = [ "glib", ] -script = """ -DYNAMIC_INIT -cookbook_configure -""" diff --git a/recipes/wip/dev/lang/yasm/recipe.toml b/recipes/wip/dev/lang/yasm/recipe.toml index 7d8f1e8a7..4143b4bb6 100644 --- a/recipes/wip/dev/lang/yasm/recipe.toml +++ b/recipes/wip/dev/lang/yasm/recipe.toml @@ -1,5 +1,6 @@ -#TODO not compiled or tested +#TODO compiled but untested [source] tar = "https://github.com/yasm/yasm/releases/download/v1.3.0/yasm-1.3.0.tar.gz" +script = "GNU_CONFIG_GET config/config.sub" [build] template = "configure" diff --git a/recipes/wip/dev/patchers/hexpatch/recipe.toml b/recipes/wip/dev/patchers/hexpatch/recipe.toml index 5c3086689..14fdefd15 100644 --- a/recipes/wip/dev/patchers/hexpatch/recipe.toml +++ b/recipes/wip/dev/patchers/hexpatch/recipe.toml @@ -1,5 +1,6 @@ #TODO mlua-sys crate error [source] git = "https://github.com/Etto48/HexPatch" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/dev/perf/flamelens/recipe.toml b/recipes/wip/dev/perf/flamelens/recipe.toml index be939a750..09bdcc9c6 100644 --- a/recipes/wip/dev/perf/flamelens/recipe.toml +++ b/recipes/wip/dev/perf/flamelens/recipe.toml @@ -1,5 +1,6 @@ #TODO compiled but not tested [source] git = "https://github.com/YS-L/flamelens" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/dev/perf/inferno/recipe.toml b/recipes/wip/dev/perf/inferno/recipe.toml index cf8155a4e..ab6842992 100644 --- a/recipes/wip/dev/perf/inferno/recipe.toml +++ b/recipes/wip/dev/perf/inferno/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but untested [source] git = "https://github.com/jonhoo/inferno" shallow_clone = true diff --git a/recipes/wip/dev/perf/redox-kprofiling/recipe.toml b/recipes/wip/dev/perf/redox-kprofiling/recipe.toml index d8487559e..b803c1b3f 100644 --- a/recipes/wip/dev/perf/redox-kprofiling/recipe.toml +++ b/recipes/wip/dev/perf/redox-kprofiling/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but untested [source] git = "https://gitlab.redox-os.org/redox-os/kprofiling" shallow_clone = true diff --git a/recipes/wip/dev/perf/samply/recipe.toml b/recipes/wip/dev/perf/samply/recipe.toml index cbef16b25..23582b7fc 100644 --- a/recipes/wip/dev/perf/samply/recipe.toml +++ b/recipes/wip/dev/perf/samply/recipe.toml @@ -1,8 +1,7 @@ -#TODO not compiled or tested +#TODO very outdated fs4 crate [source] git = "https://github.com/mstange/samply" +shallow_clone = true [build] -template = "custom" -script = """ -cookbook_cargo_packages samply -""" +template = "cargo" +cargopackages = ["samply"] diff --git a/recipes/wip/dev/perf/tracy/recipe.toml b/recipes/wip/dev/perf/tracy/recipe.toml index 292a29a96..c8eead93f 100644 --- a/recipes/wip/dev/perf/tracy/recipe.toml +++ b/recipes/wip/dev/perf/tracy/recipe.toml @@ -1,7 +1,8 @@ -#TODO missing script for gnu make: https://github.com/wolfpld/tracy/releases/latest/download/tracy.pdf +#TODO build and test [source] git = "https://github.com/wolfpld/tracy" rev = "v0.13.0" +shallow_clone = true [build] template = "custom" dependencies = [ @@ -10,3 +11,15 @@ dependencies = [ "dbus", "capstone", ] +script = """ +DYNAMIC_INIT +#cd "${COOKBOOK_SOURCE}/capture" +#cookbook_cmake # build once the profiler works +cd "${COOKBOOK_SOURCE}/profiler" +COOKBOOK_CMAKE_FLAGS+=( + -DNO_FILESELECTOR=ON + -DLEGACY=ON + -DSELF_PROFILE=ON +) +cookbook_cmake +""" diff --git a/recipes/wip/dev/perf/vkpeak/recipe.toml b/recipes/wip/dev/perf/vkpeak/recipe.toml index 648645555..5d156fb31 100644 --- a/recipes/wip/dev/perf/vkpeak/recipe.toml +++ b/recipes/wip/dev/perf/vkpeak/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO fix libvulkan # build instructions: https://github.com/nihui/vkpeak#build-from-source [source] git = "https://github.com/nihui/vkpeak" diff --git a/recipes/wip/libs/other/wxwidgets-gtk3/recipe.toml b/recipes/wip/libs/other/wxwidgets-gtk3/recipe.toml index 710c98871..988537d12 100644 --- a/recipes/wip/libs/other/wxwidgets-gtk3/recipe.toml +++ b/recipes/wip/libs/other/wxwidgets-gtk3/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO unrecognized options: --disable-static # build instructions: https://github.com/wxWidgets/wxWidgets/blob/master/docs/gtk/install.md [source] tar = "https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.4/wxWidgets-3.2.4.tar.bz2" From b447343350385f6aa00c2031ad111e72a1082334 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Mon, 12 Oct 2026 16:17:42 -0300 Subject: [PATCH 40/63] Fix and update many more recipes, and remove unnecessary recipes --- recipes/wip/bench/bencher/recipe.toml | 10 +++++++--- recipes/wip/bench/fearless-simd/recipe.toml | 4 ++-- recipes/wip/bench/hpc/hpcg/recipe.toml | 8 ++++++-- recipes/wip/bench/hpc/minibude/recipe.toml | 5 +++-- recipes/wip/bench/hyperfine/recipe.toml | 2 +- recipes/wip/bench/io/blogbench/recipe.toml | 2 +- recipes/wip/bench/io/fio/recipe.toml | 5 ++++- recipes/wip/bench/io/simple-disk-benchmark/recipe.toml | 2 +- recipes/wip/bench/jasonisnthappy/recipe.toml | 2 +- recipes/wip/bench/nanobench/recipe.toml | 10 +++++++++- recipes/wip/bench/rayon/recipe.toml | 2 +- recipes/wip/bench/rodinia/recipe.toml | 8 +++++++- recipes/wip/bench/rpc-perf/recipe.toml | 3 ++- recipes/wip/bench/rsb/recipe.toml | 3 ++- recipes/wip/bench/stress-ng/recipe.toml | 8 +++++++- recipes/wip/bench/suite/pts/recipe.toml | 2 +- recipes/wip/dev/other/lurk/recipe.toml | 3 ++- recipes/wip/dev/perf/vkpeak/recipe.toml | 2 +- recipes/wip/dev/proofs/cvc5/recipe.toml | 3 ++- recipes/wip/dev/proofs/z3/recipe.toml | 2 +- recipes/wip/dev/rust-tools/clippy/recipe.toml | 6 ------ recipes/wip/dev/rust-tools/crater/recipe.toml | 2 +- recipes/wip/dev/rust-tools/diplomat/recipe.toml | 7 +++++-- recipes/wip/dev/rust-tools/dylint/recipe.toml | 2 +- recipes/wip/dev/rust-tools/evcxr-jupyter/recipe.toml | 2 +- recipes/wip/dev/rust-tools/evcxr-repl/recipe.toml | 2 +- recipes/wip/dev/rust-tools/miri/recipe.toml | 6 ------ recipes/wip/dev/rust-tools/rust-glancer/recipe.toml | 2 +- recipes/wip/dev/rust-tools/rustfmt/recipe.toml | 6 ------ recipes/wip/dev/rust-tools/rustup/recipe.toml | 2 +- recipes/wip/dev/rust-tools/sccache/recipe.toml | 7 +++---- recipes/wip/dev/rust-tools/scriptisto/recipe.toml | 2 +- recipes/wip/edu/bibiman/recipe.toml | 2 +- recipes/wip/edu/hacker-laws/recipe.toml | 1 + recipes/wip/edu/nanocore/recipe.toml | 2 ++ recipes/wip/edu/rustlings/recipe.toml | 1 + recipes/wip/edu/rusty-tape/recipe.toml | 4 +++- 37 files changed, 84 insertions(+), 58 deletions(-) delete mode 100644 recipes/wip/dev/rust-tools/clippy/recipe.toml delete mode 100644 recipes/wip/dev/rust-tools/miri/recipe.toml delete mode 100644 recipes/wip/dev/rust-tools/rustfmt/recipe.toml diff --git a/recipes/wip/bench/bencher/recipe.toml b/recipes/wip/bench/bencher/recipe.toml index e58099dea..2974a0e73 100644 --- a/recipes/wip/bench/bencher/recipe.toml +++ b/recipes/wip/bench/bencher/recipe.toml @@ -1,8 +1,12 @@ -#TODO compile and test +#TODO compiled but untested +#TODO add command for installation # self-hosted documentation: https://bencher.dev/docs/explanation/bencher-self-hosted/ [source] git = "https://github.com/bencherdev/bencher" shallow_clone = true [build] -template = "cargo" -cargopackages = ["bencher_cli"] +template = "custom" +script = """ +DYNAMIC_INIT +cookbook_cargo_packages bencher_cli +""" diff --git a/recipes/wip/bench/fearless-simd/recipe.toml b/recipes/wip/bench/fearless-simd/recipe.toml index dd7af0cc9..21f4dde5a 100644 --- a/recipes/wip/bench/fearless-simd/recipe.toml +++ b/recipes/wip/bench/fearless-simd/recipe.toml @@ -1,10 +1,10 @@ -#TODO compile and test +#TODO compiled but untested [source] git = "https://github.com/linebender/fearless_simd" shallow_clone = true [build] template = "cargo" -cargopath = "fearless_simd/examples" +cargopath = "fearless_simd" cargoexamples = [ "sigmoid", "sigmoid_generic", diff --git a/recipes/wip/bench/hpc/hpcg/recipe.toml b/recipes/wip/bench/hpc/hpcg/recipe.toml index ce49a0c58..52426d740 100644 --- a/recipes/wip/bench/hpc/hpcg/recipe.toml +++ b/recipes/wip/bench/hpc/hpcg/recipe.toml @@ -1,6 +1,10 @@ -#TODO not compiled or tested +#TODO ninja error: unknown target 'install' [source] git = "https://github.com/hpcg-benchmark/hpcg" shallow_clone = true [build] -template = "cmake" +template = "custom" +script = """ +DYNAMIC_INIT +cookbook_cmake +""" diff --git a/recipes/wip/bench/hpc/minibude/recipe.toml b/recipes/wip/bench/hpc/minibude/recipe.toml index b63b712dc..11f8dfafb 100644 --- a/recipes/wip/bench/hpc/minibude/recipe.toml +++ b/recipes/wip/bench/hpc/minibude/recipe.toml @@ -1,6 +1,7 @@ -#TODO missing script for gnu make: https://github.com/UoB-HPC/miniBUDE#building +#TODO build and test +#TODO does a model need to be chosen?: https://github.com/UoB-HPC/miniBUDE#building [source] git = "https://github.com/UoB-HPC/miniBUDE" shallow_clone = true [build] -template = "custom" +template = "cmake" diff --git a/recipes/wip/bench/hyperfine/recipe.toml b/recipes/wip/bench/hyperfine/recipe.toml index 4b963663f..b30b9b3d1 100644 --- a/recipes/wip/bench/hyperfine/recipe.toml +++ b/recipes/wip/bench/hyperfine/recipe.toml @@ -1,4 +1,4 @@ -#TODO libc::RUSAGE_CHILDREN +#TODO cannot find function `wait4` in crate `libc` [source] git = "https://github.com/sharkdp/hyperfine" shallow_clone = true diff --git a/recipes/wip/bench/io/blogbench/recipe.toml b/recipes/wip/bench/io/blogbench/recipe.toml index 836166900..6a4b72139 100644 --- a/recipes/wip/bench/io/blogbench/recipe.toml +++ b/recipes/wip/bench/io/blogbench/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO syntax error near unexpected token `newline' # build instructions: https://github.com/jedisct1/Blogbench/blob/master/README#L18 [source] tar = "https://github.com/jedisct1/Blogbench/releases/download/1.2/blogbench-1.2.tar.bz2" diff --git a/recipes/wip/bench/io/fio/recipe.toml b/recipes/wip/bench/io/fio/recipe.toml index eb41050c4..ef6f29606 100644 --- a/recipes/wip/bench/io/fio/recipe.toml +++ b/recipes/wip/bench/io/fio/recipe.toml @@ -1,7 +1,10 @@ -#TODO configuration problem +#TODO bad configure options [source] git = "https://github.com/axboe/fio" rev = "fio-3.41" shallow_clone = true [build] template = "configure" +configureflags = [ + "--disable-native", +] diff --git a/recipes/wip/bench/io/simple-disk-benchmark/recipe.toml b/recipes/wip/bench/io/simple-disk-benchmark/recipe.toml index 4fe40d717..4aba8fc1f 100644 --- a/recipes/wip/bench/io/simple-disk-benchmark/recipe.toml +++ b/recipes/wip/bench/io/simple-disk-benchmark/recipe.toml @@ -1,6 +1,6 @@ #TODO source code error [source] -git = "https://github.com/schwa/simple-disk-benchmark-rs" +git = "https://github.com/isan-Ethen/simple-disk-benchmark-rs" shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/bench/jasonisnthappy/recipe.toml b/recipes/wip/bench/jasonisnthappy/recipe.toml index 1c1d91b1b..22aaaf848 100644 --- a/recipes/wip/bench/jasonisnthappy/recipe.toml +++ b/recipes/wip/bench/jasonisnthappy/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO port fs2 crate [source] git = "https://github.com/sohzm/jasonisnthappy" shallow_clone = true diff --git a/recipes/wip/bench/nanobench/recipe.toml b/recipes/wip/bench/nanobench/recipe.toml index a54415f7d..21eecc515 100644 --- a/recipes/wip/bench/nanobench/recipe.toml +++ b/recipes/wip/bench/nanobench/recipe.toml @@ -1,4 +1,7 @@ -#TODO build the userspace implementation: https://github.com/andreas-abel/nanoBench#user-space-version +# userspace implementation: https://github.com/andreas-abel/nanoBench#user-space-version +#TODO build and test +#TODO add command for installation +#TODO package msr-tools: https://01.org/sites/default/files/downloads/msr-tools/msr-tools-1.3.zip [source] git = "https://github.com/andreas-abel/nanoBench" rev = "36c077fd30db11e8c83cedfcb58daa505d1d0b12" @@ -9,3 +12,8 @@ template = "custom" dependencies = [ "python312", ] +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" user -j "${COOKBOOK_MAKE_JOBS}" +""" diff --git a/recipes/wip/bench/rayon/recipe.toml b/recipes/wip/bench/rayon/recipe.toml index 99a82f714..754d54316 100644 --- a/recipes/wip/bench/rayon/recipe.toml +++ b/recipes/wip/bench/rayon/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO glutin crate error [source] git = "https://github.com/rayon-rs/rayon" shallow_clone = true diff --git a/recipes/wip/bench/rodinia/recipe.toml b/recipes/wip/bench/rodinia/recipe.toml index 460e2dfd2..23840b7a1 100644 --- a/recipes/wip/bench/rodinia/recipe.toml +++ b/recipes/wip/bench/rodinia/recipe.toml @@ -1,5 +1,11 @@ -#TODO missing script for gnu make, build the openmp (cpu backend?) or opencl implementation +#TODO build and test [source] tar = "http://www.cs.virginia.edu/~skadron/lava/rodinia/Packages/rodinia_3.1.tar.bz2" [build] template = "custom" +dependencies = ["openmp"] +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" OMP -j "${COOKBOOK_MAKE_JOBS}" +""" diff --git a/recipes/wip/bench/rpc-perf/recipe.toml b/recipes/wip/bench/rpc-perf/recipe.toml index 85678820c..d1d9571e4 100644 --- a/recipes/wip/bench/rpc-perf/recipe.toml +++ b/recipes/wip/bench/rpc-perf/recipe.toml @@ -1,4 +1,5 @@ -#TODO not compiled or tested +#TODO outdated metriken-core crate +#TODO metriken-core crate error: distributed_slice is not implemented for this platform [source] git = "https://github.com/iopsystems/rpc-perf" shallow_clone = true diff --git a/recipes/wip/bench/rsb/recipe.toml b/recipes/wip/bench/rsb/recipe.toml index f065b7c8d..3eb41f4ae 100644 --- a/recipes/wip/bench/rsb/recipe.toml +++ b/recipes/wip/bench/rsb/recipe.toml @@ -1,6 +1,7 @@ -#TODO not compiled or tested +#TODO openssl-sys crate error, make it use openssl3 recipe [source] git = "https://github.com/gamelife1314/rsb" shallow_clone = true [build] template = "cargo" +dependencies = ["openssl3"] diff --git a/recipes/wip/bench/stress-ng/recipe.toml b/recipes/wip/bench/stress-ng/recipe.toml index eba47cd9c..783783bd3 100644 --- a/recipes/wip/bench/stress-ng/recipe.toml +++ b/recipes/wip/bench/stress-ng/recipe.toml @@ -1,4 +1,4 @@ -#TODO missing script for gnu make: https://github.com/ColinIanKing/stress-ng#building-stress-ng +#TODO build and test #TODO determine minimum dependencies [source] git = "https://github.com/ColinIanKing/stress-ng" @@ -19,3 +19,9 @@ template = "custom" # "zlib", # "mesa", #] +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/bench/suite/pts/recipe.toml b/recipes/wip/bench/suite/pts/recipe.toml index 854a2e92b..47bac2719 100644 --- a/recipes/wip/bench/suite/pts/recipe.toml +++ b/recipes/wip/bench/suite/pts/recipe.toml @@ -1,4 +1,4 @@ -#TODO figure out the installation script - https://github.com/phoronix-test-suite/phoronix-test-suite +#TODO test [source] git = "https://github.com/phoronix-test-suite/phoronix-test-suite" shallow_clone = true diff --git a/recipes/wip/dev/other/lurk/recipe.toml b/recipes/wip/dev/other/lurk/recipe.toml index a94e58fea..edc1d701a 100644 --- a/recipes/wip/dev/other/lurk/recipe.toml +++ b/recipes/wip/dev/other/lurk/recipe.toml @@ -1,5 +1,6 @@ -#TODO users crate error +#TODO build error [source] git = "https://github.com/JakWai01/lurk" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/dev/perf/vkpeak/recipe.toml b/recipes/wip/dev/perf/vkpeak/recipe.toml index 5d156fb31..fd287dfbe 100644 --- a/recipes/wip/dev/perf/vkpeak/recipe.toml +++ b/recipes/wip/dev/perf/vkpeak/recipe.toml @@ -1,4 +1,4 @@ -#TODO fix libvulkan +#TODO fix libvulkan dep # build instructions: https://github.com/nihui/vkpeak#build-from-source [source] git = "https://github.com/nihui/vkpeak" diff --git a/recipes/wip/dev/proofs/cvc5/recipe.toml b/recipes/wip/dev/proofs/cvc5/recipe.toml index c806232af..cbed6289d 100644 --- a/recipes/wip/dev/proofs/cvc5/recipe.toml +++ b/recipes/wip/dev/proofs/cvc5/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO GMP-EP-stamp bundled dep can't find cross-compiler #TODO run configure.sh or cmake directly? # build instructions: https://github.com/cvc5/cvc5/blob/main/INSTALL.rst [source] @@ -8,6 +8,7 @@ shallow_clone = true [build] template = "cmake" cmakeflags = [ + "-DCMAKE_BUILD_TYPE=Production", "-DENABLE_AUTO_DOWNLOAD=ON", ] dependencies = [ diff --git a/recipes/wip/dev/proofs/z3/recipe.toml b/recipes/wip/dev/proofs/z3/recipe.toml index cf5a57613..5585aa409 100644 --- a/recipes/wip/dev/proofs/z3/recipe.toml +++ b/recipes/wip/dev/proofs/z3/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO inconsistent types 'unsigned int' and 'long int' deduced for lambda return type # build instructions: https://github.com/Z3Prover/z3/blob/master/README-CMake.md [source] git = "https://github.com/Z3Prover/z3" diff --git a/recipes/wip/dev/rust-tools/clippy/recipe.toml b/recipes/wip/dev/rust-tools/clippy/recipe.toml deleted file mode 100644 index fbd5cd626..000000000 --- a/recipes/wip/dev/rust-tools/clippy/recipe.toml +++ /dev/null @@ -1,6 +0,0 @@ -#TODO camino crate error -[source] -git = "https://github.com/rust-lang/rust-clippy" -shallow_clone = true -[build] -template = "cargo" diff --git a/recipes/wip/dev/rust-tools/crater/recipe.toml b/recipes/wip/dev/rust-tools/crater/recipe.toml index ffa50737c..a859f0e51 100644 --- a/recipes/wip/dev/rust-tools/crater/recipe.toml +++ b/recipes/wip/dev/rust-tools/crater/recipe.toml @@ -1,4 +1,4 @@ -#TODO camino crate error +#TODO fs_at crate error: add a redox cfg to avoid openat64 linux syscall being used [source] git = "https://github.com/rust-lang/crater" shallow_clone = true diff --git a/recipes/wip/dev/rust-tools/diplomat/recipe.toml b/recipes/wip/dev/rust-tools/diplomat/recipe.toml index d40549065..e9168869c 100644 --- a/recipes/wip/dev/rust-tools/diplomat/recipe.toml +++ b/recipes/wip/dev/rust-tools/diplomat/recipe.toml @@ -3,5 +3,8 @@ git = "https://github.com/rust-diplomat/diplomat" shallow_clone = true [build] -template = "cargo" -cargopackages = ["diplomat"] +template = "custom" +script = """ +DYNAMIC_INIT +cookbook_cargo_packages diplomat +""" diff --git a/recipes/wip/dev/rust-tools/dylint/recipe.toml b/recipes/wip/dev/rust-tools/dylint/recipe.toml index f99ead2e9..50e967d72 100644 --- a/recipes/wip/dev/rust-tools/dylint/recipe.toml +++ b/recipes/wip/dev/rust-tools/dylint/recipe.toml @@ -1,4 +1,4 @@ -#TODO cargo-util crate error +#TODO compiled but untested [source] git = "https://github.com/trailofbits/dylint" shallow_clone = true diff --git a/recipes/wip/dev/rust-tools/evcxr-jupyter/recipe.toml b/recipes/wip/dev/rust-tools/evcxr-jupyter/recipe.toml index 5192bb287..97ea7defd 100644 --- a/recipes/wip/dev/rust-tools/evcxr-jupyter/recipe.toml +++ b/recipes/wip/dev/rust-tools/evcxr-jupyter/recipe.toml @@ -1,4 +1,4 @@ -#TODO camino crate error +#TODO sig crate error: cannot find value `SIGPOLL` in crate `libc` [source] git = "https://github.com/evcxr/evcxr" shallow_clone = true diff --git a/recipes/wip/dev/rust-tools/evcxr-repl/recipe.toml b/recipes/wip/dev/rust-tools/evcxr-repl/recipe.toml index ed246c3ff..372ed570f 100644 --- a/recipes/wip/dev/rust-tools/evcxr-repl/recipe.toml +++ b/recipes/wip/dev/rust-tools/evcxr-repl/recipe.toml @@ -1,4 +1,4 @@ -#TODO camino crate error +#TODO sig crate error: cannot find value `SIGPOLL` in crate `libc` [source] git = "https://github.com/evcxr/evcxr" shallow_clone = true diff --git a/recipes/wip/dev/rust-tools/miri/recipe.toml b/recipes/wip/dev/rust-tools/miri/recipe.toml deleted file mode 100644 index db20e0cae..000000000 --- a/recipes/wip/dev/rust-tools/miri/recipe.toml +++ /dev/null @@ -1,6 +0,0 @@ -#TODO not compiled or tested -[source] -git = "https://github.com/rust-lang/miri" -shallow_clone = true -[build] -template = "cargo" diff --git a/recipes/wip/dev/rust-tools/rust-glancer/recipe.toml b/recipes/wip/dev/rust-tools/rust-glancer/recipe.toml index fba594e8e..167d22e3c 100644 --- a/recipes/wip/dev/rust-tools/rust-glancer/recipe.toml +++ b/recipes/wip/dev/rust-tools/rust-glancer/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO outdated crates [source] git = "https://github.com/rust-glancer/rust-glancer" shallow_clone = true diff --git a/recipes/wip/dev/rust-tools/rustfmt/recipe.toml b/recipes/wip/dev/rust-tools/rustfmt/recipe.toml deleted file mode 100644 index 12d739b3c..000000000 --- a/recipes/wip/dev/rust-tools/rustfmt/recipe.toml +++ /dev/null @@ -1,6 +0,0 @@ -#TODO serde crate error (after cargo update) -[source] -git = "https://github.com/rust-lang/rustfmt" -shallow_clone = true -[build] -template = "cargo" diff --git a/recipes/wip/dev/rust-tools/rustup/recipe.toml b/recipes/wip/dev/rust-tools/rustup/recipe.toml index a21ea7eb1..6c15d4789 100644 --- a/recipes/wip/dev/rust-tools/rustup/recipe.toml +++ b/recipes/wip/dev/rust-tools/rustup/recipe.toml @@ -1,4 +1,4 @@ -#TODO serde crate error +#TODO fs_at crate error: add a redox cfg to avoid openat64 linux syscall being used [source] git = "https://github.com/rust-lang/rustup" shallow_clone = true diff --git a/recipes/wip/dev/rust-tools/sccache/recipe.toml b/recipes/wip/dev/rust-tools/sccache/recipe.toml index 039aff7e6..9cd4b7842 100644 --- a/recipes/wip/dev/rust-tools/sccache/recipe.toml +++ b/recipes/wip/dev/rust-tools/sccache/recipe.toml @@ -1,9 +1,8 @@ -#TODO libc error +#TODO compiled but untested [source] git = "https://github.com/mozilla/sccache" shallow_clone = true [build] template = "cargo" -dependencies = [ - "openssl3", -] +cargoflags = ["--no-default-features"] +#dependencies = ["openssl3"] # do we need a feature flag that need it? diff --git a/recipes/wip/dev/rust-tools/scriptisto/recipe.toml b/recipes/wip/dev/rust-tools/scriptisto/recipe.toml index 202dbcf78..ab19c77db 100644 --- a/recipes/wip/dev/rust-tools/scriptisto/recipe.toml +++ b/recipes/wip/dev/rust-tools/scriptisto/recipe.toml @@ -1,4 +1,4 @@ -#TODO users crate error +#TODO liberrno linking error: undefined reference to `errno_location' [source] git = "https://github.com/igor-petruk/scriptisto" shallow_clone = true diff --git a/recipes/wip/edu/bibiman/recipe.toml b/recipes/wip/edu/bibiman/recipe.toml index 29cbe8f55..c9cf7c046 100644 --- a/recipes/wip/edu/bibiman/recipe.toml +++ b/recipes/wip/edu/bibiman/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but untested [source] git = "https://codeberg.org/lukeflo/bibiman" [build] diff --git a/recipes/wip/edu/hacker-laws/recipe.toml b/recipes/wip/edu/hacker-laws/recipe.toml index 1d9fbcbb2..3feae08b9 100644 --- a/recipes/wip/edu/hacker-laws/recipe.toml +++ b/recipes/wip/edu/hacker-laws/recipe.toml @@ -1,6 +1,7 @@ #TODO not tested [source] git = "https://github.com/dwmkerr/hacker-laws" +shallow_clone = true [build] template = "custom" script = """ diff --git a/recipes/wip/edu/nanocore/recipe.toml b/recipes/wip/edu/nanocore/recipe.toml index f0d9ad828..8f2008883 100644 --- a/recipes/wip/edu/nanocore/recipe.toml +++ b/recipes/wip/edu/nanocore/recipe.toml @@ -1,9 +1,11 @@ #TODO not compiled or tested [source] git = "https://github.com/AfaanBilal/NanoCore" +shallow_clone = true [build] template = "custom" script = """ +DYNAMIC_INIT cookbook_cargo mkdir -pv "${COOKBOOK_STAGE}/usr/share/nanocore" cp -rv "${COOKBOOK_SOURCE}"/programs/* "${COOKBOOK_STAGE}/usr/share/nanocore" diff --git a/recipes/wip/edu/rustlings/recipe.toml b/recipes/wip/edu/rustlings/recipe.toml index 0d335328f..582acdb8f 100644 --- a/recipes/wip/edu/rustlings/recipe.toml +++ b/recipes/wip/edu/rustlings/recipe.toml @@ -1,5 +1,6 @@ #TODO compiled but not tested (after cargo update) [source] git = "https://github.com/rust-lang/rustlings" +shallow_clone = true [build] template = "cargo" diff --git a/recipes/wip/edu/rusty-tape/recipe.toml b/recipes/wip/edu/rusty-tape/recipe.toml index f6c71a5ab..b1776aa7d 100644 --- a/recipes/wip/edu/rusty-tape/recipe.toml +++ b/recipes/wip/edu/rusty-tape/recipe.toml @@ -1,10 +1,12 @@ #TODO compiled but not tested [source] git = "https://github.com/Kkobarii/Rusty-Tape" +shallow_clone = true [build] template = "custom" script = """ +DYNAMIC_INIT +cookbook_cargo mkdir -pv "${COOKBOOK_STAGE}"/usr/share/rusty-tape cp -rv "${COOKBOOK_SOURCE}"/data/* "${COOKBOOK_STAGE}"/usr/share/rusty-tape -cookbook_cargo """ From b133e5cbc18ea021dbf54e9b56e7d7a15dc986da Mon Sep 17 00:00:00 2001 From: Ribbon Date: Mon, 12 Oct 2026 16:58:46 -0300 Subject: [PATCH 41/63] Move many wip recipes --- recipes/wip/dev/{other => debug}/lurk/recipe.toml | 0 recipes/wip/{net/server => games/servers}/spadesx/recipe.toml | 0 recipes/wip/libs/{other => fs}/libfuse2/recipe.toml | 0 recipes/wip/libs/{other => fs}/libfuse3/recipe.toml | 0 recipes/wip/libs/{other => graphics}/freealut/recipe.toml | 0 recipes/wip/libs/{other => graphics}/freeglut/recipe.toml | 0 recipes/wip/libs/{other => graphics}/freeglut/redox.patch | 0 recipes/wip/libs/{other => graphics}/glew/recipe.toml | 0 recipes/wip/libs/{other => graphics}/glfw3/recipe.toml | 0 recipes/wip/libs/{other => graphics}/libglvnd/recipe.toml | 0 recipes/wip/libs/{other => graphics}/oidn/recipe.toml | 0 recipes/wip/libs/{other => graphics}/openxr/recipe.toml | 0 recipes/wip/libs/{other => graphics}/projectm/recipe.toml | 0 recipes/wip/libs/{other => graphics}/slang/recipe.toml | 0 recipes/wip/libs/{other => gui}/imlib2/recipe.toml | 0 recipes/wip/libs/{other => gui}/imlib2/redox.patch | 0 recipes/wip/libs/{other => gui}/wxpython/recipe.toml | 0 recipes/wip/libs/{other => gui}/wxwidgets-gtk3/recipe.toml | 0 recipes/wip/libs/{other => info}/appstream/recipe.toml | 0 recipes/wip/libs/{other => info}/appstream/redox.patch | 0 recipes/wip/libs/{other => math}/fftw/recipe.toml | 0 recipes/wip/libs/{other => media}/lame/recipe.toml | 0 recipes/wip/libs/{other => media}/liba52/recipe.toml | 0 recipes/wip/libs/{other => media}/libaom/recipe.toml | 0 recipes/wip/libs/{other => media}/libde265/recipe.toml | 0 recipes/wip/libs/{other => media}/libgav1/recipe.toml | 0 recipes/wip/libs/{other => media}/libmad/recipe.toml | 0 recipes/wip/libs/{other => media}/libmpeg2/recipe.toml | 0 recipes/wip/libs/{other => media}/libnsgif/recipe.toml | 0 recipes/wip/libs/{other => media}/libportaudio/recipe.toml | 0 recipes/wip/libs/{other => media}/libsamplerate/recipe.toml | 0 recipes/wip/libs/{other => media}/libsndfile/recipe.toml | 0 recipes/wip/libs/{other => media}/libsoundio/recipe.toml | 0 recipes/wip/libs/{other => media}/libtheora/recipe.toml | 0 recipes/wip/libs/{other => media}/libwmf/recipe.toml | 0 recipes/wip/libs/{other => media}/mlt/recipe.toml | 0 recipes/wip/libs/{other => media}/musepack/recipe.toml | 0 recipes/wip/libs/{other => media}/opencolorio/recipe.toml | 0 recipes/wip/libs/{other => media}/opencv4/recipe.toml | 0 recipes/wip/libs/{other => media}/openexr/recipe.toml | 0 recipes/wip/libs/{other => media}/openimageio/recipe.toml | 0 recipes/wip/libs/{other => media}/openjpeg/recipe.toml | 0 recipes/wip/libs/{other => media}/rnnoise/recipe.toml | 0 recipes/wip/libs/{other => media}/rubberband/recipe.toml | 0 recipes/wip/libs/{other => media}/taglib/recipe.toml | 0 recipes/wip/libs/{other => media}/twolame/recipe.toml | 0 recipes/wip/libs/{other => media}/vamp-plugin-sdk/recipe.toml | 0 recipes/wip/libs/{other => sdl}/sdl-pango/recipe.toml | 0 recipes/wip/libs/{other => sdl}/sdl2-net/recipe.toml | 0 recipes/wip/libs/{other => sdl}/sdl2-pango/recipe.toml | 0 recipes/wip/libs/{other => sdl}/sdl3/recipe.toml | 0 recipes/wip/libs/{other => sim}/bullet/recipe.toml | 0 recipes/wip/libs/{other => suite}/boost/recipe.toml | 0 recipes/wip/libs/{other => suite}/boost/redox.patch | 0 recipes/wip/libs/{other => suite}/raylib/recipe.toml | 0 recipes/wip/libs/{other => web}/webkit/recipe.toml | 0 56 files changed, 0 insertions(+), 0 deletions(-) rename recipes/wip/dev/{other => debug}/lurk/recipe.toml (100%) rename recipes/wip/{net/server => games/servers}/spadesx/recipe.toml (100%) rename recipes/wip/libs/{other => fs}/libfuse2/recipe.toml (100%) rename recipes/wip/libs/{other => fs}/libfuse3/recipe.toml (100%) rename recipes/wip/libs/{other => graphics}/freealut/recipe.toml (100%) rename recipes/wip/libs/{other => graphics}/freeglut/recipe.toml (100%) rename recipes/wip/libs/{other => graphics}/freeglut/redox.patch (100%) rename recipes/wip/libs/{other => graphics}/glew/recipe.toml (100%) rename recipes/wip/libs/{other => graphics}/glfw3/recipe.toml (100%) rename recipes/wip/libs/{other => graphics}/libglvnd/recipe.toml (100%) rename recipes/wip/libs/{other => graphics}/oidn/recipe.toml (100%) rename recipes/wip/libs/{other => graphics}/openxr/recipe.toml (100%) rename recipes/wip/libs/{other => graphics}/projectm/recipe.toml (100%) rename recipes/wip/libs/{other => graphics}/slang/recipe.toml (100%) rename recipes/wip/libs/{other => gui}/imlib2/recipe.toml (100%) rename recipes/wip/libs/{other => gui}/imlib2/redox.patch (100%) rename recipes/wip/libs/{other => gui}/wxpython/recipe.toml (100%) rename recipes/wip/libs/{other => gui}/wxwidgets-gtk3/recipe.toml (100%) rename recipes/wip/libs/{other => info}/appstream/recipe.toml (100%) rename recipes/wip/libs/{other => info}/appstream/redox.patch (100%) rename recipes/wip/libs/{other => math}/fftw/recipe.toml (100%) rename recipes/wip/libs/{other => media}/lame/recipe.toml (100%) rename recipes/wip/libs/{other => media}/liba52/recipe.toml (100%) rename recipes/wip/libs/{other => media}/libaom/recipe.toml (100%) rename recipes/wip/libs/{other => media}/libde265/recipe.toml (100%) rename recipes/wip/libs/{other => media}/libgav1/recipe.toml (100%) rename recipes/wip/libs/{other => media}/libmad/recipe.toml (100%) rename recipes/wip/libs/{other => media}/libmpeg2/recipe.toml (100%) rename recipes/wip/libs/{other => media}/libnsgif/recipe.toml (100%) rename recipes/wip/libs/{other => media}/libportaudio/recipe.toml (100%) rename recipes/wip/libs/{other => media}/libsamplerate/recipe.toml (100%) rename recipes/wip/libs/{other => media}/libsndfile/recipe.toml (100%) rename recipes/wip/libs/{other => media}/libsoundio/recipe.toml (100%) rename recipes/wip/libs/{other => media}/libtheora/recipe.toml (100%) rename recipes/wip/libs/{other => media}/libwmf/recipe.toml (100%) rename recipes/wip/libs/{other => media}/mlt/recipe.toml (100%) rename recipes/wip/libs/{other => media}/musepack/recipe.toml (100%) rename recipes/wip/libs/{other => media}/opencolorio/recipe.toml (100%) rename recipes/wip/libs/{other => media}/opencv4/recipe.toml (100%) rename recipes/wip/libs/{other => media}/openexr/recipe.toml (100%) rename recipes/wip/libs/{other => media}/openimageio/recipe.toml (100%) rename recipes/wip/libs/{other => media}/openjpeg/recipe.toml (100%) rename recipes/wip/libs/{other => media}/rnnoise/recipe.toml (100%) rename recipes/wip/libs/{other => media}/rubberband/recipe.toml (100%) rename recipes/wip/libs/{other => media}/taglib/recipe.toml (100%) rename recipes/wip/libs/{other => media}/twolame/recipe.toml (100%) rename recipes/wip/libs/{other => media}/vamp-plugin-sdk/recipe.toml (100%) rename recipes/wip/libs/{other => sdl}/sdl-pango/recipe.toml (100%) rename recipes/wip/libs/{other => sdl}/sdl2-net/recipe.toml (100%) rename recipes/wip/libs/{other => sdl}/sdl2-pango/recipe.toml (100%) rename recipes/wip/libs/{other => sdl}/sdl3/recipe.toml (100%) rename recipes/wip/libs/{other => sim}/bullet/recipe.toml (100%) rename recipes/wip/libs/{other => suite}/boost/recipe.toml (100%) rename recipes/wip/libs/{other => suite}/boost/redox.patch (100%) rename recipes/wip/libs/{other => suite}/raylib/recipe.toml (100%) rename recipes/wip/libs/{other => web}/webkit/recipe.toml (100%) diff --git a/recipes/wip/dev/other/lurk/recipe.toml b/recipes/wip/dev/debug/lurk/recipe.toml similarity index 100% rename from recipes/wip/dev/other/lurk/recipe.toml rename to recipes/wip/dev/debug/lurk/recipe.toml diff --git a/recipes/wip/net/server/spadesx/recipe.toml b/recipes/wip/games/servers/spadesx/recipe.toml similarity index 100% rename from recipes/wip/net/server/spadesx/recipe.toml rename to recipes/wip/games/servers/spadesx/recipe.toml diff --git a/recipes/wip/libs/other/libfuse2/recipe.toml b/recipes/wip/libs/fs/libfuse2/recipe.toml similarity index 100% rename from recipes/wip/libs/other/libfuse2/recipe.toml rename to recipes/wip/libs/fs/libfuse2/recipe.toml diff --git a/recipes/wip/libs/other/libfuse3/recipe.toml b/recipes/wip/libs/fs/libfuse3/recipe.toml similarity index 100% rename from recipes/wip/libs/other/libfuse3/recipe.toml rename to recipes/wip/libs/fs/libfuse3/recipe.toml diff --git a/recipes/wip/libs/other/freealut/recipe.toml b/recipes/wip/libs/graphics/freealut/recipe.toml similarity index 100% rename from recipes/wip/libs/other/freealut/recipe.toml rename to recipes/wip/libs/graphics/freealut/recipe.toml diff --git a/recipes/wip/libs/other/freeglut/recipe.toml b/recipes/wip/libs/graphics/freeglut/recipe.toml similarity index 100% rename from recipes/wip/libs/other/freeglut/recipe.toml rename to recipes/wip/libs/graphics/freeglut/recipe.toml diff --git a/recipes/wip/libs/other/freeglut/redox.patch b/recipes/wip/libs/graphics/freeglut/redox.patch similarity index 100% rename from recipes/wip/libs/other/freeglut/redox.patch rename to recipes/wip/libs/graphics/freeglut/redox.patch diff --git a/recipes/wip/libs/other/glew/recipe.toml b/recipes/wip/libs/graphics/glew/recipe.toml similarity index 100% rename from recipes/wip/libs/other/glew/recipe.toml rename to recipes/wip/libs/graphics/glew/recipe.toml diff --git a/recipes/wip/libs/other/glfw3/recipe.toml b/recipes/wip/libs/graphics/glfw3/recipe.toml similarity index 100% rename from recipes/wip/libs/other/glfw3/recipe.toml rename to recipes/wip/libs/graphics/glfw3/recipe.toml diff --git a/recipes/wip/libs/other/libglvnd/recipe.toml b/recipes/wip/libs/graphics/libglvnd/recipe.toml similarity index 100% rename from recipes/wip/libs/other/libglvnd/recipe.toml rename to recipes/wip/libs/graphics/libglvnd/recipe.toml diff --git a/recipes/wip/libs/other/oidn/recipe.toml b/recipes/wip/libs/graphics/oidn/recipe.toml similarity index 100% rename from recipes/wip/libs/other/oidn/recipe.toml rename to recipes/wip/libs/graphics/oidn/recipe.toml diff --git a/recipes/wip/libs/other/openxr/recipe.toml b/recipes/wip/libs/graphics/openxr/recipe.toml similarity index 100% rename from recipes/wip/libs/other/openxr/recipe.toml rename to recipes/wip/libs/graphics/openxr/recipe.toml diff --git a/recipes/wip/libs/other/projectm/recipe.toml b/recipes/wip/libs/graphics/projectm/recipe.toml similarity index 100% rename from recipes/wip/libs/other/projectm/recipe.toml rename to recipes/wip/libs/graphics/projectm/recipe.toml diff --git a/recipes/wip/libs/other/slang/recipe.toml b/recipes/wip/libs/graphics/slang/recipe.toml similarity index 100% rename from recipes/wip/libs/other/slang/recipe.toml rename to recipes/wip/libs/graphics/slang/recipe.toml diff --git a/recipes/wip/libs/other/imlib2/recipe.toml b/recipes/wip/libs/gui/imlib2/recipe.toml similarity index 100% rename from recipes/wip/libs/other/imlib2/recipe.toml rename to recipes/wip/libs/gui/imlib2/recipe.toml diff --git a/recipes/wip/libs/other/imlib2/redox.patch b/recipes/wip/libs/gui/imlib2/redox.patch similarity index 100% rename from recipes/wip/libs/other/imlib2/redox.patch rename to recipes/wip/libs/gui/imlib2/redox.patch diff --git a/recipes/wip/libs/other/wxpython/recipe.toml b/recipes/wip/libs/gui/wxpython/recipe.toml similarity index 100% rename from recipes/wip/libs/other/wxpython/recipe.toml rename to recipes/wip/libs/gui/wxpython/recipe.toml diff --git a/recipes/wip/libs/other/wxwidgets-gtk3/recipe.toml b/recipes/wip/libs/gui/wxwidgets-gtk3/recipe.toml similarity index 100% rename from recipes/wip/libs/other/wxwidgets-gtk3/recipe.toml rename to recipes/wip/libs/gui/wxwidgets-gtk3/recipe.toml diff --git a/recipes/wip/libs/other/appstream/recipe.toml b/recipes/wip/libs/info/appstream/recipe.toml similarity index 100% rename from recipes/wip/libs/other/appstream/recipe.toml rename to recipes/wip/libs/info/appstream/recipe.toml diff --git a/recipes/wip/libs/other/appstream/redox.patch b/recipes/wip/libs/info/appstream/redox.patch similarity index 100% rename from recipes/wip/libs/other/appstream/redox.patch rename to recipes/wip/libs/info/appstream/redox.patch diff --git a/recipes/wip/libs/other/fftw/recipe.toml b/recipes/wip/libs/math/fftw/recipe.toml similarity index 100% rename from recipes/wip/libs/other/fftw/recipe.toml rename to recipes/wip/libs/math/fftw/recipe.toml diff --git a/recipes/wip/libs/other/lame/recipe.toml b/recipes/wip/libs/media/lame/recipe.toml similarity index 100% rename from recipes/wip/libs/other/lame/recipe.toml rename to recipes/wip/libs/media/lame/recipe.toml diff --git a/recipes/wip/libs/other/liba52/recipe.toml b/recipes/wip/libs/media/liba52/recipe.toml similarity index 100% rename from recipes/wip/libs/other/liba52/recipe.toml rename to recipes/wip/libs/media/liba52/recipe.toml diff --git a/recipes/wip/libs/other/libaom/recipe.toml b/recipes/wip/libs/media/libaom/recipe.toml similarity index 100% rename from recipes/wip/libs/other/libaom/recipe.toml rename to recipes/wip/libs/media/libaom/recipe.toml diff --git a/recipes/wip/libs/other/libde265/recipe.toml b/recipes/wip/libs/media/libde265/recipe.toml similarity index 100% rename from recipes/wip/libs/other/libde265/recipe.toml rename to recipes/wip/libs/media/libde265/recipe.toml diff --git a/recipes/wip/libs/other/libgav1/recipe.toml b/recipes/wip/libs/media/libgav1/recipe.toml similarity index 100% rename from recipes/wip/libs/other/libgav1/recipe.toml rename to recipes/wip/libs/media/libgav1/recipe.toml diff --git a/recipes/wip/libs/other/libmad/recipe.toml b/recipes/wip/libs/media/libmad/recipe.toml similarity index 100% rename from recipes/wip/libs/other/libmad/recipe.toml rename to recipes/wip/libs/media/libmad/recipe.toml diff --git a/recipes/wip/libs/other/libmpeg2/recipe.toml b/recipes/wip/libs/media/libmpeg2/recipe.toml similarity index 100% rename from recipes/wip/libs/other/libmpeg2/recipe.toml rename to recipes/wip/libs/media/libmpeg2/recipe.toml diff --git a/recipes/wip/libs/other/libnsgif/recipe.toml b/recipes/wip/libs/media/libnsgif/recipe.toml similarity index 100% rename from recipes/wip/libs/other/libnsgif/recipe.toml rename to recipes/wip/libs/media/libnsgif/recipe.toml diff --git a/recipes/wip/libs/other/libportaudio/recipe.toml b/recipes/wip/libs/media/libportaudio/recipe.toml similarity index 100% rename from recipes/wip/libs/other/libportaudio/recipe.toml rename to recipes/wip/libs/media/libportaudio/recipe.toml diff --git a/recipes/wip/libs/other/libsamplerate/recipe.toml b/recipes/wip/libs/media/libsamplerate/recipe.toml similarity index 100% rename from recipes/wip/libs/other/libsamplerate/recipe.toml rename to recipes/wip/libs/media/libsamplerate/recipe.toml diff --git a/recipes/wip/libs/other/libsndfile/recipe.toml b/recipes/wip/libs/media/libsndfile/recipe.toml similarity index 100% rename from recipes/wip/libs/other/libsndfile/recipe.toml rename to recipes/wip/libs/media/libsndfile/recipe.toml diff --git a/recipes/wip/libs/other/libsoundio/recipe.toml b/recipes/wip/libs/media/libsoundio/recipe.toml similarity index 100% rename from recipes/wip/libs/other/libsoundio/recipe.toml rename to recipes/wip/libs/media/libsoundio/recipe.toml diff --git a/recipes/wip/libs/other/libtheora/recipe.toml b/recipes/wip/libs/media/libtheora/recipe.toml similarity index 100% rename from recipes/wip/libs/other/libtheora/recipe.toml rename to recipes/wip/libs/media/libtheora/recipe.toml diff --git a/recipes/wip/libs/other/libwmf/recipe.toml b/recipes/wip/libs/media/libwmf/recipe.toml similarity index 100% rename from recipes/wip/libs/other/libwmf/recipe.toml rename to recipes/wip/libs/media/libwmf/recipe.toml diff --git a/recipes/wip/libs/other/mlt/recipe.toml b/recipes/wip/libs/media/mlt/recipe.toml similarity index 100% rename from recipes/wip/libs/other/mlt/recipe.toml rename to recipes/wip/libs/media/mlt/recipe.toml diff --git a/recipes/wip/libs/other/musepack/recipe.toml b/recipes/wip/libs/media/musepack/recipe.toml similarity index 100% rename from recipes/wip/libs/other/musepack/recipe.toml rename to recipes/wip/libs/media/musepack/recipe.toml diff --git a/recipes/wip/libs/other/opencolorio/recipe.toml b/recipes/wip/libs/media/opencolorio/recipe.toml similarity index 100% rename from recipes/wip/libs/other/opencolorio/recipe.toml rename to recipes/wip/libs/media/opencolorio/recipe.toml diff --git a/recipes/wip/libs/other/opencv4/recipe.toml b/recipes/wip/libs/media/opencv4/recipe.toml similarity index 100% rename from recipes/wip/libs/other/opencv4/recipe.toml rename to recipes/wip/libs/media/opencv4/recipe.toml diff --git a/recipes/wip/libs/other/openexr/recipe.toml b/recipes/wip/libs/media/openexr/recipe.toml similarity index 100% rename from recipes/wip/libs/other/openexr/recipe.toml rename to recipes/wip/libs/media/openexr/recipe.toml diff --git a/recipes/wip/libs/other/openimageio/recipe.toml b/recipes/wip/libs/media/openimageio/recipe.toml similarity index 100% rename from recipes/wip/libs/other/openimageio/recipe.toml rename to recipes/wip/libs/media/openimageio/recipe.toml diff --git a/recipes/wip/libs/other/openjpeg/recipe.toml b/recipes/wip/libs/media/openjpeg/recipe.toml similarity index 100% rename from recipes/wip/libs/other/openjpeg/recipe.toml rename to recipes/wip/libs/media/openjpeg/recipe.toml diff --git a/recipes/wip/libs/other/rnnoise/recipe.toml b/recipes/wip/libs/media/rnnoise/recipe.toml similarity index 100% rename from recipes/wip/libs/other/rnnoise/recipe.toml rename to recipes/wip/libs/media/rnnoise/recipe.toml diff --git a/recipes/wip/libs/other/rubberband/recipe.toml b/recipes/wip/libs/media/rubberband/recipe.toml similarity index 100% rename from recipes/wip/libs/other/rubberband/recipe.toml rename to recipes/wip/libs/media/rubberband/recipe.toml diff --git a/recipes/wip/libs/other/taglib/recipe.toml b/recipes/wip/libs/media/taglib/recipe.toml similarity index 100% rename from recipes/wip/libs/other/taglib/recipe.toml rename to recipes/wip/libs/media/taglib/recipe.toml diff --git a/recipes/wip/libs/other/twolame/recipe.toml b/recipes/wip/libs/media/twolame/recipe.toml similarity index 100% rename from recipes/wip/libs/other/twolame/recipe.toml rename to recipes/wip/libs/media/twolame/recipe.toml diff --git a/recipes/wip/libs/other/vamp-plugin-sdk/recipe.toml b/recipes/wip/libs/media/vamp-plugin-sdk/recipe.toml similarity index 100% rename from recipes/wip/libs/other/vamp-plugin-sdk/recipe.toml rename to recipes/wip/libs/media/vamp-plugin-sdk/recipe.toml diff --git a/recipes/wip/libs/other/sdl-pango/recipe.toml b/recipes/wip/libs/sdl/sdl-pango/recipe.toml similarity index 100% rename from recipes/wip/libs/other/sdl-pango/recipe.toml rename to recipes/wip/libs/sdl/sdl-pango/recipe.toml diff --git a/recipes/wip/libs/other/sdl2-net/recipe.toml b/recipes/wip/libs/sdl/sdl2-net/recipe.toml similarity index 100% rename from recipes/wip/libs/other/sdl2-net/recipe.toml rename to recipes/wip/libs/sdl/sdl2-net/recipe.toml diff --git a/recipes/wip/libs/other/sdl2-pango/recipe.toml b/recipes/wip/libs/sdl/sdl2-pango/recipe.toml similarity index 100% rename from recipes/wip/libs/other/sdl2-pango/recipe.toml rename to recipes/wip/libs/sdl/sdl2-pango/recipe.toml diff --git a/recipes/wip/libs/other/sdl3/recipe.toml b/recipes/wip/libs/sdl/sdl3/recipe.toml similarity index 100% rename from recipes/wip/libs/other/sdl3/recipe.toml rename to recipes/wip/libs/sdl/sdl3/recipe.toml diff --git a/recipes/wip/libs/other/bullet/recipe.toml b/recipes/wip/libs/sim/bullet/recipe.toml similarity index 100% rename from recipes/wip/libs/other/bullet/recipe.toml rename to recipes/wip/libs/sim/bullet/recipe.toml diff --git a/recipes/wip/libs/other/boost/recipe.toml b/recipes/wip/libs/suite/boost/recipe.toml similarity index 100% rename from recipes/wip/libs/other/boost/recipe.toml rename to recipes/wip/libs/suite/boost/recipe.toml diff --git a/recipes/wip/libs/other/boost/redox.patch b/recipes/wip/libs/suite/boost/redox.patch similarity index 100% rename from recipes/wip/libs/other/boost/redox.patch rename to recipes/wip/libs/suite/boost/redox.patch diff --git a/recipes/wip/libs/other/raylib/recipe.toml b/recipes/wip/libs/suite/raylib/recipe.toml similarity index 100% rename from recipes/wip/libs/other/raylib/recipe.toml rename to recipes/wip/libs/suite/raylib/recipe.toml diff --git a/recipes/wip/libs/other/webkit/recipe.toml b/recipes/wip/libs/web/webkit/recipe.toml similarity index 100% rename from recipes/wip/libs/other/webkit/recipe.toml rename to recipes/wip/libs/web/webkit/recipe.toml From 332fb5e78561e6805ddd87bc8758093f02f564ba Mon Sep 17 00:00:00 2001 From: Ribbon Date: Mon, 12 Oct 2026 19:29:36 -0300 Subject: [PATCH 42/63] Fix and update more recipes --- recipes/wip/bench/stress-ng/recipe.toml | 2 +- recipes/wip/demos/anima/recipe.toml | 2 +- recipes/wip/demos/black-hole-glfw/recipe.toml | 13 +++++++++---- recipes/wip/demos/black-hole-sdl/recipe.toml | 2 +- recipes/wip/demos/fonterator/recipe.toml | 2 +- recipes/wip/demos/franken-solver/recipe.toml | 2 +- recipes/wip/demos/gl-flightsim/recipe.toml | 7 ++++--- recipes/wip/demos/myth/recipe.toml | 2 +- recipes/wip/demos/nibble/recipe.toml | 2 +- recipes/wip/demos/nms/recipe.toml | 2 +- recipes/wip/demos/nobubbles/recipe.toml | 4 ++++ recipes/wip/demos/orbit-sim/recipe.toml | 2 +- recipes/wip/demos/plush/recipe.toml | 2 +- recipes/wip/demos/raclettui/recipe.toml | 6 +----- recipes/wip/demos/rayt/recipe.toml | 2 +- recipes/wip/demos/raytracer-rs/recipe.toml | 3 +-- recipes/wip/demos/rs-cube/recipe.toml | 2 +- recipes/wip/demos/rustracer/recipe.toml | 4 ++-- recipes/wip/demos/scamp-cat/recipe.toml | 2 +- recipes/wip/demos/solar-system-sim/recipe.toml | 2 +- recipes/wip/demos/stars-sdl/recipe.toml | 5 +++-- recipes/wip/demos/terminal-rain/recipe.toml | 2 +- recipes/wip/demos/topcat/recipe.toml | 2 +- recipes/wip/demos/vk-examples-rs/recipe.toml | 2 +- recipes/wip/demos/voxelspace-sdl/recipe.toml | 2 +- recipes/wip/libs/graphics/glfw3/recipe.toml | 7 ++++++- recipes/wip/libs/other/libglm/recipe.toml | 2 +- recipes/wip/libs/suite/raylib/recipe.toml | 2 +- 28 files changed, 50 insertions(+), 39 deletions(-) diff --git a/recipes/wip/bench/stress-ng/recipe.toml b/recipes/wip/bench/stress-ng/recipe.toml index 783783bd3..e28d80584 100644 --- a/recipes/wip/bench/stress-ng/recipe.toml +++ b/recipes/wip/bench/stress-ng/recipe.toml @@ -1,4 +1,4 @@ -#TODO build and test +#TODO '_SC_MAPPED_FILES' undeclared #TODO determine minimum dependencies [source] git = "https://github.com/ColinIanKing/stress-ng" diff --git a/recipes/wip/demos/anima/recipe.toml b/recipes/wip/demos/anima/recipe.toml index f53447d79..4550c56f5 100644 --- a/recipes/wip/demos/anima/recipe.toml +++ b/recipes/wip/demos/anima/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO compiled but untested [source] git = "https://github.com/Yazelix/anima" shallow_clone = true diff --git a/recipes/wip/demos/black-hole-glfw/recipe.toml b/recipes/wip/demos/black-hole-glfw/recipe.toml index 55d5e100d..29bbb6734 100644 --- a/recipes/wip/demos/black-hole-glfw/recipe.toml +++ b/recipes/wip/demos/black-hole-glfw/recipe.toml @@ -1,13 +1,18 @@ -#TODO compile and test +#TODO compiled but untested +#TODO ninja error: unknown target 'install' [source] git = "https://github.com/kavan010/black_hole" rev = "dc263bb5a1b72f5a24190d2e38b84b5c8fe9a317" shallow_clone = true [build] -template = "cmake" +template = "custom" dependencies = [ "glew", "glfw3", - "glm", - "mesa-x11", + "libglm", + "mesa", ] +script = """ +DYNAMIC_INIT +cookbook_cmake +""" diff --git a/recipes/wip/demos/black-hole-sdl/recipe.toml b/recipes/wip/demos/black-hole-sdl/recipe.toml index 6dbe52959..e39439f1c 100644 --- a/recipes/wip/demos/black-hole-sdl/recipe.toml +++ b/recipes/wip/demos/black-hole-sdl/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO fix sdl3 dep [source] git = "https://github.com/jsoulier/black_hole_simulation" rev = "6205903db7f22d86d2dbc328831bfc2f68108b7a" diff --git a/recipes/wip/demos/fonterator/recipe.toml b/recipes/wip/demos/fonterator/recipe.toml index d9de36d5f..0f0f33014 100644 --- a/recipes/wip/demos/fonterator/recipe.toml +++ b/recipes/wip/demos/fonterator/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but untested [source] git = "https://github.com/ardaku/fonterator" shallow_clone = true diff --git a/recipes/wip/demos/franken-solver/recipe.toml b/recipes/wip/demos/franken-solver/recipe.toml index 6f3ba2800..500f03333 100644 --- a/recipes/wip/demos/franken-solver/recipe.toml +++ b/recipes/wip/demos/franken-solver/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO build error: can be cross-compiled? [source] git = "https://github.com/prp/franken-solver" shallow_clone = true diff --git a/recipes/wip/demos/gl-flightsim/recipe.toml b/recipes/wip/demos/gl-flightsim/recipe.toml index d52156af3..2fcebe202 100644 --- a/recipes/wip/demos/gl-flightsim/recipe.toml +++ b/recipes/wip/demos/gl-flightsim/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO GLM_GTX_component_wise is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it. [source] git = "https://github.com/gue-ni/OpenGL_Flightsim" rev = "7b865b085e18fc3b9e242651f3bd12073e3071dd" @@ -9,9 +9,10 @@ dependencies = [ "sdl2", "sdl2-image", "glew", - "glm", + "libglm", ] script = """ +COOKBOOK_SOURCE="${COOKBOOK_SOURCE}/OpenGL_Flightsim" DYNAMIC_INIT -cookbook_cmake "${COOKBOOK_SOURCE}"/OpenGL_Flightsim +cookbook_cmake """ diff --git a/recipes/wip/demos/myth/recipe.toml b/recipes/wip/demos/myth/recipe.toml index 3214aa415..651063b85 100644 --- a/recipes/wip/demos/myth/recipe.toml +++ b/recipes/wip/demos/myth/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO rfd crate error [source] git = "https://github.com/panxinmiao/myth" shallow_clone = true diff --git a/recipes/wip/demos/nibble/recipe.toml b/recipes/wip/demos/nibble/recipe.toml index 7198424ab..e817a7648 100644 --- a/recipes/wip/demos/nibble/recipe.toml +++ b/recipes/wip/demos/nibble/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but untested [source] git = "https://github.com/Vaishnav-Sabari-Girish/nibble" shallow_clone = true diff --git a/recipes/wip/demos/nms/recipe.toml b/recipes/wip/demos/nms/recipe.toml index 73540e493..f7393e1ba 100644 --- a/recipes/wip/demos/nms/recipe.toml +++ b/recipes/wip/demos/nms/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO compiled but untested [source] git = "https://github.com/bartobri/no-more-secrets" rev = "v1.0.1" diff --git a/recipes/wip/demos/nobubbles/recipe.toml b/recipes/wip/demos/nobubbles/recipe.toml index 891d6b095..bc514db62 100644 --- a/recipes/wip/demos/nobubbles/recipe.toml +++ b/recipes/wip/demos/nobubbles/recipe.toml @@ -4,3 +4,7 @@ git = "https://github.com/romancitodev/nobubbles" shallow_clone = true [build] template = "cargo" +cargoexamples = [ + "counter", + "fx", +] diff --git a/recipes/wip/demos/orbit-sim/recipe.toml b/recipes/wip/demos/orbit-sim/recipe.toml index 734049224..f95ccf83e 100644 --- a/recipes/wip/demos/orbit-sim/recipe.toml +++ b/recipes/wip/demos/orbit-sim/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO fix raylib dep [source] git = "https://github.com/IceWizard7/simulation-orbit" rev = "e772641909df7a0876093b9ffea0377e5bea82bf" diff --git a/recipes/wip/demos/plush/recipe.toml b/recipes/wip/demos/plush/recipe.toml index 4ea8b4ff9..a62bb27e8 100644 --- a/recipes/wip/demos/plush/recipe.toml +++ b/recipes/wip/demos/plush/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO error[E0658]: use of unstable library feature `float_algebraic` [source] git = "https://github.com/maximecb/plush" shallow_clone = true diff --git a/recipes/wip/demos/raclettui/recipe.toml b/recipes/wip/demos/raclettui/recipe.toml index 2664fda42..713174ba6 100644 --- a/recipes/wip/demos/raclettui/recipe.toml +++ b/recipes/wip/demos/raclettui/recipe.toml @@ -4,8 +4,4 @@ git = "https://github.com/ishrut/raclettui" shallow_clone = true [build] template = "cargo" -cargoexamples = [ - "cpu_ratatui", - "test", - "wgpu_ratatui", -] +cargoexamples = ["hello"] diff --git a/recipes/wip/demos/rayt/recipe.toml b/recipes/wip/demos/rayt/recipe.toml index 2d4745060..11a5ed7f7 100644 --- a/recipes/wip/demos/rayt/recipe.toml +++ b/recipes/wip/demos/rayt/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO termios crate error (after cargo update) [source] git = "https://github.com/Dalamar42/rayt" shallow_clone = true diff --git a/recipes/wip/demos/raytracer-rs/recipe.toml b/recipes/wip/demos/raytracer-rs/recipe.toml index 85d20ec48..bc6a6d3d9 100644 --- a/recipes/wip/demos/raytracer-rs/recipe.toml +++ b/recipes/wip/demos/raytracer-rs/recipe.toml @@ -1,10 +1,9 @@ -#TODO compile and test +#TODO error[E0425]: cannot find function, tuple struct or tuple variant `ImageRgb8` in crate `image` [source] git = "https://github.com/ranveeraggarwal/rust-raytracer" shallow_clone = true [build] template = "cargo" -cargopath = "examples" cargoexamples = [ "basic_sphere", "one_weekend", diff --git a/recipes/wip/demos/rs-cube/recipe.toml b/recipes/wip/demos/rs-cube/recipe.toml index 905672677..8ec319366 100644 --- a/recipes/wip/demos/rs-cube/recipe.toml +++ b/recipes/wip/demos/rs-cube/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO compiled but not tested [source] git = "https://github.com/doprz/rs-cube" shallow_clone = true diff --git a/recipes/wip/demos/rustracer/recipe.toml b/recipes/wip/demos/rustracer/recipe.toml index 8e60fe877..8b845c23f 100644 --- a/recipes/wip/demos/rustracer/recipe.toml +++ b/recipes/wip/demos/rustracer/recipe.toml @@ -1,7 +1,7 @@ -#TODO compile and test +#TODO shared_library crate error: cannot find module or crate `dl` in this scope [source] git = "https://github.com/KaminariOS/rustracer" shallow_clone = true [build] template = "cargo" -cargoexamples = ["gltf-renderer"] +cargopackages = ["gltf-renderer"] diff --git a/recipes/wip/demos/scamp-cat/recipe.toml b/recipes/wip/demos/scamp-cat/recipe.toml index 449b7cafa..8939a7d84 100644 --- a/recipes/wip/demos/scamp-cat/recipe.toml +++ b/recipes/wip/demos/scamp-cat/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO outdated ioctl-rs crate error [source] git = "https://github.com/LordAizen1/scamp-cat" shallow_clone = true diff --git a/recipes/wip/demos/solar-system-sim/recipe.toml b/recipes/wip/demos/solar-system-sim/recipe.toml index 0262c4b27..b78778600 100644 --- a/recipes/wip/demos/solar-system-sim/recipe.toml +++ b/recipes/wip/demos/solar-system-sim/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO compiled but untested [source] git = "https://github.com/exor2008/solar-system-sim" shallow_clone = true diff --git a/recipes/wip/demos/stars-sdl/recipe.toml b/recipes/wip/demos/stars-sdl/recipe.toml index 3c090f987..212d53510 100644 --- a/recipes/wip/demos/stars-sdl/recipe.toml +++ b/recipes/wip/demos/stars-sdl/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO can't find SDL2/_real_SDL_config.h #TODO add a command to install [source] git = "https://github.com/Patater/demokit" @@ -8,7 +8,8 @@ shallow_clone = true template = "custom" dependencies = ["sdl2"] script = """ -rsync -av --delete "${COOKBOOK_SOURCE}/stars" ./ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +cd source/stars DYNAMIC_INIT "${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" """ diff --git a/recipes/wip/demos/terminal-rain/recipe.toml b/recipes/wip/demos/terminal-rain/recipe.toml index 1ea0a5dfa..a4e8d662d 100644 --- a/recipes/wip/demos/terminal-rain/recipe.toml +++ b/recipes/wip/demos/terminal-rain/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO compiled but not tested [source] git = "https://github.com/Oakamoore/terminal-rain" rev = "c46946f5a1ab71dc8b7f826f9ab634d46cb81c71" diff --git a/recipes/wip/demos/topcat/recipe.toml b/recipes/wip/demos/topcat/recipe.toml index b3cf50bb4..35b54d725 100644 --- a/recipes/wip/demos/topcat/recipe.toml +++ b/recipes/wip/demos/topcat/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO use of unstable library feature `int_format_into` [source] git = "https://github.com/tokio-rs/topcoat" shallow_clone = true diff --git a/recipes/wip/demos/vk-examples-rs/recipe.toml b/recipes/wip/demos/vk-examples-rs/recipe.toml index 4be0789b1..a7d3d202d 100644 --- a/recipes/wip/demos/vk-examples-rs/recipe.toml +++ b/recipes/wip/demos/vk-examples-rs/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO rfd crate error [source] git = "https://github.com/adrien-ben/vulkan-examples-rs" shallow_clone = true diff --git a/recipes/wip/demos/voxelspace-sdl/recipe.toml b/recipes/wip/demos/voxelspace-sdl/recipe.toml index 40257900f..931158142 100644 --- a/recipes/wip/demos/voxelspace-sdl/recipe.toml +++ b/recipes/wip/demos/voxelspace-sdl/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO compiled but not tested #TODO add manual installation on script [source] git = "https://github.com/gustavopezzi/voxelspace-sdl" diff --git a/recipes/wip/libs/graphics/glfw3/recipe.toml b/recipes/wip/libs/graphics/glfw3/recipe.toml index a54244977..d1cf720c3 100644 --- a/recipes/wip/libs/graphics/glfw3/recipe.toml +++ b/recipes/wip/libs/graphics/glfw3/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO compiled but untested # build instructions: https://www.glfw.org/docs/latest/compile.html [source] git = "https://github.com/glfw/glfw" @@ -13,4 +13,9 @@ cmakeflags = [ ] dependencies = [ "libxkbcommon", + "libx11", + "libxrandr", + "libxinerama", + "libxcursor", + "libxi", ] diff --git a/recipes/wip/libs/other/libglm/recipe.toml b/recipes/wip/libs/other/libglm/recipe.toml index 83f270530..7569eea0a 100644 --- a/recipes/wip/libs/other/libglm/recipe.toml +++ b/recipes/wip/libs/other/libglm/recipe.toml @@ -1,4 +1,4 @@ -#TODO Needs to determine the script +#TODO compiled but untested [source] git = "https://github.com/g-truc/glm" rev = "1.0.3" diff --git a/recipes/wip/libs/suite/raylib/recipe.toml b/recipes/wip/libs/suite/raylib/recipe.toml index f5fdd7329..b28479aa6 100644 --- a/recipes/wip/libs/suite/raylib/recipe.toml +++ b/recipes/wip/libs/suite/raylib/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO implicit declaration of function 'sched_get_priority_min' [-Werror=implicit-function-declaration] # build instructions: https://github.com/raysan5/raylib/wiki/Working-on-GNU-Linux [source] git = "https://github.com/raysan5/raylib" From aac8e49f5f219b48dca2f86a38ee3c4bd0fe9cac Mon Sep 17 00:00:00 2001 From: Wildan M Date: Thu, 15 Oct 2026 14:56:16 +0700 Subject: [PATCH 43/63] xz: Enable threads --- recipes/archives/xz/recipe.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/archives/xz/recipe.toml b/recipes/archives/xz/recipe.toml index b3d25b672..796f3c09d 100644 --- a/recipes/archives/xz/recipe.toml +++ b/recipes/archives/xz/recipe.toml @@ -14,7 +14,6 @@ COOKBOOK_CONFIGURE_FLAGS+=( --disable-lzmainfo --disable-xz --disable-xzdec - --enable-threads=no ) cookbook_configure """ From 1c7b0aa576eb1fa912cabd03c419571779897e32 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Thu, 15 Oct 2026 14:59:40 +0700 Subject: [PATCH 44/63] Fix compilation for scriptisto --- config/x86_64/ci.toml | 1 + .../wip/dev/rust-tools/scriptisto/recipe.toml | 6 +- .../wip/dev/rust-tools/scriptisto/redox.patch | 66 +++++++++++++++++++ 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 recipes/wip/dev/rust-tools/scriptisto/redox.patch diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml index 6d655fa20..e129c7432 100644 --- a/config/x86_64/ci.toml +++ b/config/x86_64/ci.toml @@ -257,6 +257,7 @@ rustual-boy = {} rusty-checkers = {} rusty-rain = {} rvvm = {} +scriptisto = {} scummvm = {} sdl-gfx = {} sdl1 = {} diff --git a/recipes/wip/dev/rust-tools/scriptisto/recipe.toml b/recipes/wip/dev/rust-tools/scriptisto/recipe.toml index ab19c77db..ef098c923 100644 --- a/recipes/wip/dev/rust-tools/scriptisto/recipe.toml +++ b/recipes/wip/dev/rust-tools/scriptisto/recipe.toml @@ -1,6 +1,10 @@ -#TODO liberrno linking error: undefined reference to `errno_location' +#TODO compiled but not tested [source] git = "https://github.com/igor-petruk/scriptisto" +rev = "511875fe6" shallow_clone = true +patches = [ + "redox.patch" +] [build] template = "cargo" diff --git a/recipes/wip/dev/rust-tools/scriptisto/redox.patch b/recipes/wip/dev/rust-tools/scriptisto/redox.patch new file mode 100644 index 000000000..6b17cc84e --- /dev/null +++ b/recipes/wip/dev/rust-tools/scriptisto/redox.patch @@ -0,0 +1,66 @@ +diff --git a/Cargo.lock b/Cargo.lock +index c414c6b..08c7dd0 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -37,12 +37,6 @@ version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +-[[package]] +-name = "cc" +-version = "1.0.99" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +- + [[package]] + name = "cfg-if" + version = "1.0.0" +@@ -184,30 +178,18 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + + [[package]] + name = "errno" +-version = "0.2.8" ++version = "0.3.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" ++checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" + dependencies = [ +- "errno-dragonfly", +- "libc", +- "winapi", +-] +- +-[[package]] +-name = "errno-dragonfly" +-version = "0.1.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +-dependencies = [ +- "cc", + "libc", ++ "windows-sys 0.52.0", + ] + + [[package]] + name = "exec" + version = "0.3.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "886b70328cba8871bfc025858e1de4be16b1d5088f2ba50b57816f4210672615" ++source = "git+https://github.com/alexanderkjall/exec-rs?branch=upgrade-errno-to-0.3#8e4a7edb00b2d0aed0100c1803bc4afd3e79d5c3" + dependencies = [ + "errno", + "libc", +diff --git a/Cargo.toml b/Cargo.toml +index a9c208a..0d8f354 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -53,6 +53,9 @@ clap = { version = "3", features = ["derive"] } + default-features = false + version = '0' + ++[patch.crates-io] ++exec = { git = "https://github.com/alexanderkjall/exec-rs", branch = "upgrade-errno-to-0.3" } ++ + [package.metadata.deb] + section = "utils" + assets = [ From 8cfa74baa584962cf9f5d9c36edd1742a7faa33b Mon Sep 17 00:00:00 2001 From: Wildan M Date: Thu, 15 Oct 2026 15:02:07 +0700 Subject: [PATCH 45/63] python: Fix ioctl arg type --- recipes/dev/python312/redox.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/recipes/dev/python312/redox.patch b/recipes/dev/python312/redox.patch index 034194a22..60bf30819 100644 --- a/recipes/dev/python312/redox.patch +++ b/recipes/dev/python312/redox.patch @@ -120,6 +120,18 @@ diff -ruwN source/Modules/_cryptmodule.c source-new/Modules/_cryptmodule.c if (crypt_result == NULL) { return PyErr_SetFromErrno(PyExc_OSError); } +diff -ruwN source/Modules/fcntlmodule.c source-new/Modules/fcntlmodule.c +--- source/Modules/fcntlmodule.c 2025-10-09 11:07:00.000000000 +0000 ++++ source-new/Modules/fcntlmodule.c 2026-10-15 10:21:56.351900218 +0000 +@@ -159,7 +159,7 @@ + in their unsigned long ioctl codes this will break and need + special casing based on the platform being built on. + */ +- int arg = 0; ++ char* arg = 0; + int ret; + Py_buffer pstr; + char *str; diff -ruwN source/Modules/resource.c source-new/Modules/resource.c --- source/Modules/resource.c 2025-10-09 18:07:00.000000000 +0700 +++ source-new/Modules/resource.c 2025-12-09 22:14:30.781035339 +0700 From 795aa87b723d105ffa6e5f10d5afc7c6930baa91 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Fri, 16 Oct 2026 17:30:02 +0700 Subject: [PATCH 46/63] Fix rust compilation --- recipes/dev/rust/recipe.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipes/dev/rust/recipe.toml b/recipes/dev/rust/recipe.toml index 93d5cc8f2..e1aab8aa2 100644 --- a/recipes/dev/rust/recipe.toml +++ b/recipes/dev/rust/recipe.toml @@ -30,9 +30,6 @@ sed -i "s|TARGET|${TARGET}|g" config.toml else DYNAMIC_INIT -# Linker flags for stage2 compiler (host -> target) -ARCH="${TARGET%%-*}" -export CARGO_TARGET_${ARCH^^}_UNKNOWN_REDOX_RUSTFLAGS="${RUSTFLAGS}" # Rust # Hack for Rust errorneusly running `llvm-config --version` on cross compiled llvm-config cat "${COOKBOOK_ROOT}/bin/${TARGET}-llvm-config" > "${COOKBOOK_SYSROOT}/bin/llvm-config" # Hack for Rust stage1 being dynamically linked with LLVM in prefix toolchain From c01b9c8d1084204182ef019dd6a59f4fccc342aa Mon Sep 17 00:00:00 2001 From: auronandace Date: Fri, 16 Oct 2026 11:34:03 +0100 Subject: [PATCH 47/63] remove no_rlimit patch from patch package --- .../{02_no_chown.patch => 01_no_chown.patch} | 0 recipes/dev/patch/01_no_rlimit.patch | 35 ------------------- ...{03_renameat2.patch => 02_renameat2.patch} | 0 recipes/dev/patch/recipe.toml | 5 ++- 4 files changed, 2 insertions(+), 38 deletions(-) rename recipes/dev/patch/{02_no_chown.patch => 01_no_chown.patch} (100%) delete mode 100644 recipes/dev/patch/01_no_rlimit.patch rename recipes/dev/patch/{03_renameat2.patch => 02_renameat2.patch} (100%) diff --git a/recipes/dev/patch/02_no_chown.patch b/recipes/dev/patch/01_no_chown.patch similarity index 100% rename from recipes/dev/patch/02_no_chown.patch rename to recipes/dev/patch/01_no_chown.patch diff --git a/recipes/dev/patch/01_no_rlimit.patch b/recipes/dev/patch/01_no_rlimit.patch deleted file mode 100644 index c44b9a960..000000000 --- a/recipes/dev/patch/01_no_rlimit.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ru source/lib/getdtablesize.c source-new/lib/getdtablesize.c ---- source/lib/getdtablesize.c 2015-03-06 16:31:45.000000000 -0800 -+++ source-new/lib/getdtablesize.c 2017-08-08 19:33:33.993874985 -0700 -@@ -106,15 +106,6 @@ - int - getdtablesize (void) - { -- struct rlimit lim; -- -- if (getrlimit (RLIMIT_NOFILE, &lim) == 0 -- && 0 <= lim.rlim_cur && lim.rlim_cur <= INT_MAX -- && lim.rlim_cur != RLIM_INFINITY -- && lim.rlim_cur != RLIM_SAVED_CUR -- && lim.rlim_cur != RLIM_SAVED_MAX) -- return lim.rlim_cur; -- - return INT_MAX; - } - -Only in source-new/lib: getdtablesize.c.orig -diff -ru source/src/safe.c source-new/src/safe.c ---- source/src/safe.c 2015-03-06 16:34:20.000000000 -0800 -+++ source-new/src/safe.c 2017-08-08 19:33:53.447430811 -0700 -@@ -92,11 +92,7 @@ - - static void init_dirfd_cache (void) - { -- struct rlimit nofile; -- - max_cached_fds = 8; -- if (getrlimit (RLIMIT_NOFILE, &nofile) == 0) -- max_cached_fds = MAX (nofile.rlim_cur / 4, max_cached_fds); - - cached_dirfds = hash_initialize (max_cached_fds, - NULL, diff --git a/recipes/dev/patch/03_renameat2.patch b/recipes/dev/patch/02_renameat2.patch similarity index 100% rename from recipes/dev/patch/03_renameat2.patch rename to recipes/dev/patch/02_renameat2.patch diff --git a/recipes/dev/patch/recipe.toml b/recipes/dev/patch/recipe.toml index 348734e50..b8d107d09 100644 --- a/recipes/dev/patch/recipe.toml +++ b/recipes/dev/patch/recipe.toml @@ -2,9 +2,8 @@ tar = "https://ftp.gnu.org/gnu/patch/patch-2.7.6.tar.xz" blake3 = "d46d14c12aa4ea51e356bf92091c368fd871e1d770b94bc29027886737aecd5f" patches = [ - "01_no_rlimit.patch", - "02_no_chown.patch", - "03_renameat2.patch", + "01_no_chown.patch", + "02_renameat2.patch", ] script = """ wget -O build-aux/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" From 88a892572dcdaa78091ba1365df6d0c2b30b0873 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Tue, 20 Oct 2026 14:33:43 +0700 Subject: [PATCH 48/63] Fix gcc toolchain due to package deps --- src/recipe.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/recipe.rs b/src/recipe.rs index d93eaac9a..ae65054d0 100644 --- a/src/recipe.rs +++ b/src/recipe.rs @@ -326,6 +326,8 @@ impl CookRecipe { .into_iter() .filter_map(fn_map) .collect(); + // package deps is not applicable to host recipes + recipe.package.dependencies = Vec::new() } Ok(Self { name, From b4f6410529516300c14737bcef9fa7823cf52cb4 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Wed, 21 Oct 2026 04:27:29 +0700 Subject: [PATCH 49/63] cookbook: Add LTO plugin to strip --- src/cook/script.rs | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/cook/script.rs b/src/cook/script.rs index d3665a5d2..05ba572b5 100644 --- a/src/cook/script.rs +++ b/src/cook/script.rs @@ -415,12 +415,25 @@ function cookbook_python { "#; pub(crate) static BUILD_POSTSCRIPT: &str = r#" +STRIP="${GNU_TARGET}-strip" +STRIP_ARGS="-v" + +if [[ "$REDOXER_USE_CLANG" = "1" || "$REDOXER_USE_CLANG" = "true" ]]; then + STRIP="llvm-strip" + STRIP_ARGS="--verbose" +elif [[ "$REDOXER_USE_LTO" = "1" || "$REDOXER_USE_LTO" = "true" ]]; then + GCC_BIN=$(command -v "${GNU_TARGET}-gcc") + GCC_VER=$("${GNU_TARGET}-gcc" -dumpfullversion) + PLUGIN_PATH=$(realpath "$(dirname "$GCC_BIN")/../libexec/gcc/${GNU_TARGET}/${GCC_VER}/liblto_plugin.so") + [ -f "$PLUGIN_PATH" ] && STRIP_ARGS="--plugin=${PLUGIN_PATH} -v" || echo "DEBUG: $PLUGIN_PATH not found" +fi + # Strip binaries for dir in "${COOKBOOK_STAGE}/bin" "${COOKBOOK_STAGE}/usr/bin" "${COOKBOOK_STAGE}/libexec" "${COOKBOOK_STAGE}/usr/libexec" do if [ -d "${dir}" ] && [ -z "${COOKBOOK_NOSTRIP}" ] then - find "${dir}" -type f -exec "${GNU_TARGET}-strip" -v {} ';' + find "${dir}" -type f -exec "${STRIP}" ${STRIP_ARGS} {} ';' fi done @@ -432,7 +445,7 @@ do find "${dir}" -type f -name '*.la' -exec rm -fv {} ';' if [ -z "${COOKBOOK_NOSTRIP}" ] then - find "${dir}" -type f -exec "${GNU_TARGET}-strip" --strip-debug -v {} ';' + find "${dir}" -type f -exec "${STRIP}" ${STRIP_ARGS} --strip-debug {} ';' fi fi done From 0e1c602c624ce289ff0b698d9a9e4fac104b0350 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Wed, 21 Oct 2026 14:22:16 +0700 Subject: [PATCH 50/63] Add compiler wasm option --- Cargo.lock | 2 +- mk/prefix.mk | 1 + src/cook/cook_build.rs | 5 ++++- src/cook/script.rs | 2 +- src/recipe.rs | 2 ++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a8756af68..5c6398467 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -918,7 +918,7 @@ dependencies = [ [[package]] name = "redoxer" version = "0.2.63" -source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#d448ee8b1640d91ed70c37c164ca994f0c0b4fe8" +source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#f2cdeaec39797213d8b6dc8f08d2a5ec1900ee11" dependencies = [ "anyhow", "dirs", diff --git a/mk/prefix.mk b/mk/prefix.mk index 1f3b83b3d..2601fc4b2 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -451,6 +451,7 @@ else cp -r "$(LLD_TARGET)/stage/usr/". "$@.partial" rm -rf "$@.partial/lib/"*.a echo "--sysroot=$(ROOT)/$(PREFIX)/gcc-install" > "$@.partial/bin/$(GNU_TARGET).cfg" + ln -s clang-21 "$@.partial/bin/wasm32-wasip1-clang" ln -s clang-21 "$@.partial/bin/$(GNU_TARGET)-clang" ln -s clang++ "$@.partial/bin/$(GNU_TARGET)-clang++" export PATH="$(ROOT)/$@.partial/bin:$$PATH" $(PREFIX_CONFIG) \ diff --git a/src/cook/cook_build.rs b/src/cook/cook_build.rs index 909bdcaff..81bf2f95b 100644 --- a/src/cook/cook_build.rs +++ b/src/cook/cook_build.rs @@ -470,7 +470,7 @@ pub fn build( BuildCompiler::Gcc | BuildCompiler::GccNoLTO => { command.env("REDOXER_USE_CLANG", "0"); } - BuildCompiler::Clang | BuildCompiler::ClangNoLTO => { + BuildCompiler::Clang | BuildCompiler::ClangNoLTO | BuildCompiler::Wasm => { command.env("REDOXER_USE_CLANG", "1"); } _ => {} @@ -481,6 +481,9 @@ pub fn build( } _ => {} } + if matches!(compiler, BuildCompiler::Wasm) { + command.env("TARGET", "wasm32-wasip1"); + } }; command.env("COOKBOOK_MAKE_JOBS", cli_jobs.to_string()); if cook_config.verbose_cmd { diff --git a/src/cook/script.rs b/src/cook/script.rs index 05ba572b5..5b940b59e 100644 --- a/src/cook/script.rs +++ b/src/cook/script.rs @@ -5,7 +5,7 @@ pub(crate) static SHARED_PRESCRIPT: &str = r#" # Build dynamically function DYNAMIC_INIT { case "${TARGET}" in - "riscv64gc-unknown-redox") + "riscv64gc-unknown-redox" | "wasm32-wasip1") [ -z "${COOKBOOK_VERBOSE}" ] || echo "WARN: ${TARGET} does not support dynamic linking." >&2 return ;; diff --git a/src/recipe.rs b/src/recipe.rs index ae65054d0..3a4cf18af 100644 --- a/src/recipe.rs +++ b/src/recipe.rs @@ -190,6 +190,8 @@ pub enum BuildCompiler { ClangNoLTO, #[serde(rename = "no-lto")] NoLTO, + #[serde(rename = "wasm")] + Wasm, } impl BuildRecipe { From 6384beb9611221965326fbbbd53469b1a192a1aa Mon Sep 17 00:00:00 2001 From: Wildan M Date: Wed, 21 Oct 2026 14:45:01 +0700 Subject: [PATCH 51/63] prefix: Fetch prefix sources early --- mk/prefix.mk | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/mk/prefix.mk b/mk/prefix.mk index 1f3b83b3d..0691100cd 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -209,6 +209,8 @@ $(PREFIX)/%.tar.gz: $(PREFIX)/% --directory="$<" \ . +PREFIX_FETCH_TAG=$(PREFIX)/fetch.tag + # BUILD GCC --------------------------------------------------- $(PREFIX)/libtool-install: | $(FSTOOLS_TAG) $(CONTAINER_TAG) ifeq ($(PODMAN_BUILD),1) @@ -228,7 +230,26 @@ else mv "$@.partial" "$@" endif -$(PREFIX)/binutils-install: | $(PREFIX)/libtool-install $(FSTOOLS_TAG) $(CONTAINER_TAG) +# libtool may be used during autoconf, so this depends after building libtool +# it is fine to skip this, but this is used to fail early if sources fail due to autoconf +$(PREFIX_FETCH_TAG): | $(PREFIX)/libtool-install $(FSTOOLS_TAG) $(CONTAINER_TAG) +ifeq ($(PODMAN_BUILD),1) + $(PODMAN_RUN) make $@ +else + @echo "\033[1;36;49mFetching prefix sources\033[0m" + rm -f "$@" + export $(PREFIX_CONFIG) COOKBOOK_LIBTOOL_DIR=$(LIBTOOL_PATH) PATH="$(ROOT)/$(PREFIX)/libtool-install/bin:$$PATH" \ + COOKBOOK_HOST_SYSROOT=/usr COOKBOOK_CROSS_TARGET=$(TARGET) COOKBOOK_CROSS_GNU_TARGET=$(GNU_TARGET) && \ + $(REPO_BIN) fetch host:binutils-gdb host:gcc13 host:llvm21 relibc +ifneq ($(PREFIX_USE_UPSTREAM_RUST_COMPILER),1) + export $(PREFIX_CONFIG) COOKBOOK_LIBTOOL_DIR=$(LIBTOOL_PATH) PATH="$(ROOT)/$(PREFIX)/libtool-install/bin:$$PATH" \ + COOKBOOK_HOST_SYSROOT=/usr COOKBOOK_CROSS_TARGET=$(TARGET) COOKBOOK_CROSS_GNU_TARGET=$(GNU_TARGET) && \ + $(REPO_BIN) fetch host:wasi-libc host:rust +endif + touch "$@" +endif + +$(PREFIX)/binutils-install: | $(PREFIX_FETCH_TAG) ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) make $@ else @@ -243,7 +264,7 @@ else mv "$@.partial" "$@" endif -$(PREFIX)/gcc-freestanding-install: $(PREFIX)/binutils-install | $(PREFIX)/libtool-install $(FSTOOLS_TAG) $(CONTAINER_TAG) +$(PREFIX)/gcc-freestanding-install: $(PREFIX)/binutils-install | $(PREFIX_FETCH_TAG) ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) make $@ else @@ -263,7 +284,7 @@ else mv "$@.partial" "$@" endif -$(PREFIX)/relibc-freestanding-install: $(PREFIX)/gcc-freestanding-install | $(FSTOOLS_TAG) $(CONTAINER_TAG) +$(PREFIX)/relibc-freestanding-install: $(PREFIX)/gcc-freestanding-install | $(PREFIX_FETCH_TAG) ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) make $@ else @@ -280,7 +301,7 @@ else mv "$@.partial" "$@" endif -$(PREFIX)/gcc-install: $(PREFIX)/relibc-freestanding-install | $(PREFIX)/libtool-install $(FSTOOLS_TAG) $(CONTAINER_TAG) +$(PREFIX)/gcc-install: $(PREFIX)/relibc-freestanding-install | $(PREFIX)/libtool-install $(PREFIX_FETCH_TAG) ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) make $@ else @@ -399,7 +420,7 @@ endif # BUILD RUST --------------------------------------------------- else -$(PREFIX)/wasip1-libc-install: $(PREFIX)/clang-install | $(FSTOOLS_TAG) $(CONTAINER_TAG) +$(PREFIX)/wasip1-libc-install: $(PREFIX)/clang-install | $(PREFIX_FETCH_TAG) ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) make $@ else @@ -416,7 +437,7 @@ else # TODO: Cache from WASIP1_LIBC_TARGET is currently not cleared. endif -$(PREFIX)/rust-install: | $(PREFIX)/wasip1-libc-install $(PREFIX)/gcc-install $(FSTOOLS_TAG) $(CONTAINER_TAG) +$(PREFIX)/rust-install: | $(PREFIX)/wasip1-libc-install $(PREFIX)/gcc-install $(PREFIX_FETCH_TAG) ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) make $@ else @@ -435,7 +456,7 @@ endif endif # BUILD CLANG --------------------------------------------------- -$(PREFIX)/clang-install: | $(PREFIX)/gcc-install $(FSTOOLS_TAG) $(CONTAINER_TAG) +$(PREFIX)/clang-install: | $(PREFIX)/gcc-install $(PREFIX_FETCH_TAG) ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) make $@ else From df7986b8584fe1a66165b81f3c8a1419dfd9f7e9 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Wed, 21 Oct 2026 14:46:46 +0700 Subject: [PATCH 52/63] wasi-libc: Fix linker problem --- recipes/dev/wasi-libc/recipe.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/dev/wasi-libc/recipe.toml b/recipes/dev/wasi-libc/recipe.toml index 96c488e43..ac61dcad4 100644 --- a/recipes/dev/wasi-libc/recipe.toml +++ b/recipes/dev/wasi-libc/recipe.toml @@ -7,5 +7,5 @@ shallow_clone = true template = "custom" compiler = "clang" script = """ -cookbook_cmake +cookbook_cmake -DCMAKE_LINK_DEPENDS_USE_LINKER=FALSE """ From c9f937eec8c6ef78e2bad5072811d01a5defd917 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Thu, 22 Oct 2026 10:45:38 +0700 Subject: [PATCH 53/63] Update deps --- Cargo.lock | 892 ++++++++++++++++++++++++----------------- Cargo.toml | 2 +- src/cook/cook_build.rs | 13 +- 3 files changed, 521 insertions(+), 386 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c6398467..0d1179533 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,9 +10,9 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "aho-corasick" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" +checksum = "c982642fa9e8606056828ee9a8505737230110bb1099153c79efe865c59d12ba" dependencies = [ "memchr", ] @@ -38,9 +38,18 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.102" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] [[package]] name = "arg_parser" @@ -49,35 +58,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9bcdf9185a4ea0d8afa7c8ad387cc3a93c3ecfa918125e000a57a42e71268d7" [[package]] -name = "arrayref" -version = "0.3.9" +name = "arrayvec" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" +checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56" [[package]] -name = "arrayvec" -version = "0.7.6" +name = "autocfg" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "bitflags" -version = "2.10.0" +version = "2.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" +checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06" [[package]] name = "blake3" -version = "1.8.3" +version = "1.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2468ef7d57b3fb7e16b576e8377cdbde2320c60e1491e961d11da40fc4f02a2d" +checksum = "6d9e454fc11f76977dc803893aff6304ed33d6a26efae8696573bea74baa27ae" dependencies = [ - "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "cpufeatures", + "cpufeatures 0.3.1", "rayon-core", ] @@ -91,33 +99,55 @@ dependencies = [ ] [[package]] -name = "bstr" -version = "1.12.1" +name = "block-buffer" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" +checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa" dependencies = [ - "memchr", - "serde", + "hybrid-array", + "zeroize", ] [[package]] -name = "bytemuck" -version = "1.24.0" +name = "bstr" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" +checksum = "6bb31b46c14244e20ee9984b11bf5c992b91fb6939fea616e3512c8baecdbe5f" +dependencies = [ + "memchr", + "serde_core", +] + +[[package]] +name = "bumpalo" +version = "3.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" + +[[package]] +name = "by_address" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" + +[[package]] +name = "bytemuck" +version = "1.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95832e849adfb21180ccb6826a99da14e5d266ae5c2e668e1602cf234f153797" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.10.2" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" +checksum = "6a1f896587b6f2c069c73d2f0913e2d590c3990285cd2f0b6aa02b786b4c679c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.6", ] [[package]] @@ -131,9 +161,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.49" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215" +checksum = "f74872d07caf508b30a21f6836e7d7016a2eaf7d9ff4f48deaa58cd8a0407630" dependencies = [ "find-msvc-tools", "shlex", @@ -141,37 +171,39 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" +checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600" [[package]] name = "chacha20" -version = "0.9.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06" dependencies = [ "cfg-if", "cipher", - "cpufeatures", + "cpufeatures 0.3.1", + "zeroize", ] [[package]] name = "cipher" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +checksum = "e8cf2a2c93cd704877c0858356ed03480ff301ee950b43f1cbe4573b088bfa6c" dependencies = [ - "crypto-common", + "block-buffer 0.12.1", + "crypto-common 0.2.2", "inout", "zeroize", ] [[package]] name = "compact_str" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a" +checksum = "9dfdd1c2274d9aa354115b09dc9a901d6c5576818cdf70d14cae2bdb47df00ab" dependencies = [ "castaway", "cfg-if", @@ -181,6 +213,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "const-oid" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" + [[package]] name = "constant_time_eq" version = "0.4.2" @@ -197,19 +235,28 @@ dependencies = [ ] [[package]] -name = "crc32fast" -version = "1.5.0" +name = "cpufeatures" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01a7799fd6b852db0e61728dde9a204c423b44d689dbd432522543614b490e78" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-deque" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +checksum = "622f3fc73690be383c7214310406f28a90e6edeadc3cea882f9d71e495b9711a" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -217,18 +264,18 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.18" +version = "0.9.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +checksum = "dc74980687109a3b14c72fd458107bf0baa1da1a1a805e178d15501ba9b86d9d" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.21" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6" [[package]] name = "crypto-common" @@ -240,6 +287,15 @@ dependencies = [ "typenum", ] +[[package]] +name = "crypto-common" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" +dependencies = [ + "hybrid-array", +] + [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -247,7 +303,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "curve25519-dalek-derive", "fiat-crypto", "rustc_version", @@ -263,14 +319,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] name = "darling" -version = "0.20.11" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" +checksum = "ed17f5901b6630b993ca003def43f2f8ef4014fc13b047b57aad617ff32bc2ec" dependencies = [ "darling_core", "darling_macro", @@ -278,27 +334,26 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.11" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" +checksum = "6837e2cf7485aaae18f86181d2f0e9a7ed297a025e220aeabf63fdebd3a2ddff" dependencies = [ - "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn", + "syn 3.0.6", ] [[package]] name = "darling_macro" -version = "0.20.11" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" +checksum = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785" dependencies = [ "darling_core", "quote", - "syn", + "syn 3.0.6", ] [[package]] @@ -306,9 +361,6 @@ name = "deranged" version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" -dependencies = [ - "powerfmt", -] [[package]] name = "digest" @@ -316,8 +368,20 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer", - "crypto-common", + "block-buffer 0.10.4", + "crypto-common 0.1.7", +] + +[[package]] +name = "digest" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" +dependencies = [ + "block-buffer 0.12.1", + "const-oid", + "crypto-common 0.2.2", + "zeroize", ] [[package]] @@ -338,24 +402,23 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] name = "dryoc" -version = "0.7.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4684d84cc4dc1a8705dcbe8be0e258581dfdbb308477ed604f52797c336bb3d2" +checksum = "2a9268c01fc6ec1f2a104ae9e40343c255fbcafea97a48f334237206c96838b2" dependencies = [ - "bitflags", "chacha20", "curve25519-dalek", - "generic-array", - "lazy_static", + "getrandom", "libc", - "rand_core", + "rand", "salsa20", - "sha2", + "sha2 0.11.0", + "sha3", "subtle", "winapi", "zeroize", @@ -363,9 +426,9 @@ dependencies = [ [[package]] name = "either" -version = "1.15.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be" [[package]] name = "equivalent" @@ -381,26 +444,21 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "find-msvc-tools" -version = "0.1.5" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" +checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484" [[package]] name = "flate2" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" +checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb" dependencies = [ "crc32fast", "miniz_oxide", + "zlib-rs", ] -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - [[package]] name = "foldhash" version = "0.2.0" @@ -419,32 +477,23 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.16" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "getrandom" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" dependencies = [ "cfg-if", + "js-sys", "libc", "r-efi", - "wasip2", + "rand_core", + "wasm-bindgen", ] [[package]] name = "globset" -version = "0.4.18" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3" +checksum = "07c34a9410465b45bd9787443bc7370f37735bad04b0f0cd57ff1a3186c98988" dependencies = [ "aho-corasick", "bstr", @@ -464,6 +513,17 @@ dependencies = [ "foldhash", ] +[[package]] +name = "hashbrown" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + [[package]] name = "heck" version = "0.5.0" @@ -479,6 +539,16 @@ dependencies = [ "serde", ] +[[package]] +name = "hybrid-array" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27f864f10dfb56725ce5ce5472bc52252c8f93a4ab86327122cebf62c5f59a17" +dependencies = [ + "typenum", + "zeroize", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -487,9 +557,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "ignore" -version = "0.4.25" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3d782a365a015e0f5c04902246139249abf769125006fbe7649e2ee88169b4a" +checksum = "00b69833ed729dc5aa7d19541d96d6cf8e9137194207a04916d658e43168402f" dependencies = [ "crossbeam-deque", "globset", @@ -503,12 +573,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.12.1" +version = "2.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" +checksum = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.17.1", ] [[package]] @@ -522,24 +592,24 @@ dependencies = [ [[package]] name = "inout" -version = "0.1.4" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" +checksum = "4250ce6452e92010fdf7268ccc5d14faa80bb12fc741938534c58f16804e03c7" dependencies = [ - "generic-array", + "hybrid-array", ] [[package]] name = "instability" -version = "0.3.10" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6778b0196eefee7df739db78758e5cf9b37412268bfa5650bfeed028aed20d9c" +checksum = "4c3b5acc1e2fd9375041a388da33d1eb8aed5f7a8c0dd3543e3ea2805adfbe20" dependencies = [ "darling", "indoc", "proc-macro2", "quote", - "syn", + "syn 3.0.6", ] [[package]] @@ -553,9 +623,19 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" + +[[package]] +name = "js-sys" +version = "0.3.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7883d941dae510fb2d978fc3fe018c71c9e2892fd38854de3e8b92c2e5ad9cc5" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] [[package]] name = "kasuari" @@ -563,88 +643,96 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bde5057d6143cc94e861d90f591b9303d6716c6b9602309150bd068853c10899" dependencies = [ - "hashbrown", + "hashbrown 0.16.1", "portable-atomic", "thiserror", ] [[package]] -name = "lazy_static" -version = "1.5.0" +name = "keccak" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +checksum = "d8f198d1db720e4940b5a493201d199d9f24f568f8f746bd13706243a2f71598" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.1", +] [[package]] name = "libc" -version = "0.2.178" +version = "0.2.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" +checksum = "ce5d3ddc6d3fa000eb1536d85e147bfe31aacaba692ed6a876f95cb7c855be78" + +[[package]] +name = "libm" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" -version = "0.1.10" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" +checksum = "61ff90caf6077a803a240f62fdbe88645a890bbca49ef8174c3cb0404362171d" dependencies = [ - "bitflags", "libc", ] [[package]] name = "line-clipping" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4de44e98ddbf09375cbf4d17714d18f39195f4f4894e8524501726fd9a8a4a" +checksum = "e752191d037c44ad111a8caa762921926658402f01cc1253f7bef2020ece4f5e" dependencies = [ "bitflags", ] [[package]] name = "log" -version = "0.4.29" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" [[package]] name = "lru" -version = "0.16.3" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593" +checksum = "ef9ac18847474e638e3702b76c65d4eb93428471a74778ef0f1be711717f89b5" dependencies = [ - "hashbrown", + "hashbrown 0.17.1", ] [[package]] name = "lzma-rust2" -version = "0.16.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47bb1e988e6fb779cf720ad431242d3f03167c1b3f2b1aae7f1a94b2495b36ae" +checksum = "5e2a88783b84d2d67ef2791778a9e76bfb68b8017aaf6c9d7d5f2626a478b16c" dependencies = [ - "sha2", + "sha2 0.11.0", ] [[package]] name = "memchr" -version = "2.7.6" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] -name = "memsec" -version = "0.6.3" +name = "memsafe" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa0916b001582d253822171bd23f4a0229d32b9507fae236f5da8cad515ba7c" +checksum = "bcf2b4d7a25d60474415c3ed174d37baac2881182484cce3cd765536e17301cf" dependencies = [ - "getrandom 0.2.16", "libc", - "windows-sys 0.45.0", + "winapi", ] [[package]] name = "miniz_oxide" -version = "0.8.9" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +checksum = "b63fbc4a50860e98e7b2aa7804ded1db5cbc3aff9193adaff57a6931bf7c4b4c" dependencies = [ "adler2", "simd-adler32", @@ -661,9 +749,18 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.1.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] [[package]] name = "num_threads" @@ -688,22 +785,61 @@ checksum = "271638cd5fa9cca89c4c304675ca658efc4e64a66c716b7cfe1afb4b9611dbbc" dependencies = [ "crc32fast", "flate2", - "hashbrown", + "hashbrown 0.16.1", "indexmap", "memchr", "ruzstd", ] +[[package]] +name = "once_cell" +version = "1.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" + [[package]] name = "option-ext" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +[[package]] +name = "palette" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddeed8580d347d2abf3dcf06a5f0b3dc020258338526b277847cd4248a70fc64" +dependencies = [ + "approx", + "libm", + "palette_derive", + "palette_math", +] + +[[package]] +name = "palette_derive" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88537020289b719d81be994ccf1bbf4990f477e2f69ee52fe3e45f43a02e56be" +dependencies = [ + "by_address", + "proc-macro2", + "quote", + "syn 2.0.119", +] + +[[package]] +name = "palette_math" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e6eb142958d64335fb0e345c5b9ead2ecd6fc438c307e9d7d3c4fd428dbaf12" +dependencies = [ + "libm", +] + [[package]] name = "pkgar" -version = "0.2.3" -source = "git+https://gitlab.redox-os.org/redox-os/pkgar.git#a7b65343e856d4b16f9e788a7c49fffb05822dab" +version = "0.2.4" +source = "git+https://gitlab.redox-os.org/redox-os/pkgar.git#d10d42b143b03b141f9792a48cfd3ef059867051" dependencies = [ "blake3", "bytemuck", @@ -715,8 +851,8 @@ dependencies = [ [[package]] name = "pkgar-core" -version = "0.2.3" -source = "git+https://gitlab.redox-os.org/redox-os/pkgar.git#a7b65343e856d4b16f9e788a7c49fffb05822dab" +version = "0.2.4" +source = "git+https://gitlab.redox-os.org/redox-os/pkgar.git#d10d42b143b03b141f9792a48cfd3ef059867051" dependencies = [ "bitflags", "blake3", @@ -726,12 +862,12 @@ dependencies = [ [[package]] name = "pkgar-keys" -version = "0.2.3" -source = "git+https://gitlab.redox-os.org/redox-os/pkgar.git#a7b65343e856d4b16f9e788a7c49fffb05822dab" +version = "0.2.4" +source = "git+https://gitlab.redox-os.org/redox-os/pkgar.git#d10d42b143b03b141f9792a48cfd3ef059867051" dependencies = [ "hex", + "memsafe", "pkgar-core", - "seckey", "serde", "thiserror", "toml", @@ -739,74 +875,83 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" +checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85" [[package]] name = "powerfmt" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" +checksum = "4a6394b9e965e73d0a289ee54f589087e2c676aedf60885baf52c76b771e4958" [[package]] name = "proc-macro2" -version = "1.0.103" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.42" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" +checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001" dependencies = [ "proc-macro2", ] [[package]] name = "r-efi" -version = "5.3.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] -name = "rand_core" -version = "0.9.5" +name = "rand" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" +checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af" dependencies = [ - "getrandom 0.3.4", + "getrandom", + "rand_core", ] [[package]] -name = "ratatui" -version = "0.30.0" +name = "rand_core" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1ce67fb8ba4446454d1c8dbaeda0557ff5e94d39d5e5ed7f10a65eb4c8266bc" +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" + +[[package]] +name = "ratatui" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3274ba0a2c5e1bcad2a2005d20f4dc59dad26b2eb0940fb094500dba4099d57d" dependencies = [ "instability", "ratatui-core", "ratatui-termion", "ratatui-widgets", + "serde", ] [[package]] name = "ratatui-core" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef8dea09a92caaf73bff7adb70b76162e5937524058a7e5bff37869cbbec293" +checksum = "cbb175c433c8e28a809d1f5773a2ae96e68c0ce40db865cbab1020bf33ae479c" dependencies = [ "bitflags", "compact_str", - "hashbrown", - "indoc", + "hashbrown 0.17.1", "itertools", "kasuari", "lru", + "palette", + "serde", "strum", "thiserror", "unicode-segmentation", @@ -816,9 +961,9 @@ dependencies = [ [[package]] name = "ratatui-termion" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cade85a8591fbc911e147951422f0d6fd40f4948b271b6216c7dc01838996f8" +checksum = "87c732202fa5a71a9da0991013f0853e53f87048f45198e3a1ca3ee722accc2f" dependencies = [ "instability", "ratatui-core", @@ -827,17 +972,18 @@ dependencies = [ [[package]] name = "ratatui-widgets" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7dbfa023cd4e604c2553483820c5fe8aa9d71a42eea5aa77c6e7f35756612db" +checksum = "66e3d19bcc9130ca376277d93b60767ff121ace3be06f5f95f81dd68956407d1" dependencies = [ "bitflags", - "hashbrown", + "hashbrown 0.17.1", "indoc", "instability", "itertools", "line-clipping", "ratatui-core", + "serde", "strum", "time", "unicode-segmentation", @@ -856,8 +1002,8 @@ dependencies = [ [[package]] name = "redox-pkg" -version = "0.3.2" -source = "git+https://gitlab.redox-os.org/redox-os/pkgutils.git#5de8f295fdce141aa76ddba6f787b5589db18783" +version = "0.3.3" +source = "git+https://gitlab.redox-os.org/redox-os/pkgutils.git#fe21bfd95d869cafd356bcdec4d1a81739ede5ee" dependencies = [ "hex", "serde", @@ -895,7 +1041,7 @@ dependencies = [ [[package]] name = "redox_installer" version = "0.2.42" -source = "git+https://gitlab.redox-os.org/redox-os/installer.git#b5a11310e1ac915494efea6d18e242966da74f3f" +source = "git+https://gitlab.redox-os.org/redox-os/installer.git#2d2416c151e880bd68799b5c6cf46d019d964675" dependencies = [ "anyhow", "arg_parser", @@ -906,11 +1052,10 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" +checksum = "60dc65c0ff1a7ae1294b0c67b9f14baf70b644404010370171787bfac1038fc0" dependencies = [ - "getrandom 0.2.16", "libredox", "thiserror", ] @@ -922,14 +1067,14 @@ source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#f2cdeaec39797213d dependencies = [ "anyhow", "dirs", - "sha2", + "sha2 0.10.9", ] [[package]] name = "regex" -version = "1.12.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d" dependencies = [ "aho-corasick", "memchr", @@ -939,9 +1084,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.13" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2" dependencies = [ "aho-corasick", "memchr", @@ -950,9 +1095,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" +checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "rustc_version" @@ -965,31 +1110,32 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" [[package]] name = "ruzstd" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ff0cc5e135c8870a775d3320910cd9b564ec036b4dc0b8741629020be63f01" +checksum = "a7c1c839d570d835527c9a5e4db7cb2198683a988cb9d7293fc8674e6bd58fc8" dependencies = [ "twox-hash", ] [[package]] name = "ryu" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" [[package]] name = "salsa20" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +checksum = "2f874456e72520ff1375a06c588eaf074b0f01f9e9e1aada45bd9b7954a6e42c" dependencies = [ + "cfg-if", "cipher", ] @@ -1002,26 +1148,17 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "seckey" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd64b8649b6038d9ea27fde99aeded1c5571c00af18a6bc54ed6c1e01d7d2083" -dependencies = [ - "memsec", -] - [[package]] name = "semver" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" +checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" [[package]] name = "serde" -version = "1.0.228" +version = "1.0.229" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba" dependencies = [ "serde_core", "serde_derive", @@ -1029,29 +1166,29 @@ dependencies = [ [[package]] name = "serde_core" -version = "1.0.228" +version = "1.0.229" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.228" +version = "1.0.229" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.6", ] [[package]] name = "serde_json" -version = "1.0.149" +version = "1.0.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" +checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14" dependencies = [ "itoa", "memchr", @@ -1062,11 +1199,11 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.9" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" +checksum = "4e7523beb55eece201a2356bee0bbca0d1ab466c14c07703b2e0ee6d42cb0c2c" dependencies = [ - "serde", + "serde_core", ] [[package]] @@ -1076,21 +1213,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", - "cpufeatures", - "digest", + "cpufeatures 0.2.17", + "digest 0.10.7", +] + +[[package]] +name = "sha2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.1", + "digest 0.11.3", +] + +[[package]] +name = "sha3" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc9bad02c26382724b2d2692c6f179285e4b54eeecd7968f52a50059c3c11759" +dependencies = [ + "digest 0.11.3", + "keccak", + "sponge-cursor", ] [[package]] name = "shlex" -version = "1.3.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" [[package]] name = "simd-adler32" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" +checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea" [[package]] name = "simdutf8" @@ -1100,9 +1259,18 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "smallvec" -version = "1.15.1" +version = "1.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +checksum = "f9395f0f0eee849a9b707b2f06bb92a6a422090e2123bb2ef8e87a0e61892a8e" + +[[package]] +name = "sponge-cursor" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a0219bd7d979d58245a4f41f695e1ac9f8befdffadd7f61f1bae9e39abc6620" +dependencies = [ + "zeroize", +] [[package]] name = "static_assertions" @@ -1127,23 +1295,23 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" +checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" +checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664" dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -1154,9 +1322,20 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.111" +version = "2.0.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" +checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee" dependencies = [ "proc-macro2", "quote", @@ -1175,109 +1354,107 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.17" +version = "2.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +checksum = "09e52cb86a36cede5cb101bf8908837b3e4c6e5e59fe7fd85c23fb56200d189e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "2.0.17" +version = "2.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.6", ] [[package]] name = "time" -version = "0.3.44" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" +checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134" dependencies = [ "deranged", "libc", "num-conv", "num_threads", "powerfmt", - "serde", + "serde_core", "time-core", ] [[package]] name = "time-core" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" +checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" [[package]] name = "toml" -version = "0.8.23" +version = "1.1.7+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.22.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" +checksum = "7874cd34dd99040fc24e30923aa64a60a81ff3ddfe2b8129ccc84ba24949deed" dependencies = [ "indexmap", - "serde", + "serde_core", "serde_spanned", "toml_datetime", - "toml_write", + "toml_parser", + "toml_writer", "winnow", ] [[package]] -name = "toml_write" -version = "0.1.2" +name = "toml_datetime" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" +checksum = "2b86d767906c6c42421dcba507eb9d203e779497710a47782a224bb871653053" +dependencies = [ + "serde_core", +] + +[[package]] +name = "toml_parser" +version = "1.1.4+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bed810ee007d8e7f9cf20b4774e7198142fa27186e0f805871da7f3c39eaf333" +dependencies = [ + "winnow", +] + +[[package]] +name = "toml_writer" +version = "1.1.3+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06bdbd8cfc056b8d2e2e85f29b56a3bdbecb527cef81eb39e3e7b98af4652770" [[package]] name = "twox-hash" -version = "2.1.2" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" +checksum = "86a801b3cea342a06d468c8710662aa29e5e05e4f5c0d62f00bbb7f2ad7941c2" [[package]] name = "typenum" -version = "1.19.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" +checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" [[package]] name = "unicode-ident" -version = "1.0.22" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" +checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954" [[package]] name = "unicode-segmentation" -version = "1.12.0" +version = "1.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" +checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8" [[package]] name = "unicode-truncate" @@ -1292,9 +1469,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" [[package]] name = "version_check" @@ -1322,18 +1499,48 @@ dependencies = [ ] [[package]] -name = "wasi" -version = "0.11.1+wasi-snapshot-preview1" +name = "wasm-bindgen" +version = "0.2.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" +checksum = "9bb54f33acc68fd454578d9820b0bde1a1a3d17aa17bb7b6595806d02886d409" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] [[package]] -name = "wasip2" -version = "1.0.2+wasi-0.2.9" +name = "wasm-bindgen-macro" +version = "0.2.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +checksum = "2e29d0c35b16e224a7eeb5cd2d25e3e1968fbd65604117b44d3b789d00ee8535" dependencies = [ - "wit-bindgen", + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.129" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f501a8bc3719dba86ef8ae4728879c08001bea749eb1333ac5b91e040e2a6b7" +dependencies = [ + "bumpalo", + "proc-macro2", + "quote", + "syn 3.0.6", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.129" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23f0c9c52aa7cd7d77769a4cfe2a9adb1b331f489a41d912ce14513d5ab995c6" +dependencies = [ + "unicode-ident", ] [[package]] @@ -1358,7 +1565,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -1373,15 +1580,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets", -] - [[package]] name = "windows-sys" version = "0.61.2" @@ -1391,100 +1589,40 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - [[package]] name = "winnow" -version = "0.7.14" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" -dependencies = [ - "memchr", -] - -[[package]] -name = "wit-bindgen" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" +checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" [[package]] name = "zeroize" -version = "1.8.2" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" +checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] -name = "zmij" -version = "1.0.21" +name = "zlib-rs" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" +checksum = "b268e58e7c693d7c271f93ffc4ba3b380412554231c85bf61ca7af91042a4112" + +[[package]] +name = "zmij" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" diff --git a/Cargo.toml b/Cargo.toml index 7f919cb77..de664d4d8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,7 +48,7 @@ redoxer = { git = "https://gitlab.redox-os.org/redox-os/redoxer.git", default-fe regex = "1.11" serde = { version = "1", features = ["derive"] } termion = "4" -toml = "0.8" +toml = "1" walkdir = "2.3.1" ansi-to-tui = { version = "8", optional = true } strip-ansi-escapes = { version = "0.2.1", optional = true } diff --git a/src/cook/cook_build.rs b/src/cook/cook_build.rs index 81bf2f95b..c059dc125 100644 --- a/src/cook/cook_build.rs +++ b/src/cook/cook_build.rs @@ -9,7 +9,6 @@ use crate::cook::package::{package_source_paths, package_target}; use crate::cook::{fetch, fs, pty::PtyOut, script::*}; use crate::recipe::BuildCompiler; use crate::recipe::{AutoDeps, BuildKind, CookRecipe, OptionalPackageRecipe, Recipe}; -use std::io::Read; use std::{ collections::{BTreeSet, VecDeque}, path::{Path, PathBuf}, @@ -822,16 +821,14 @@ pub fn build_remote( } fn hint_incorrect_pkey(logger: &PtyOut, source_pubkey: &Path, source_pkgar: &Path) -> Option<()> { - // TODO: Move to pkgar - let mut file = std::fs::File::open(source_pkgar).ok()?; - let mut buffer = vec![0u8; pkgar_core::HEADER_SIZE]; - file.read_exact(&mut buffer).ok()?; log_to_pty!( logger, "DEBUG: Pkgar key mismatch, hint:\n - expected: {:?}\n - current: {:?}", - blake3::Hash::from_bytes(unsafe { - pkgar_core::Header::new_unchecked(&buffer).ok()?.public_key - }) + blake3::Hash::from_bytes( + pkgar_keys::PublicKeyFile::from_header_path(source_pkgar) + .ok()? + .pkey + ) .to_hex() .to_string(), blake3::Hash::from_bytes(PublicKeyFile::open(source_pubkey).ok()?.pkey) From 98ad0a8752773f88f7b623ad63273f6e13ceb4b5 Mon Sep 17 00:00:00 2001 From: auronandace Date: Fri, 23 Oct 2026 14:49:41 +0100 Subject: [PATCH 54/63] remove lz4 patch --- recipes/archives/lz4/recipe.toml | 1 - recipes/archives/lz4/redox.patch | 34 -------------------------------- 2 files changed, 35 deletions(-) delete mode 100644 recipes/archives/lz4/redox.patch diff --git a/recipes/archives/lz4/recipe.toml b/recipes/archives/lz4/recipe.toml index 6ab50fbda..24943ff7f 100644 --- a/recipes/archives/lz4/recipe.toml +++ b/recipes/archives/lz4/recipe.toml @@ -1,7 +1,6 @@ [source] tar = "https://github.com/lz4/lz4/releases/download/v1.10.0/lz4-1.10.0.tar.gz" blake3 = "3e69fd475e7852e17594985528b5232afeba7d3d56cfebe2e89071768b2ab36a" -patches = ["redox.patch"] [build] template = "custom" diff --git a/recipes/archives/lz4/redox.patch b/recipes/archives/lz4/redox.patch deleted file mode 100644 index 095ae277d..000000000 --- a/recipes/archives/lz4/redox.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff '--color=auto' -ruwN source/programs/util.h source-new/programs/util.h ---- source/programs/util.h 2024-07-21 13:29:49.000000000 -0400 -+++ source-new/programs/util.h 2024-12-13 02:21:03.032769559 -0500 -@@ -52,6 +52,9 @@ - #include /* time */ - #include /* INT_MAX */ - #include -+#if defined(_REDOX) -+# include /* utimes */ -+#endif - - - -@@ -239,12 +242,20 @@ - timebuf.modtime = statbuf->st_mtime; - res += utime(filename, &timebuf); /* set access and modification times */ - #else -+ #if defined(_REDOX) -+ struct timeval timebuf[2]; -+ memset(timebuf, 0, sizeof(timebuf)); -+ timebuf[0].tv_usec = UTIME_NOW; -+ timebuf[1].tv_sec = statbuf->st_mtime; -+ res += utimes(filename, timebuf); -+ #else - struct timespec timebuf[2]; - memset(timebuf, 0, sizeof(timebuf)); - timebuf[0].tv_nsec = UTIME_NOW; - timebuf[1].tv_sec = statbuf->st_mtime; - res += utimensat(AT_FDCWD, filename, timebuf, 0); /* set access and modification times */ - #endif -+#endif - } - - #if !defined(_WIN32) From ee828cd325ca35d23717f42189def83bd909c5ae Mon Sep 17 00:00:00 2001 From: Ribbon Date: Sat, 24 Oct 2026 13:20:41 -0300 Subject: [PATCH 55/63] Add and update recipes --- recipes/wip/archives/hatchzip/recipe.toml | 11 +++++++++++ recipes/wip/demos/ratatui-3d/recipe.toml | 1 - recipes/wip/emu/pc/lightspark/recipe.toml | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 recipes/wip/archives/hatchzip/recipe.toml diff --git a/recipes/wip/archives/hatchzip/recipe.toml b/recipes/wip/archives/hatchzip/recipe.toml new file mode 100644 index 000000000..f4366a005 --- /dev/null +++ b/recipes/wip/archives/hatchzip/recipe.toml @@ -0,0 +1,11 @@ +#TODO compile and test +[source] +git = "https://github.com/xevrion/hatchzip" +shallow_clone = true +[build] +template = "cargo" +cargopackages = [ + "hatchzip", + "hatchzip-gui", +] +#dependencies = ["fontconfig"] # needed? diff --git a/recipes/wip/demos/ratatui-3d/recipe.toml b/recipes/wip/demos/ratatui-3d/recipe.toml index 75281b35e..b9a9e280b 100644 --- a/recipes/wip/demos/ratatui-3d/recipe.toml +++ b/recipes/wip/demos/ratatui-3d/recipe.toml @@ -7,6 +7,5 @@ template = "cargo" cargoflags = ["--no-default-features --features=gltf,gpu"] cargoexamples = [ "cornell", - "cube", "dna", ] diff --git a/recipes/wip/emu/pc/lightspark/recipe.toml b/recipes/wip/emu/pc/lightspark/recipe.toml index 864f97333..f8e11ee66 100644 --- a/recipes/wip/emu/pc/lightspark/recipe.toml +++ b/recipes/wip/emu/pc/lightspark/recipe.toml @@ -1,7 +1,7 @@ #TODO build error [source] git = "https://github.com/lightspark/lightspark" -rev = "ff478b8a6a349a6d919e342d04793dad454fdf5c" +rev = "0.10.0" shallow_clone = true [build] template = "cmake" From e079d707b82e3581ad910843c26d5b2d595f2de8 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Sat, 24 Oct 2026 14:09:13 -0300 Subject: [PATCH 56/63] Update more recipes and TODOs --- recipes/wip/archives/7zip/recipe.toml | 4 ++-- recipes/wip/archives/gnu-tar/recipe.toml | 2 +- recipes/wip/archives/gzip/recipe.toml | 2 +- recipes/wip/archives/hatchzip/recipe.toml | 2 +- recipes/wip/archives/orz/recipe.toml | 2 +- recipes/wip/archives/ouch/recipe.toml | 2 +- recipes/wip/archives/unrar/recipe.toml | 8 +++++++- recipes/wip/archives/unzip-rs/recipe.toml | 2 +- recipes/wip/demos/ratatui-3d/recipe.toml | 2 +- 9 files changed, 16 insertions(+), 10 deletions(-) diff --git a/recipes/wip/archives/7zip/recipe.toml b/recipes/wip/archives/7zip/recipe.toml index 4c9686ddd..1bab446bf 100644 --- a/recipes/wip/archives/7zip/recipe.toml +++ b/recipes/wip/archives/7zip/recipe.toml @@ -1,5 +1,5 @@ -#TODO missing script for gnu make: https://github.com/mcmilk/7-Zip/tree/master/DOC#readme +#TODO add script for gnu make: https://github.com/ip7z/7zip/blob/main/DOC/readme.txt#L110 [source] -tar = "https://7-zip.org/a/7z2301-src.tar.xz" +tar = "https://7-zip.org/a/7z2605-src.tar.xz" [build] template = "cmake" diff --git a/recipes/wip/archives/gnu-tar/recipe.toml b/recipes/wip/archives/gnu-tar/recipe.toml index e96199b08..9e7528579 100644 --- a/recipes/wip/archives/gnu-tar/recipe.toml +++ b/recipes/wip/archives/gnu-tar/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO fix gzip dep [source] tar = "https://ftp.gnu.org/gnu/tar/tar-1.35.tar.bz2" [build] diff --git a/recipes/wip/archives/gzip/recipe.toml b/recipes/wip/archives/gzip/recipe.toml index 9e94309a5..b3fb1a9b7 100644 --- a/recipes/wip/archives/gzip/recipe.toml +++ b/recipes/wip/archives/gzip/recipe.toml @@ -1,4 +1,4 @@ -#TODO not compiled or tested +#TODO port gnulib fseterr.c [source] tar = "https://ftp.gnu.org/gnu/gzip/gzip-1.14.tar.gz" [build] diff --git a/recipes/wip/archives/hatchzip/recipe.toml b/recipes/wip/archives/hatchzip/recipe.toml index f4366a005..f8f0f4214 100644 --- a/recipes/wip/archives/hatchzip/recipe.toml +++ b/recipes/wip/archives/hatchzip/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO build error: HatchZip has no platform module for this system yet; add one in src/platform/ [source] git = "https://github.com/xevrion/hatchzip" shallow_clone = true diff --git a/recipes/wip/archives/orz/recipe.toml b/recipes/wip/archives/orz/recipe.toml index cf82b62ae..948d5a7e3 100644 --- a/recipes/wip/archives/orz/recipe.toml +++ b/recipes/wip/archives/orz/recipe.toml @@ -1,4 +1,4 @@ -#TODO don't run +#TODO can't run [source] git = "https://github.com/richox/orz" shallow_clone = true diff --git a/recipes/wip/archives/ouch/recipe.toml b/recipes/wip/archives/ouch/recipe.toml index 9bc40883a..57b57260f 100644 --- a/recipes/wip/archives/ouch/recipe.toml +++ b/recipes/wip/archives/ouch/recipe.toml @@ -1,4 +1,4 @@ -#TODO compilation error +#TODO unrar-ng-sys crate error [source] git = "https://github.com/ouch-org/ouch" shallow_clone = true diff --git a/recipes/wip/archives/unrar/recipe.toml b/recipes/wip/archives/unrar/recipe.toml index a1a1e9dee..28d140034 100644 --- a/recipes/wip/archives/unrar/recipe.toml +++ b/recipes/wip/archives/unrar/recipe.toml @@ -1,5 +1,11 @@ -#TODO missing script for gnu make, read the makefile in the tarball +#TODO not compiled or tested [source] tar = "https://www.rarlab.com/rar/unrarsrc-7.2.6.tar.gz" [build] template = "custom" +script = """ +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +DYNAMIC_INIT +"${COOKBOOK_MAKE}" unrar lib -j "${COOKBOOK_MAKE_JOBS}" +"${COOKBOOK_MAKE}" install-unrar install-lib DESTDIR="${COOKBOOK_STAGE}/usr" +""" diff --git a/recipes/wip/archives/unzip-rs/recipe.toml b/recipes/wip/archives/unzip-rs/recipe.toml index c2407fdf8..898ac4b8b 100644 --- a/recipes/wip/archives/unzip-rs/recipe.toml +++ b/recipes/wip/archives/unzip-rs/recipe.toml @@ -1,5 +1,5 @@ # the rust reimplementation is prefered over c implementation, which is abandoned with security bugs: https://github.com/quininer/unzrip#safety -#TODO compile and test +#TODO compiled but not tested (after cargo update) [source] git = "https://github.com/quininer/unzrip" shallow_clone = true diff --git a/recipes/wip/demos/ratatui-3d/recipe.toml b/recipes/wip/demos/ratatui-3d/recipe.toml index b9a9e280b..ad91edaea 100644 --- a/recipes/wip/demos/ratatui-3d/recipe.toml +++ b/recipes/wip/demos/ratatui-3d/recipe.toml @@ -1,4 +1,4 @@ -#TODO compile and test +#TODO compiled but not tested [source] git = "https://github.com/limlabs/ratatui-3d" shallow_clone = true From d70ae57bb904c77d4e20783c740977762f8095ca Mon Sep 17 00:00:00 2001 From: auronandace Date: Mon, 26 Oct 2026 09:29:06 +0000 Subject: [PATCH 57/63] update rsync from 3.4.1 to 3.5.1 --- recipes/net/rsync/recipe.toml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/recipes/net/rsync/recipe.toml b/recipes/net/rsync/recipe.toml index 32c1d89c0..2496a4ef9 100644 --- a/recipes/net/rsync/recipe.toml +++ b/recipes/net/rsync/recipe.toml @@ -1,6 +1,6 @@ [source] -tar = "https://download.samba.org/pub/rsync/src/rsync-3.4.1.tar.gz" -blake3 = "e1cfdd51a1a89a49e73f8fa730a4321392fe4a29533c0979c2c09c7ce3808b6f" +tar = "https://download.samba.org/pub/rsync/src/rsync-3.5.1.tar.gz" +blake3 = "bafd113fecb286d462dbb0455078421a72fc73f3360a6c9f05c369f1c8707e1b" [build] template = "configure" @@ -10,3 +10,7 @@ dependencies = [ "openssl3", "xxhash", ] +# TODO: libidn failing on libunistring (requires gnulib fseterr) +configureflags = [ + "--disable-idn" +] From 61a3304f07526b673c56966024ff9f16cda45cc2 Mon Sep 17 00:00:00 2001 From: auronandace Date: Mon, 26 Oct 2026 10:06:45 +0000 Subject: [PATCH 58/63] remove rlimit part of gnu-grep patch --- recipes/tools/gnu-grep/grep.patch | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/recipes/tools/gnu-grep/grep.patch b/recipes/tools/gnu-grep/grep.patch index 8b3d8b98e..311f82263 100644 --- a/recipes/tools/gnu-grep/grep.patch +++ b/recipes/tools/gnu-grep/grep.patch @@ -1,23 +1,4 @@ Only in source: grep.patch -diff -ru source/lib/getdtablesize.c source-new/lib/getdtablesize.c ---- source/lib/getdtablesize.c 2017-07-23 20:50:44.287742363 -0700 -+++ source-new/lib/getdtablesize.c 2017-07-23 20:51:06.271284748 -0700 -@@ -109,15 +109,6 @@ - int - getdtablesize (void) - { -- struct rlimit lim; -- -- if (getrlimit (RLIMIT_NOFILE, &lim) == 0 -- && 0 <= lim.rlim_cur && lim.rlim_cur <= INT_MAX -- && lim.rlim_cur != RLIM_INFINITY -- && lim.rlim_cur != RLIM_SAVED_CUR -- && lim.rlim_cur != RLIM_SAVED_MAX) -- return lim.rlim_cur; -- - return INT_MAX; - } - diff -ru source/lib/getprogname.c source-new/lib/getprogname.c --- source/lib/getprogname.c 2017-01-16 09:29:13.000000000 -0800 +++ source-new/lib/getprogname.c 2017-07-23 20:49:21.133618122 -0700 From 9e456cf920a872f62d7e6125fb8f15f3da43e993 Mon Sep 17 00:00:00 2001 From: auronandace Date: Mon, 26 Oct 2026 14:52:21 +0000 Subject: [PATCH 59/63] remove nano patch, update and fix gzip --- recipes/text/nano/recipe.toml | 3 --- recipes/text/nano/redox.patch | 12 ------------ recipes/wip/archives/gzip/recipe.toml | 6 ++++-- 3 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 recipes/text/nano/redox.patch diff --git a/recipes/text/nano/recipe.toml b/recipes/text/nano/recipe.toml index b6b01cd7d..11c347f7a 100644 --- a/recipes/text/nano/recipe.toml +++ b/recipes/text/nano/recipe.toml @@ -1,9 +1,6 @@ [source] tar = "https://www.nano-editor.org/dist/v9/nano-9.2.tar.xz" blake3 = "6a4dd380f6ee2bb2d74851c182090774f61eddfc37d9ff4d060b69f2c0fe4646" -patches = [ - "redox.patch" -] [build] template = "configure" diff --git a/recipes/text/nano/redox.patch b/recipes/text/nano/redox.patch deleted file mode 100644 index 83aa91e02..000000000 --- a/recipes/text/nano/redox.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --color -ruwN source/lib/fseterr.c source-new/lib/fseterr.c ---- source/lib/fseterr.c 2026-07-31 13:13:07.000000000 +0700 -+++ source-new/lib/fseterr.c 2026-08-19 21:12:05.375336440 +0700 -@@ -53,7 +53,7 @@ - #elif defined EPLAN9 /* Plan9 */ - if (fp->state != 0 /* CLOSED */) - fp->state = 5 /* ERR */; --#elif 0 /* unknown */ -+#elif defined __redox__ /* unknown */ - /* Portable fallback, based on an idea by Rich Felker. - Wow! 6 system calls for something that is just a bit operation! - Not activated on any system, because there is no way to repair FP when diff --git a/recipes/wip/archives/gzip/recipe.toml b/recipes/wip/archives/gzip/recipe.toml index b3fb1a9b7..e27f3bef8 100644 --- a/recipes/wip/archives/gzip/recipe.toml +++ b/recipes/wip/archives/gzip/recipe.toml @@ -1,5 +1,7 @@ -#TODO port gnulib fseterr.c [source] -tar = "https://ftp.gnu.org/gnu/gzip/gzip-1.14.tar.gz" +tar = "https://ftp.gnu.org/gnu/gzip/gzip-1.15.tar.gz" [build] template = "configure" +configureflags = [ + "ac_cv_have_decl___fseterr=yes" +] From fbcabac0c5a4eb6aa31a8ca1c4cb28c54346a805 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Tue, 27 Oct 2026 08:03:30 +0100 Subject: [PATCH 60/63] Update go --- recipes/wip/dev/lang/go/recipe.toml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/recipes/wip/dev/lang/go/recipe.toml b/recipes/wip/dev/lang/go/recipe.toml index 24f3afd65..c2640102f 100644 --- a/recipes/wip/dev/lang/go/recipe.toml +++ b/recipes/wip/dev/lang/go/recipe.toml @@ -1,21 +1,22 @@ #TODO compiling, not tested further [source] git = "https://github.com/willnode/go" -branch = "go-1.25-redox" +branch = "go-1.27-redox" shallow_clone = true [build] template = "custom" script = """ -export PATH=$HOME/go/bin:$PATH +export PATH=$HOME/.local/go/bin:$PATH export GOPATH=${COOKBOOK_BUILD}/gopath if ! command -v go &> /dev/null; then - GO_TARBALL=go1.24.6.linux-$( [ "$(uname -m)" = "aarch64" ] && echo "arm64" || echo "amd64" ).tar.gz + mkdir -p "$HOME/.local" + GO_TARBALL=go1.27.3.linux-$( [ "$(uname -m)" = "aarch64" ] && echo "arm64" || echo "amd64" ).tar.gz GO_DOWNLOAD_URL="https://dl.google.com/go/${GO_TARBALL}" echo "Installing Go..." wget -q --show-progress "${GO_DOWNLOAD_URL}" - tar -C "$HOME" -xzf "${GO_TARBALL}" + tar -C "$HOME/.local" -xzf "${GO_TARBALL}" fi # Go does not support out-of-tree builds :( @@ -31,7 +32,7 @@ case "${TARGET}" in esac export CGO_ENABLED=1 -echo "go1.25.0" > VERSION # to set -trimpath +echo "go1.27.3" > VERSION # to set -trimpath (cd ./src && bash ./make.bash) mkdir -p "${COOKBOOK_STAGE}"/usr/bin \ From e0e595029886c343642e1f52a3ea743bdd347960 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Tue, 27 Oct 2026 12:24:07 +0100 Subject: [PATCH 61/63] prefix: Make toolchain deterministic --- mk/ci.mk | 6 +++--- mk/prefix.mk | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mk/ci.mk b/mk/ci.mk index 7fa1542f7..dcf81ccf0 100644 --- a/mk/ci.mk +++ b/mk/ci.mk @@ -58,14 +58,14 @@ ifeq ($(PODMAN_BUILD),1) else $(MAKE) PREFIX_BINARY=0 \ "prefix/$(TARGET)/gcc-install.tar.gz" \ - "prefix/$(TARGET)/relibc-install.tar.gz" \ "prefix/$(TARGET)/rust-install.tar.gz" \ - "prefix/$(TARGET)/clang-install.tar.gz" + "prefix/$(TARGET)/clang-install.tar.gz" \ + "prefix/$(TARGET)/relibc-install.tar.gz" rm -rf "build/toolchain/$(HOST_TARGET)/$(TARGET)" mkdir -p "build/toolchain/$(HOST_TARGET)/$(TARGET)" cp "prefix/$(TARGET)/gcc-install.tar.gz" "build/toolchain/$(HOST_TARGET)/$(TARGET)/gcc-install.tar.gz" - cp "prefix/$(TARGET)/relibc-install.tar.gz" "build/toolchain/$(HOST_TARGET)/$(TARGET)/relibc-install.tar.gz" cp "prefix/$(TARGET)/rust-install.tar.gz" "build/toolchain/$(HOST_TARGET)/$(TARGET)/rust-install.tar.gz" cp "prefix/$(TARGET)/clang-install.tar.gz" "build/toolchain/$(HOST_TARGET)/$(TARGET)/clang-install.tar.gz" + cp "prefix/$(TARGET)/relibc-install.tar.gz" "build/toolchain/$(HOST_TARGET)/$(TARGET)/relibc-install.tar.gz" cd "build/toolchain/$(HOST_TARGET)/$(TARGET)" && sha256sum -b * > SHA256SUM endif diff --git a/mk/prefix.mk b/mk/prefix.mk index 2601fc4b2..2ffb7054b 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -99,6 +99,8 @@ $(PREFIX)/relibc-install.tar.gz: $(PREFIX)/sysroot tar \ --create \ --gzip \ + --sort=name \ + --mtime='@0' \ --file "$@" \ --directory="$<" \ . @@ -205,6 +207,8 @@ $(PREFIX)/%.tar.gz: $(PREFIX)/% tar \ --create \ --gzip \ + --sort=name \ + --mtime='@0' \ --file "$@" \ --directory="$<" \ . From 3da4df6eeb1271e82807a115db688f031543ac5c Mon Sep 17 00:00:00 2001 From: auronandace Date: Tue, 27 Oct 2026 08:37:16 +0000 Subject: [PATCH 62/63] add gzip to CI --- config/x86_64/ci.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml index e129c7432..93b3cea58 100644 --- a/config/x86_64/ci.toml +++ b/config/x86_64/ci.toml @@ -110,6 +110,7 @@ goaccess = {} gobject-introspection = {} gitoxide = {} gstreamer = {} +gzip = {} harfbuzz = {} hicolor-icon-theme = {} helix = {} From fcc8970b16aac7de83bb0218a742d93a8ce897a7 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Wed, 28 Oct 2026 11:28:48 +0700 Subject: [PATCH 63/63] Partially revert ratatui update This reverts commit c9f937eec8c6ef78e2bad5072811d01a5defd917. --- Cargo.lock | 339 +++++++++++++++++++++-------------------------------- 1 file changed, 135 insertions(+), 204 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0d1179533..7dec81574 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -38,18 +38,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.104" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470" - -[[package]] -name = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] +checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" [[package]] name = "arg_parser" @@ -59,21 +50,15 @@ checksum = "e9bcdf9185a4ea0d8afa7c8ad387cc3a93c3ecfa918125e000a57a42e71268d7" [[package]] name = "arrayvec" -version = "0.7.8" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56" - -[[package]] -name = "autocfg" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "bitflags" -version = "2.13.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "blake3" @@ -110,12 +95,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.13.1" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb31b46c14244e20ee9984b11bf5c992b91fb6939fea616e3512c8baecdbe5f" +checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" dependencies = [ "memchr", - "serde_core", + "serde", ] [[package]] @@ -124,30 +109,24 @@ version = "3.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" -[[package]] -name = "by_address" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" - [[package]] name = "bytemuck" -version = "1.25.2" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95832e849adfb21180ccb6826a99da14e5d266ae5c2e668e1602cf234f153797" +checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.12.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1f896587b6f2c069c73d2f0913e2d590c3990285cd2f0b6aa02b786b4c679c" +checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", - "syn 3.0.6", + "syn 2.0.119", ] [[package]] @@ -161,9 +140,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.6.0" +version = "1.2.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f74872d07caf508b30a21f6836e7d7016a2eaf7d9ff4f48deaa58cd8a0407630" +checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215" dependencies = [ "find-msvc-tools", "shlex", @@ -201,9 +180,9 @@ dependencies = [ [[package]] name = "compact_str" -version = "0.9.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dfdd1c2274d9aa354115b09dc9a901d6c5576818cdf70d14cae2bdb47df00ab" +checksum = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a" dependencies = [ "castaway", "cfg-if", @@ -245,9 +224,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a7799fd6b852db0e61728dde9a204c423b44d689dbd432522543614b490e78" +checksum = "0ba106e844045ddc02c20768ac4b0b7cb45f2cc2ecbd833ac9f5dacb183c2055" dependencies = [ "cfg-if", ] @@ -273,9 +252,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.23" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crypto-common" @@ -324,9 +303,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.24.1" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed17f5901b6630b993ca003def43f2f8ef4014fc13b047b57aad617ff32bc2ec" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ "darling_core", "darling_macro", @@ -334,26 +313,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.24.1" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6837e2cf7485aaae18f86181d2f0e9a7ed297a025e220aeabf63fdebd3a2ddff" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" dependencies = [ + "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 3.0.6", + "syn 2.0.119", ] [[package]] name = "darling_macro" -version = "0.24.1" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core", "quote", - "syn 3.0.6", + "syn 2.0.119", ] [[package]] @@ -417,7 +397,7 @@ dependencies = [ "libc", "rand", "salsa20", - "sha2 0.11.0", + "sha2 0.11.1", "sha3", "subtle", "winapi", @@ -426,9 +406,9 @@ dependencies = [ [[package]] name = "either" -version = "1.19.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "equivalent" @@ -444,9 +424,9 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "find-msvc-tools" -version = "0.1.14" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484" +checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" [[package]] name = "flate2" @@ -459,6 +439,12 @@ dependencies = [ "zlib-rs", ] +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + [[package]] name = "foldhash" version = "0.2.0" @@ -491,9 +477,9 @@ dependencies = [ [[package]] name = "globset" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c34a9410465b45bd9787443bc7370f37735bad04b0f0cd57ff1a3186c98988" +checksum = "f98b0d85522dc0a824cfebbc9594ff4a9b289c568bea0370319dfbdf20ccdd2d" dependencies = [ "aho-corasick", "bstr", @@ -518,11 +504,6 @@ name = "hashbrown" version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" -dependencies = [ - "allocator-api2", - "equivalent", - "foldhash", -] [[package]] name = "heck" @@ -541,9 +522,9 @@ dependencies = [ [[package]] name = "hybrid-array" -version = "0.4.15" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f864f10dfb56725ce5ce5472bc52252c8f93a4ab86327122cebf62c5f59a17" +checksum = "3944cf8cf766b40e2a1a333ee5e9b563f854d5fa49d6a8ca2764e97c6eddb214" dependencies = [ "typenum", "zeroize", @@ -557,9 +538,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "ignore" -version = "0.4.33" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b69833ed729dc5aa7d19541d96d6cf8e9137194207a04916d658e43168402f" +checksum = "d3d782a365a015e0f5c04902246139249abf769125006fbe7649e2ee88169b4a" dependencies = [ "crossbeam-deque", "globset", @@ -592,24 +573,24 @@ dependencies = [ [[package]] name = "inout" -version = "0.2.2" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4250ce6452e92010fdf7268ccc5d14faa80bb12fc741938534c58f16804e03c7" +checksum = "3b5cf4372d022092674a83b8febf5865f7a573cc0c5baec5e49c879b6a20978f" dependencies = [ "hybrid-array", ] [[package]] name = "instability" -version = "0.3.14" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c3b5acc1e2fd9375041a388da33d1eb8aed5f7a8c0dd3543e3ea2805adfbe20" +checksum = "6778b0196eefee7df739db78758e5cf9b37412268bfa5650bfeed028aed20d9c" dependencies = [ "darling", "indoc", "proc-macro2", "quote", - "syn 3.0.6", + "syn 2.0.119", ] [[package]] @@ -660,30 +641,25 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.190" +version = "0.2.178" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce5d3ddc6d3fa000eb1536d85e147bfe31aacaba692ed6a876f95cb7c855be78" - -[[package]] -name = "libm" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" +checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" [[package]] name = "libredox" -version = "0.1.25" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ff90caf6077a803a240f62fdbe88645a890bbca49ef8174c3cb0404362171d" +checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" dependencies = [ + "bitflags", "libc", ] [[package]] name = "line-clipping" -version = "0.3.8" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e752191d037c44ad111a8caa762921926658402f01cc1253f7bef2020ece4f5e" +checksum = "5f4de44e98ddbf09375cbf4d17714d18f39195f4f4894e8524501726fd9a8a4a" dependencies = [ "bitflags", ] @@ -696,11 +672,11 @@ checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" [[package]] name = "lru" -version = "0.18.5" +version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef9ac18847474e638e3702b76c65d4eb93428471a74778ef0f1be711717f89b5" +checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39" dependencies = [ - "hashbrown 0.17.1", + "hashbrown 0.16.1", ] [[package]] @@ -709,7 +685,7 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e2a88783b84d2d67ef2791778a9e76bfb68b8017aaf6c9d7d5f2626a478b16c" dependencies = [ - "sha2 0.11.0", + "sha2 0.11.1", ] [[package]] @@ -720,9 +696,9 @@ checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "memsafe" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf2b4d7a25d60474415c3ed174d37baac2881182484cce3cd765536e17301cf" +checksum = "32fc5de373e559e46f1ab7c2e1c3841fdf9bf4a5ddd177a997ff6390d2dfc02f" dependencies = [ "libc", "winapi", @@ -753,15 +729,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - [[package]] name = "num_threads" version = "0.1.7" @@ -803,39 +770,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" -[[package]] -name = "palette" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddeed8580d347d2abf3dcf06a5f0b3dc020258338526b277847cd4248a70fc64" -dependencies = [ - "approx", - "libm", - "palette_derive", - "palette_math", -] - -[[package]] -name = "palette_derive" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88537020289b719d81be994ccf1bbf4990f477e2f69ee52fe3e45f43a02e56be" -dependencies = [ - "by_address", - "proc-macro2", - "quote", - "syn 2.0.119", -] - -[[package]] -name = "palette_math" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e6eb142958d64335fb0e345c5b9ead2ecd6fc438c307e9d7d3c4fd428dbaf12" -dependencies = [ - "libm", -] - [[package]] name = "pkgar" version = "0.2.4" @@ -875,30 +809,30 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.15.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85" +checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "powerfmt" -version = "0.2.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6394b9e965e73d0a289ee54f589087e2c676aedf60885baf52c76b771e4958" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "proc-macro2" -version = "1.0.107" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.47" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] @@ -927,31 +861,29 @@ checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" [[package]] name = "ratatui" -version = "0.30.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3274ba0a2c5e1bcad2a2005d20f4dc59dad26b2eb0940fb094500dba4099d57d" +checksum = "d1ce67fb8ba4446454d1c8dbaeda0557ff5e94d39d5e5ed7f10a65eb4c8266bc" dependencies = [ "instability", "ratatui-core", "ratatui-termion", "ratatui-widgets", - "serde", ] [[package]] name = "ratatui-core" -version = "0.1.2" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbb175c433c8e28a809d1f5773a2ae96e68c0ce40db865cbab1020bf33ae479c" +checksum = "5ef8dea09a92caaf73bff7adb70b76162e5937524058a7e5bff37869cbbec293" dependencies = [ "bitflags", "compact_str", - "hashbrown 0.17.1", + "hashbrown 0.16.1", + "indoc", "itertools", "kasuari", "lru", - "palette", - "serde", "strum", "thiserror", "unicode-segmentation", @@ -961,9 +893,9 @@ dependencies = [ [[package]] name = "ratatui-termion" -version = "0.1.2" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c732202fa5a71a9da0991013f0853e53f87048f45198e3a1ca3ee722accc2f" +checksum = "4cade85a8591fbc911e147951422f0d6fd40f4948b271b6216c7dc01838996f8" dependencies = [ "instability", "ratatui-core", @@ -972,18 +904,17 @@ dependencies = [ [[package]] name = "ratatui-widgets" -version = "0.3.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66e3d19bcc9130ca376277d93b60767ff121ace3be06f5f95f81dd68956407d1" +checksum = "d7dbfa023cd4e604c2553483820c5fe8aa9d71a42eea5aa77c6e7f35756612db" dependencies = [ "bitflags", - "hashbrown 0.17.1", + "hashbrown 0.16.1", "indoc", "instability", "itertools", "line-clipping", "ratatui-core", - "serde", "strum", "time", "unicode-segmentation", @@ -1063,7 +994,7 @@ dependencies = [ [[package]] name = "redoxer" version = "0.2.63" -source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#f2cdeaec39797213d8b6dc8f08d2a5ec1900ee11" +source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#da7ec171322b28073c177bdf9cebbdc6049813eb" dependencies = [ "anyhow", "dirs", @@ -1110,24 +1041,24 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.23" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ruzstd" -version = "0.8.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c1c839d570d835527c9a5e4db7cb2198683a988cb9d7293fc8674e6bd58fc8" +checksum = "e5ff0cc5e135c8870a775d3320910cd9b564ec036b4dc0b8741629020be63f01" dependencies = [ "twox-hash", ] [[package]] name = "ryu" -version = "1.0.23" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "salsa20" @@ -1156,9 +1087,9 @@ checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" [[package]] name = "serde" -version = "1.0.229" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ "serde_core", "serde_derive", @@ -1166,29 +1097,29 @@ dependencies = [ [[package]] name = "serde_core" -version = "1.0.229" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.229" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 3.0.6", + "syn 2.0.119", ] [[package]] name = "serde_json" -version = "1.0.151" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ "itoa", "memchr", @@ -1219,9 +1150,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" +checksum = "47d7069beb7d6ac7b9acd1039986e73443f24234f41074da099d6f994ac9ad19" dependencies = [ "cfg-if", "cpufeatures 0.3.1", @@ -1241,15 +1172,15 @@ dependencies = [ [[package]] name = "shlex" -version = "2.0.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "simd-adler32" -version = "0.3.10" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea" +checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" [[package]] name = "simdutf8" @@ -1259,9 +1190,9 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "smallvec" -version = "1.16.2" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9395f0f0eee849a9b707b2f06bb92a6a422090e2123bb2ef8e87a0e61892a8e" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "sponge-cursor" @@ -1295,18 +1226,18 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.28.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd" +checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.28.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664" +checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" dependencies = [ "heck", "proc-macro2", @@ -1333,9 +1264,9 @@ dependencies = [ [[package]] name = "syn" -version = "3.0.6" +version = "3.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee" +checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b" dependencies = [ "proc-macro2", "quote", @@ -1354,22 +1285,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.21" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e52cb86a36cede5cb101bf8908837b3e4c6e5e59fe7fd85c23fb56200d189e" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "2.0.21" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 3.0.6", + "syn 2.0.119", ] [[package]] @@ -1395,9 +1326,9 @@ checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" [[package]] name = "toml" -version = "1.1.7+spec-1.1.0" +version = "1.1.8+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7874cd34dd99040fc24e30923aa64a60a81ff3ddfe2b8129ccc84ba24949deed" +checksum = "20489e00e4d8741d6be680764cc12e270655e375a20d1011e844a9c3379e678d" dependencies = [ "indexmap", "serde_core", @@ -1419,9 +1350,9 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.1.4+spec-1.1.0" +version = "1.1.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bed810ee007d8e7f9cf20b4774e7198142fa27186e0f805871da7f3c39eaf333" +checksum = "baa693a8032d7e1cada7d0041e96126df243179ff061456783ac7f12bda4744c" dependencies = [ "winnow", ] @@ -1434,27 +1365,27 @@ checksum = "06bdbd8cfc056b8d2e2e85f29b56a3bdbecb527cef81eb39e3e7b98af4652770" [[package]] name = "twox-hash" -version = "2.1.5" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86a801b3cea342a06d468c8710662aa29e5e05e4f5c0d62f00bbb7f2ad7941c2" +checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" [[package]] name = "typenum" -version = "1.20.1" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "unicode-ident" -version = "1.0.26" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unicode-segmentation" -version = "1.13.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-truncate" @@ -1469,9 +1400,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.2.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" [[package]] name = "version_check" @@ -1530,7 +1461,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 3.0.6", + "syn 3.0.9", "wasm-bindgen-shared", ]