From ea8998d3a2937181d1d49ba8a7494d0c686539fa Mon Sep 17 00:00:00 2001
From: Wildan Mubarok <willnode@wellosoft.net>
Date: Sun, 29 Jun 2025 13:43:25 +0000
Subject: [PATCH 1/2] Add more packages to aarch64

---
 config/aarch64/ci.toml  | 36 +++++++++++++++++++++++++++++++-----
 config/aarch64/dev.toml | 20 ++++++++++++++++++++
 config/x86_64/ci.toml   |  1 +
 3 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 config/aarch64/dev.toml

diff --git a/config/aarch64/ci.toml b/config/aarch64/ci.toml
index 4c46d9d07..0eca1c880 100644
--- a/config/aarch64/ci.toml
+++ b/config/aarch64/ci.toml
@@ -13,33 +13,59 @@ bootloader = {}
 ca-certificates = {}
 contain = {}
 coreutils = {}
+curl = {}
 dash = {}
 diffutils = {}
 drivers = {}
+expat = {}
 extrautils = {}
 findutils = {}
+freetype2 = {}
+# gdbserver = {} # wrong libc type
+# gnu-binutils = {} # bfd doesn't recognize redox
 hicolor-icon-theme = {}
 installer = {}
 installer-gui = {}
 ion = {}
 kernel = {}
+libffi = {}
 libgcc = {}
+libjpeg = {}
+libogg = {}
+liborbital = {}
+libpng = {}
 libstdcxx = {}
-#nano = {} # error compiling ncurses
+libvorbis = {}
+libxkbcommon = {}
+libxml2 = {}
+# mesa = {} # libudev was not found
+# mesa-glu = {} # depends on mesa
+# mpc = {} # libmpfr not found
+nano = {}
+nasm = {}
+ncurses = {}
 netdb = {}
-#netsurf = {} # error building openssl1
+netsurf = {}
 netutils = {}
+nghttp2 = {}
+openssl1 = {}
 orbdata = {}
 orbital = {}
 orbterm = {}
 orbutils = {}
+patch = {}
+pcre = {}
 pkgutils = {}
 redoxfs = {}
 relibc = {}
 resist = {}
+ripgrep = {}
+# strace = {} # unknown syscall
+sdl1 = {}
+sed = {}
 smith = {}
+terminfo = {}
 userutils = {}
 uutils = {}
-#vim = {} # error compiling ncurses
-
-#TODO: Add more packages
+vim = {}
+zlib = {}
diff --git a/config/aarch64/dev.toml b/config/aarch64/dev.toml
new file mode 100644
index 000000000..ce6a482d6
--- /dev/null
+++ b/config/aarch64/dev.toml
@@ -0,0 +1,20 @@
+# Configuration for development
+
+include = ["../dev.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# see ci.toml for error reasons
+gdbserver = "ignore"
+gnu-binutils = "ignore"
+mesa = "ignore"
+mesa-glu = "ignore"
+mpc = "ignore"
+strace = "ignore"
diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml
index 473e4270d..b4a740599 100644
--- a/config/x86_64/ci.toml
+++ b/config/x86_64/ci.toml
@@ -94,6 +94,7 @@ libpng = {}
 libstdcxx = {}
 #libsodium = {} # failing to fetch
 libvorbis = {}
+libxkbcommon = {}
 libxml2 = {}
 llvm18 = {}
 #lua54 = {} # did not build

From fa420097a2ca88a62203ddd49dffff66cd4e77c9 Mon Sep 17 00:00:00 2001
From: Wildan Mubarok <willnode@wellosoft.net>
Date: Sun, 29 Jun 2025 13:48:01 +0000
Subject: [PATCH 2/2] Equalize desktop

---
 config/aarch64/desktop.toml | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/config/aarch64/desktop.toml b/config/aarch64/desktop.toml
index 2ef252ff3..ec055e5f5 100644
--- a/config/aarch64/desktop.toml
+++ b/config/aarch64/desktop.toml
@@ -1,29 +1,15 @@
 # Default build system configuration
 
-include = ["../minimal.toml"]
+include = ["../desktop.toml"]
+
+# Override the default settings here
 
 # General settings
 [general]
 # Filesystem size in MiB
-filesystem_size = 512
+# filesystem_size = 1024
 
 # Package settings
 [packages]
-cosmic-edit = {}
-cosmic-icons = {}
-cosmic-files = {}
-cosmic-term = {}
-orbdata = {}
-orbital = {}
-orbutils = {}
-pop-icon-theme = {}
-shared-mime-info = {}
-
-[[files]]
-path = "/usr/lib/init.d/20_orbital"
-data = """
-audiod
-export VT 3
-orbital orblogin launcher
-unset VT
-"""
+# example = {}
+rustpython = "ignore" # not tested