From 32b595924eb4477ba32cc8b8295b7ec70e30e860 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Sun, 9 Jun 2024 10:16:08 +0200
Subject: [PATCH] Adjust several desktop targets in order to be able to
 assemble them

Images were tested for compiling with newly added Action script that generates x86 QEMU images upon (manual for now) execution

https://github.com/armbian/os/actions/workflows/full-distro-build-and-test.yml
---
 config/desktop/common/appgroups/browsers/packages             | 1 +
 .../desktop/common/environments/budgie/config_base/packages   | 1 -
 config/desktop/common/environments/mate/config_base/packages  | 1 -
 config/desktop/jammy/environments/kde-neon/support            | 1 +
 .../jammy/environments/kde-plasma/config_base/packages        | 4 ----
 .../architectures/amd64/_config/cli/{mantic => oracular}      | 0
 .../{amd64/_config/cli/trixie => arm64/_config/cli/oracular}  | 0
 .../architectures/arm64/_config/cli/trixie/main/packages      | 2 ++
 .../arm64/_config/cli/trixie/main/packages.additional         | 1 +
 config/optional/architectures/armhf/_config/cli/mantic        | 1 -
 .../architectures/armhf/_config/cli/noble/main/packages       | 1 -
 .../{arm64/_config/cli/mantic => armhf/_config/cli/oracular}  | 0
 config/optional/architectures/armhf/_config/cli/trixie        | 1 -
 .../architectures/armhf/_config/cli/trixie/main/packages      | 2 ++
 .../armhf/_config/cli/trixie/main/packages.additional         | 1 +
 15 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 config/desktop/jammy/environments/kde-neon/support
 rename config/optional/architectures/amd64/_config/cli/{mantic => oracular} (100%)
 rename config/optional/architectures/{amd64/_config/cli/trixie => arm64/_config/cli/oracular} (100%)
 create mode 100644 config/optional/architectures/arm64/_config/cli/trixie/main/packages
 create mode 100644 config/optional/architectures/arm64/_config/cli/trixie/main/packages.additional
 delete mode 120000 config/optional/architectures/armhf/_config/cli/mantic
 rename config/optional/architectures/{arm64/_config/cli/mantic => armhf/_config/cli/oracular} (100%)
 delete mode 120000 config/optional/architectures/armhf/_config/cli/trixie
 create mode 100644 config/optional/architectures/armhf/_config/cli/trixie/main/packages
 create mode 100644 config/optional/architectures/armhf/_config/cli/trixie/main/packages.additional

diff --git a/config/desktop/common/appgroups/browsers/packages b/config/desktop/common/appgroups/browsers/packages
index f99c9a164..6821f1236 100644
--- a/config/desktop/common/appgroups/browsers/packages
+++ b/config/desktop/common/appgroups/browsers/packages
@@ -1 +1,2 @@
 chromium-browser
+firefox
diff --git a/config/desktop/common/environments/budgie/config_base/packages b/config/desktop/common/environments/budgie/config_base/packages
index 9aedefd8d..269d71070 100644
--- a/config/desktop/common/environments/budgie/config_base/packages
+++ b/config/desktop/common/environments/budgie/config_base/packages
@@ -25,7 +25,6 @@ budgie-kangaroo-applet
 budgie-keyboard-autoswitch-applet
 budgie-network-manager-applet
 budgie-previews
-budgie-previews-applet
 budgie-quickchar
 budgie-quicknote-applet
 budgie-recentlyused-applet
diff --git a/config/desktop/common/environments/mate/config_base/packages b/config/desktop/common/environments/mate/config_base/packages
index 356a951dc..912e44c96 100644
--- a/config/desktop/common/environments/mate/config_base/packages
+++ b/config/desktop/common/environments/mate/config_base/packages
@@ -106,7 +106,6 @@ mate-desktop-environment-core
 mate-desktop-environment-extra
 mate-desktop-environment-extras
 mate-dock-applet
-mate-equake-applet
 mate-hud
 mate-icon-theme
 mate-indicator-applet
diff --git a/config/desktop/jammy/environments/kde-neon/support b/config/desktop/jammy/environments/kde-neon/support
new file mode 100644
index 000000000..bc2264ca1
--- /dev/null
+++ b/config/desktop/jammy/environments/kde-neon/support
@@ -0,0 +1 @@
+eos
diff --git a/config/desktop/jammy/environments/kde-plasma/config_base/packages b/config/desktop/jammy/environments/kde-plasma/config_base/packages
index ef8e6d504..3068b9c28 100644
--- a/config/desktop/jammy/environments/kde-plasma/config_base/packages
+++ b/config/desktop/jammy/environments/kde-plasma/config_base/packages
@@ -37,7 +37,6 @@ foomatic-db-compressed-ppds
 gdebi
 ghostscript-x
 gist
