From 4ec8581ac8e1632be5374ba067598dc03debe744 Mon Sep 17 00:00:00 2001
From: Ribbon <ribbon_45@proton.me>
Date: Thu, 14 Dec 2023 22:45:18 +0000
Subject: [PATCH] Update recipes

---
 recipes/wip/alacritty/recipe.toml   | 14 +++-----------
 recipes/wip/ani-cli/recipe.toml     |  2 +-
 recipes/wip/ani-skip/recipe.toml    |  2 +-
 recipes/wip/apr-util/recipe.toml    | 13 +++++++++++--
 recipes/wip/apr/recipe.toml         |  2 +-
 recipes/wip/artichoke/recipe.toml   |  2 +-
 recipes/wip/ascii-gen/recipe.toml   |  2 +-
 recipes/wip/astronvim/recipe.toml   |  6 +-----
 recipes/wip/atkmm/recipe.toml       |  1 +
 recipes/wip/atm-cli/recipe.toml     |  2 +-
 recipes/wip/bartib/recipe.toml      |  2 +-
 recipes/wip/battop/recipe.toml      |  2 +-
 recipes/wip/bevy-engine/recipe.toml |  7 ++++---
 13 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/recipes/wip/alacritty/recipe.toml b/recipes/wip/alacritty/recipe.toml
index cea6913ad..d8ea92be5 100644
--- a/recipes/wip/alacritty/recipe.toml
+++ b/recipes/wip/alacritty/recipe.toml
@@ -1,4 +1,4 @@
-#TODO Not compiled or tested yet
+#TODO make Wayland work
 [source]
 tar = "https://github.com/alacritty/alacritty/archive/refs/tags/v0.12.3.tar.gz"
 [build]
@@ -6,16 +6,8 @@ template = "custom"
 dependencies = [
     "freetype2",
     "fontconfig",
+    "libwayland",
 ]
 script = """
-package="alacritty"
-"${COOKBOOK_CARGO}" build \
-            --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
-            --package "${package}" \
-            --release
-           --no-default-features
-        mkdir -pv "${COOKBOOK_STAGE}/bin"
-        cp -v \
-            "target/${TARGET}/release/${package}" \
-            "${COOKBOOK_STAGE}/bin/${package}"
+cookbook_cargo_packages alacritty
 """
diff --git a/recipes/wip/ani-cli/recipe.toml b/recipes/wip/ani-cli/recipe.toml
index 8a558756f..d471cd39f 100644
--- a/recipes/wip/ani-cli/recipe.toml
+++ b/recipes/wip/ani-cli/recipe.toml
@@ -1,4 +1,4 @@
-#TODO Not compiled or tested
+#TODO move to the "tools" category
 [source]
 tar = "https://github.com/pystardust/ani-cli/archive/refs/tags/v4.6.tar.gz"
 [build]
diff --git a/recipes/wip/ani-skip/recipe.toml b/recipes/wip/ani-skip/recipe.toml
index d49a055dc..454b15dff 100644
--- a/recipes/wip/ani-skip/recipe.toml
+++ b/recipes/wip/ani-skip/recipe.toml
@@ -1,4 +1,4 @@
-#TODO Not compiled or tested
+#TODO move to the "tools" category
 [source]
 git = "https://github.com/synacktraa/ani-skip"
 [build]
diff --git a/recipes/wip/apr-util/recipe.toml b/recipes/wip/apr-util/recipe.toml
index a9ec54198..414a228d6 100644
--- a/recipes/wip/apr-util/recipe.toml
+++ b/recipes/wip/apr-util/recipe.toml
@@ -1,5 +1,14 @@
-#TODO Not compiled or tested
+#TODO make apr work
 [source]
 tar = "https://dlcdn.apache.org//apr/apr-util-1.6.3.tar.bz2"
 [build]
-template = "configure"
+template = "custom"
+dependencies = [
+    "apr",
+]
+script = """
+COOKBOOK_CONFIGURE_FLAGS+=(
+    --with-apr
+)
+cookbook_configure
+"""
diff --git a/recipes/wip/apr/recipe.toml b/recipes/wip/apr/recipe.toml
index d062a9efa..13ce6850c 100644
--- a/recipes/wip/apr/recipe.toml
+++ b/recipes/wip/apr/recipe.toml
@@ -1,4 +1,4 @@
-#TODO Not compiled or tested
+#TODO compilation error
 [source]
 tar = "https://dlcdn.apache.org//apr/apr-1.7.4.tar.bz2"
 [build]
