From 1adc1a6e5faa64c9da02b0d3481594bcd6a07b6c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 2 Nov 2021 16:16:23 +0100
Subject: [pulseaudio/qt5core] Switch to pavucontrol-qt

---
 .../pulseaudio/data/opt/openslx/pvs2/launch-pavucontrol.sh        | 2 +-
 core/modules/pulseaudio/module.build                              | 6 ------
 core/modules/pulseaudio/module.conf                               | 8 --------
 core/modules/pulseaudio/module.conf.ubuntu                        | 4 +---
 4 files changed, 2 insertions(+), 18 deletions(-)

(limited to 'core/modules/pulseaudio')

diff --git a/core/modules/pulseaudio/data/opt/openslx/pvs2/launch-pavucontrol.sh b/core/modules/pulseaudio/data/opt/openslx/pvs2/launch-pavucontrol.sh
index 599bca7a..074be46f 100755
--- a/core/modules/pulseaudio/data/opt/openslx/pvs2/launch-pavucontrol.sh
+++ b/core/modules/pulseaudio/data/opt/openslx/pvs2/launch-pavucontrol.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec /usr/bin/pavucontrol -t 5
+exec /usr/bin/pavucontrol-qt -t 5
diff --git a/core/modules/pulseaudio/module.build b/core/modules/pulseaudio/module.build
index 03a324c2..d2c39da9 100644
--- a/core/modules/pulseaudio/module.build
+++ b/core/modules/pulseaudio/module.build
@@ -15,11 +15,6 @@ build() {
 		ln -ns "$base" "${MODULE_BUILD_DIR}/usr/share/alsa/alsa.conf.d/${link}"
 	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%/*}"
@@ -27,6 +22,5 @@ build() {
 			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 15db379d..e0f3ef37 100644
--- a/core/modules/pulseaudio/module.conf
+++ b/core/modules/pulseaudio/module.conf
@@ -8,14 +8,6 @@ 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 8449413a..cdbea999 100644
--- a/core/modules/pulseaudio/module.conf.ubuntu
+++ b/core/modules/pulseaudio/module.conf.ubuntu
@@ -3,13 +3,11 @@
 REQUIRED_CONTENT_PACKAGES="
 	alsa-base
 	alsa-topology-conf
-	gnome-icon-theme
 	libasound2
 	libasound2-data
 	libasound2-plugins
-	libgdk-pixbuf2.0-0
 	libpulse0
-	pavucontrol
+	pavucontrol-qt
 	pulseaudio
 	pulseaudio-utils
 "
-- 
cgit v1.2.3-55-g7522