-gnome-orca
 gnome-disk-utility
 gnome-screenshot
 gnome-user-docs-de
@@ -74,7 +73,6 @@ libatk-adaptor
 libcvc0
 libfont-afm-perl
 libfontconfig1
-libfontembed1
 libfontenc1
 libgail-common
 libgl1-mesa-dri
@@ -85,7 +83,6 @@ libproxy1-plugin-gsettings
 libproxy1-plugin-networkmanager
 libu2f-udev
 libwmf0.2-7-gtk
-libxapp1
 libxcursor1
 sddm
 mesa-utils
@@ -142,7 +139,6 @@ wswiss
 x11-apps
 x11-utils
 x11-xserver-utils
-xapp
 xapps-common
 xarchiver
 xbacklight
diff --git a/config/optional/architectures/amd64/_config/cli/mantic b/config/optional/architectures/amd64/_config/cli/oracular
similarity index 100%
rename from config/optional/architectures/amd64/_config/cli/mantic
rename to config/optional/architectures/amd64/_config/cli/oracular
diff --git a/config/optional/architectures/amd64/_config/cli/trixie b/config/optional/architectures/arm64/_config/cli/oracular
similarity index 100%
rename from config/optional/architectures/amd64/_config/cli/trixie
rename to config/optional/architectures/arm64/_config/cli/oracular
diff --git a/config/optional/architectures/arm64/_config/cli/trixie/main/packages b/config/optional/architectures/arm64/_config/cli/trixie/main/packages
new file mode 100644
index 000000000..1572f0f2e
--- /dev/null
+++ b/config/optional/architectures/arm64/_config/cli/trixie/main/packages
@@ -0,0 +1,2 @@
+gpiod
+mtd-utils
diff --git a/config/optional/architectures/arm64/_config/cli/trixie/main/packages.additional b/config/optional/architectures/arm64/_config/cli/trixie/main/packages.additional
new file mode 100644
index 000000000..52e608d18
--- /dev/null
+++ b/config/optional/architectures/arm64/_config/cli/trixie/main/packages.additional
@@ -0,0 +1 @@
+iozone3
diff --git a/config/optional/architectures/armhf/_config/cli/mantic b/config/optional/architectures/armhf/_config/cli/mantic
deleted file mode 120000
index 9a63c961d..000000000
--- a/config/optional/architectures/armhf/_config/cli/mantic
+++ /dev/null
@@ -1 +0,0 @@
-sid
\ No newline at end of file
diff --git a/config/optional/architectures/armhf/_config/cli/noble/main/packages b/config/optional/architectures/armhf/_config/cli/noble/main/packages
index 9d8cabdad..ef2bb7c35 100644
--- a/config/optional/architectures/armhf/_config/cli/noble/main/packages
+++ b/config/optional/architectures/armhf/_config/cli/noble/main/packages
@@ -1,3 +1,2 @@
 gpiod
-#mtd-utils
 nocache
diff --git a/config/optional/architectures/arm64/_config/cli/mantic b/config/optional/architectures/armhf/_config/cli/oracular
similarity index 100%
rename from config/optional/architectures/arm64/_config/cli/mantic
rename to config/optional/architectures/armhf/_config/cli/oracular
diff --git a/config/optional/architectures/armhf/_config/cli/trixie b/config/optional/architectures/armhf/_config/cli/trixie
deleted file mode 120000
index 9a63c961d..000000000
--- a/config/optional/architectures/armhf/_config/cli/trixie
+++ /dev/null
@@ -1 +0,0 @@
-sid
\ No newline at end of file
diff --git a/config/optional/architectures/armhf/_config/cli/trixie/main/packages b/config/optional/architectures/armhf/_config/cli/trixie/main/packages
new file mode 100644
index 000000000..1572f0f2e
--- /dev/null
+++ b/config/optional/architectures/armhf/_config/cli/trixie/main/packages
@@ -0,0 +1,2 @@
+gpiod
+mtd-utils
diff --git a/config/optional/architectures/armhf/_config/cli/trixie/main/packages.additional b/config/optional/architectures/armhf/_config/cli/trixie/main/packages.additional
new file mode 100644
index 000000000..52e608d18
--- /dev/null
+++ b/config/optional/architectures/armhf/_config/cli/trixie/main/packages.additional
@@ -0,0 +1 @@
+iozone3