From 8cba18800a4f2a11856cd5606c3d47b00123ea7a Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Tue, 3 Mar 2026 19:36:04 +0100
Subject: [PATCH] Unify all orbutils recipes

With the calculator gone, having separate recipes only increases compile
times for the minimal config.
---
 config/aarch64/ci.toml                    |  3 ---
 config/desktop-minimal.toml               |  4 +---
 config/i586/ci.toml                       |  3 ---
 config/riscv64gc/ci.toml                  |  3 ---
 config/x86_64/ci.toml                     |  3 ---
 recipes/gui/orbutils-launcher/recipe.toml | 11 -----------
 recipes/gui/orbutils-orblogin/recipe.toml | 12 ------------
 recipes/gui/orbutils/recipe.toml          |  2 +-
 8 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 recipes/gui/orbutils-launcher/recipe.toml
 delete mode 100644 recipes/gui/orbutils-orblogin/recipe.toml

diff --git a/config/aarch64/ci.toml b/config/aarch64/ci.toml
index 13a77dfe..1d184f31 100644
--- a/config/aarch64/ci.toml
+++ b/config/aarch64/ci.toml
@@ -83,9 +83,6 @@ orbdata = {}
 orbital = {}
 orbterm = {}
 orbutils = {}
-orbutils-background = {}
-orbutils-launcher = {}
-orbutils-orblogin = {}
 patch = {}
 patchelf = {}
 pcre = {}
diff --git a/config/desktop-minimal.toml b/config/desktop-minimal.toml
index 99f64f96..3de57151 100644
--- a/config/desktop-minimal.toml
+++ b/config/desktop-minimal.toml
@@ -12,9 +12,7 @@ filesystem_size = 256
 orbdata = {}
 orbital = {}
 orbterm = {}
-orbutils-background = {}
-orbutils-launcher = {}
-orbutils-orblogin = {}
+orbutils = {}
 
 [[files]]
 path = "/usr/lib/init.d/20_orbital"
diff --git a/config/i586/ci.toml b/config/i586/ci.toml
index e7275877..3432fba0 100644
--- a/config/i586/ci.toml
+++ b/config/i586/ci.toml
@@ -79,9 +79,6 @@ orbdata = {}
 orbital = {}
 orbterm = {}
 orbutils = {}
-orbutils-background = {}
-orbutils-launcher = {}
-orbutils-orblogin = {}
 patch = {}
 pcre = {}
 patchelf = {}
diff --git a/config/riscv64gc/ci.toml b/config/riscv64gc/ci.toml
index 4f535066..382a421e 100644
--- a/config/riscv64gc/ci.toml
+++ b/config/riscv64gc/ci.toml
@@ -79,9 +79,6 @@ orbdata = {}
 orbital = {}
 orbterm = {}
 orbutils = {}
-orbutils-background = {}
-orbutils-launcher = {}
-orbutils-orblogin = {}
 #patch = {} error configure machine `riscv64gc-unknown' not recognized
 pcre = {}
 patchelf = {}
diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml
index 9104645e..9efd6303 100644
--- a/config/x86_64/ci.toml
+++ b/config/x86_64/ci.toml
@@ -146,9 +146,6 @@ orbdata = {}
 orbital = {}
 orbterm = {}
 orbutils = {}
-orbutils-background = {}
-orbutils-launcher = {}
-orbutils-orblogin = {}
 os-test-bins = {}
 osdemo = {}
 patch = {}
diff --git a/recipes/gui/orbutils-launcher/recipe.toml b/recipes/gui/orbutils-launcher/recipe.toml
deleted file mode 100644
index 30080a17..00000000
--- a/recipes/gui/orbutils-launcher/recipe.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[source]
-same_as = "../orbutils"
-
-[build]
-template = "cargo"
-package_path = "launcher"
-
-[package]
-dependencies = [
-    "orbital"
-]
diff --git a/recipes/gui/orbutils-orblogin/recipe.toml b/recipes/gui/orbutils-orblogin/recipe.toml
deleted file mode 100644
index 3faa3ee7..00000000
--- a/recipes/gui/orbutils-orblogin/recipe.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[source]
-same_as = "../orbutils"
-
-[build]
-template = "cargo"
-package_path = "orbutils"
-cargoflags = "--bin orblogin"
-
-[package]
-dependencies = [
-    "orbital"
-]
diff --git a/recipes/gui/orbutils/recipe.toml b/recipes/gui/orbutils/recipe.toml
index d9d8062d..57af30c4 100644
--- a/recipes/gui/orbutils/recipe.toml
+++ b/recipes/gui/orbutils/recipe.toml
@@ -8,7 +8,7 @@ DYNAMIC_INIT
 mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui"
 cp -rv "${COOKBOOK_SOURCE}/apps" "${COOKBOOK_STAGE}/usr/share/ui/apps"
 
-for project in orbutils calculator launcher
+for project in orbutils launcher
 do
     "${COOKBOOK_CARGO}" install \
             --path "${COOKBOOK_SOURCE}/${project}" \