diff --git a/recipes/wip/artichoke/recipe.toml b/recipes/wip/artichoke/recipe.toml
index 89b3dd377..0bf2fc0c1 100644
--- a/recipes/wip/artichoke/recipe.toml
+++ b/recipes/wip/artichoke/recipe.toml
@@ -1,4 +1,4 @@
-#TODO not compiled/tested yet
+#TODO iana-time-zone crate error
 [source]
 git = "https://github.com/artichoke/artichoke"
 [build]
diff --git a/recipes/wip/ascii-gen/recipe.toml b/recipes/wip/ascii-gen/recipe.toml
index fb4d0a742..f798d0095 100644
--- a/recipes/wip/ascii-gen/recipe.toml
+++ b/recipes/wip/ascii-gen/recipe.toml
@@ -1,4 +1,4 @@
-#TODO Not compiled or tested
+#TODO compiled but not tested
 [source]
 git = "https://github.com/thed24/ascii-gen"
 [build]
diff --git a/recipes/wip/astronvim/recipe.toml b/recipes/wip/astronvim/recipe.toml
index 740a06ac5..e1e38832e 100644
--- a/recipes/wip/astronvim/recipe.toml
+++ b/recipes/wip/astronvim/recipe.toml
@@ -1,4 +1,4 @@
-#TODO Not tested yet
+#TODO move to the "tools" category
 [source]
 git = "https://github.com/AstroNvim/AstroNvim"
 [build]
@@ -7,7 +7,3 @@ script = """
 mkdir -pv "${COOKBOOK_STAGE}"/home/user/.config/nvim
 cp -rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}"/home/user/.config/nvim
 """
-[package]
-dependencies = [
-    "neovim",
-]
diff --git a/recipes/wip/atkmm/recipe.toml b/recipes/wip/atkmm/recipe.toml
index de5a7a34a..903f7495e 100644
--- a/recipes/wip/atkmm/recipe.toml
+++ b/recipes/wip/atkmm/recipe.toml
@@ -1,3 +1,4 @@
+#TODO make atk work
 #TODO probably wrong script, see https://gitlab.gnome.org/GNOME/atkmm
 [source]
 tar = "https://download.gnome.org/sources/atkmm/2.36/atkmm-2.36.2.tar.xz"
diff --git a/recipes/wip/atm-cli/recipe.toml b/recipes/wip/atm-cli/recipe.toml
index 02f0cb408..fd176fc12 100644
--- a/recipes/wip/atm-cli/recipe.toml
+++ b/recipes/wip/atm-cli/recipe.toml
@@ -1,4 +1,4 @@
-#TODO Not compiled or tested yet
+#TODO compiled but not tested (after cargo update)
 [source]
 git = "https://github.com/allthemusicllc/atm-cli"
 [build]
diff --git a/recipes/wip/bartib/recipe.toml b/recipes/wip/bartib/recipe.toml
index 48ef2c6e9..e77807142 100644
--- a/recipes/wip/bartib/recipe.toml
+++ b/recipes/wip/bartib/recipe.toml
@@ -1,4 +1,4 @@
-#TODO compiled but not tested yet
+#TODO compiled but not tested
 [source]
 git = "https://github.com/nikolassv/bartib"
 [build]
diff --git a/recipes/wip/battop/recipe.toml b/recipes/wip/battop/recipe.toml
index ac500c8b6..093c8769d 100644
--- a/recipes/wip/battop/recipe.toml
+++ b/recipes/wip/battop/recipe.toml
@@ -1,4 +1,4 @@
-#TODO Not compiled or tested
+#TODO atty crate error (after cargo update)
 [source]
 tar = "https://github.com/svartalf/rust-battop/archive/refs/tags/v0.2.4.tar.gz"
 [build]
diff --git a/recipes/wip/bevy-engine/recipe.toml b/recipes/wip/bevy-engine/recipe.toml
index 13fcbe6c7..613fdfc27 100644
--- a/recipes/wip/bevy-engine/recipe.toml
+++ b/recipes/wip/bevy-engine/recipe.toml
@@ -4,13 +4,14 @@ tar = "https://github.com/bevyengine/bevy/archive/refs/tags/v0.11.1.tar.gz"
 [build]
 template = "custom"
 script = """
+package="hello_world"
 "${COOKBOOK_CARGO}" build \
             --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
-            --package "${hello_world}" \
+            --package "${package}" \
             --release
            --no-default-features
         mkdir -pv "${COOKBOOK_STAGE}/bin"
         cp -v \
-            "target/${TARGET}/release/${hello_world}" \
-            "${COOKBOOK_STAGE}/bin/${bevy-engine}_${hello_world}"
+            "target/${TARGET}/release/${package}" \
+            "${COOKBOOK_STAGE}/bin/${package}"
 """
-- 
GitLab