From b744ddb0a63676b03dcac2f0caa2f85472d11bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?=
 <igorpecovnik@users.noreply.github.com>
Date: Sat, 12 Feb 2022 21:42:31 +0100
Subject: [PATCH] Enable 3d on bullseye, buster, sid (#3480)

---
 config/desktop/bullseye/appgroups/3dsupport            |  1 +
 config/desktop/buster/appgroups/3dsupport/packages     |  4 ++++
 .../gnome/armbian/create_desktop_package.sh            |  4 ++--
 config/desktop/sid/appgroups/3dsupport                 |  1 +
 .../gnome/armbian/create_desktop_package.sh            |  4 ++--
 .../sid/environments/gnome/config_base/packages        | 10 +++++-----
 6 files changed, 15 insertions(+), 9 deletions(-)
 create mode 120000 config/desktop/bullseye/appgroups/3dsupport
 create mode 100644 config/desktop/buster/appgroups/3dsupport/packages
 create mode 120000 config/desktop/sid/appgroups/3dsupport

diff --git a/config/desktop/bullseye/appgroups/3dsupport b/config/desktop/bullseye/appgroups/3dsupport
new file mode 120000
index 0000000000..72befb72e0
--- /dev/null
+++ b/config/desktop/bullseye/appgroups/3dsupport
@@ -0,0 +1 @@
+../../buster/appgroups/3dsupport
\ No newline at end of file
diff --git a/config/desktop/buster/appgroups/3dsupport/packages b/config/desktop/buster/appgroups/3dsupport/packages
new file mode 100644
index 0000000000..c467dab2a3
--- /dev/null
+++ b/config/desktop/buster/appgroups/3dsupport/packages
@@ -0,0 +1,4 @@
+libglx-mesa0
+libgl1-mesa-dri
+mesa-utils
+mesa-utils-extra
diff --git a/config/desktop/buster/environments/gnome/armbian/create_desktop_package.sh b/config/desktop/buster/environments/gnome/armbian/create_desktop_package.sh
index 3f3edcc426..b71e454613 100644
--- a/config/desktop/buster/environments/gnome/armbian/create_desktop_package.sh
+++ b/config/desktop/buster/environments/gnome/armbian/create_desktop_package.sh
@@ -4,11 +4,11 @@ cp -R "${SRC}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel
 
 # install logo for login screen
 mkdir -p "${destination}"/usr/share/pixmaps/armbian
-cp "${SRC}"/packages/blobs/desktop/icons/armbian.png "${destination}"/usr/share/pixmaps/armbian
+cp "${SRC}"/packages/blobs/desktop/desktop-icons/armbian.png "${destination}"/usr/share/pixmaps/armbian
 
 # install wallpapers
 mkdir -p "${destination}"/usr/share/backgrounds/gnome/
-cp "${SRC}"/packages/blobs/desktop/wallpapers/armbian*.jpg "${destination}"/usr/share/backgrounds/gnome/
+cp "${SRC}"/packages/blobs/desktop/desktop-wallpapers/armbian*.jpg "${destination}"/usr/share/backgrounds/gnome/
 mkdir -p "${destination}"/usr/share/gnome-background-properties
 cat <<-EOF > "${destination}"/usr/share/gnome-background-properties/armbian.xml
 <?xml version="1.0"?>
diff --git a/config/desktop/sid/appgroups/3dsupport b/config/desktop/sid/appgroups/3dsupport
new file mode 120000
index 0000000000..72befb72e0
--- /dev/null
+++ b/config/desktop/sid/appgroups/3dsupport
@@ -0,0 +1 @@
+../../buster/appgroups/3dsupport
\ No newline at end of file
diff --git a/config/desktop/sid/environments/gnome/armbian/create_desktop_package.sh b/config/desktop/sid/environments/gnome/armbian/create_desktop_package.sh
index 3f3edcc426..b71e454613 100644
--- a/config/desktop/sid/environments/gnome/armbian/create_desktop_package.sh
+++ b/config/desktop/sid/environments/gnome/armbian/create_desktop_package.sh
@@ -4,11 +4,11 @@ cp -R "${SRC}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel
 
 # install logo for login screen
 mkdir -p "${destination}"/usr/share/pixmaps/armbian
-cp "${SRC}"/packages/blobs/desktop/icons/armbian.png "${destination}"/usr/share/pixmaps/armbian
+cp "${SRC}"/packages/blobs/desktop/desktop-icons/armbian.png "${destination}"/usr/share/pixmaps/armbian
 
 # install wallpapers
 mkdir -p "${destination}"/usr/share/backgrounds/gnome/
-cp "${SRC}"/packages/blobs/desktop/wallpapers/armbian*.jpg "${destination}"/usr/share/backgrounds/gnome/
+cp "${SRC}"/packages/blobs/desktop/desktop-wallpapers/armbian*.jpg "${destination}"/usr/share/backgrounds/gnome/
 mkdir -p "${destination}"/usr/share/gnome-background-properties
 cat <<-EOF > "${destination}"/usr/share/gnome-background-properties/armbian.xml
 <?xml version="1.0"?>
diff --git a/config/desktop/sid/environments/gnome/config_base/packages b/config/desktop/sid/environments/gnome/config_base/packages
index 31133cdc9c..eb0c99f109 100644
--- a/config/desktop/sid/environments/gnome/config_base/packages
+++ b/config/desktop/sid/environments/gnome/config_base/packages
@@ -64,7 +64,7 @@ libaspell15
 libatk-adaptor
 libcairo-gobject-perl
 libcairo-perl
-libcamel-1.2-62
+libcamel-1.2-63
 libcue2
 libdee-1.0-4
 libebackend-1.2-10
@@ -73,8 +73,8 @@ libebook-contacts-1.2-3
 libecal-2.0-1
 libedata-book-1.2-26
 libedata-cal-2.0-1
-libedataserver-1.2-25
-libedataserverui-1.2-2
+libedataserver-1.2-26
+libedataserverui-1.2-3
 libenchant-2-2
 libexempi8
 libexiv2-27
@@ -110,7 +110,7 @@ libgweather-common
 libgxps2
 libibus-1.0-5
 libical3
-libidn11
+libidn11-dev
 libijs-0.35
 libimobiledevice6
 libjavascriptcoregtk-4.0-18
@@ -123,7 +123,7 @@ libpaper1
 libphonenumber8
 libplist3
 libpoppler-glib8
-libprotobuf17
+libprotobuf23
 libpulsedsp
 libsasl2-modules
 libspeexdsp1