From 127d4c684f96641abb2741392f453f05619be711 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 29 Oct 2021 15:55:32 +0200
Subject: [pulseaudio] Add icons for pavucontrol, enable socket for user
 session

---
 core/modules/pulseaudio/module.build       | 12 ++++++++++++
 core/modules/pulseaudio/module.conf        |  6 ++++++
 core/modules/pulseaudio/module.conf.ubuntu |  2 ++
 3 files changed, 20 insertions(+)

(limited to 'core/modules/pulseaudio')

diff --git a/core/modules/pulseaudio/module.build b/core/modules/pulseaudio/module.build
index 989fd89a..03a324c2 100644
--- a/core/modules/pulseaudio/module.build
+++ b/core/modules/pulseaudio/module.build
@@ -16,5 +16,17 @@ build() {
 	done
 	if [ -z "$MLTK_INSTALL" ]; then
 		tarcopy "/usr/share/mime" "${MODULE_BUILD_DIR}/"
+		base="$( grep -o -m1 '^.*/gdk-pixbuf-2.0/' "$PKG_CONTENT_FILE" )"
+		if [ -n "$base" ]; then
+			tarcopy "$( find "$base" -type f -name "loaders.cache" )" "${MODULE_BUILD_DIR}/"
+		fi
+		base="$( grep -m1 -F '/pulseaudio.socket' "$PKG_CONTENT_FILE" )"
+		if [ -n "$base" ]; then
+			base="${base%/*}"
+			mkdir -p "${MODULE_BUILD_DIR}${base}/sockets.target.wants"
+			ln -ns "../pulseaudio.socket" \
+				"${MODULE_BUILD_DIR}${base}/sockets.target.wants/pulseaudio.socket"
+		fi
+		tarcopy "/usr/share/icons/gnome/icon-theme.cache" "${MODULE_BUILD_DIR}/"
 	fi
 }
diff --git a/core/modules/pulseaudio/module.conf b/core/modules/pulseaudio/module.conf
index 0e68160a..15db379d 100644
--- a/core/modules/pulseaudio/module.conf
+++ b/core/modules/pulseaudio/module.conf
@@ -8,8 +8,14 @@ REQUIRED_DIRECTORIES="
 	/lib/udev
 	/usr/bin
 	/usr/lib
+	/usr/share/icons/gnome/16x16
 	/usr/share/alsa
 	/usr/share/mime
 	/usr/share/pavucontrol
 	/usr/share/pulseaudio
 "
+
+REQUIRED_FILES="
+	/usr/share/icons/gnome/icon-theme.cache
+	/usr/share/icons/gnome/index.theme
+"
diff --git a/core/modules/pulseaudio/module.conf.ubuntu b/core/modules/pulseaudio/module.conf.ubuntu
index a3c2d637..8449413a 100644
--- a/core/modules/pulseaudio/module.conf.ubuntu
+++ b/core/modules/pulseaudio/module.conf.ubuntu
@@ -3,7 +3,9 @@
 REQUIRED_CONTENT_PACKAGES="
 	alsa-base
 	alsa-topology-conf
+	gnome-icon-theme
 	libasound2
+	libasound2-data
 	libasound2-plugins
 	libgdk-pixbuf2.0-0
 	libpulse0
-- 
cgit v1.2.3-55-g7522