From a1baba455a088138ac1bed811b0b7509af18b213 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Mon, 27 Sep 2021 11:10:12 -0700
Subject: [PATCH] updating arch kde to new baseimage format with pulse script

---
 Dockerfile               | 22 ----------------------
 Dockerfile.aarch64       | 22 ----------------------
 Dockerfile.armhf         | 22 ----------------------
 root/defaults/startwm.sh |  2 +-
 4 files changed, 1 insertion(+), 67 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b4e04fa2..4123f18d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,27 +3,10 @@ FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arch
 # set version label
 ARG BUILD_DATE
 ARG VERSION
-ARG XFCE_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
 RUN \
-  echo "**** install build deps ****" && \
-  pacman -Sy --noconfirm --needed \
-    base-devel \
-    git && \
-  echo "**** build AUR packages ****" && \
-  cd /tmp && \
-  AUR_PACKAGES="\
-    dbus-x11" && \
-  pacman -Rns --noconfirm -dd dbus && \
-  for PACKAGE in ${AUR_PACKAGES}; do \
-    git clone https://aur.archlinux.org/${PACKAGE}.git && \
-    chown -R abc:abc ${PACKAGE} && \
-    cd ${PACKAGE} && \
-    sudo -u abc makepkg -sAci --skipinteg --noconfirm --needed && \
-    cd /tmp ;\
-  done && \
   echo "**** install packages ****" && \
   pacman -Sy --noconfirm --needed \
     discover \
@@ -31,13 +14,8 @@ RUN \
     firefox \
     kate \
     konsole \
-    pavucontrol \
     plasma-desktop && \
   echo "**** cleanup ****" && \
-  pacman -Rsn --noconfirm \
-    gcc \
-    git \
-    $(pacman -Qdtq) && \
   rm -rf \
     /tmp/* \
     /var/cache/pacman/pkg/* \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index f015d8a7..583c8193 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -3,27 +3,10 @@ FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-arch
 # set version label
 ARG BUILD_DATE
 ARG VERSION
-ARG XFCE_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
 RUN \
-  echo "**** install build deps ****" && \
-  pacman -Sy --noconfirm --needed \
-    base-devel \
-    git && \
-  echo "**** build AUR packages ****" && \
-  cd /tmp && \
-  AUR_PACKAGES="\
-    dbus-x11" && \
-  pacman -Rns --noconfirm -dd dbus && \
-  for PACKAGE in ${AUR_PACKAGES}; do \
-    git clone https://aur.archlinux.org/${PACKAGE}.git && \
-    chown -R abc:abc ${PACKAGE} && \
-    cd ${PACKAGE} && \
-    sudo -u abc makepkg -sAci --skipinteg --noconfirm --needed && \
-    cd /tmp ;\
-  done && \
   echo "**** install packages ****" && \
   pacman -Sy --noconfirm --needed \
     discover \
@@ -31,13 +14,8 @@ RUN \
     firefox \
     kate \
     konsole \
-    pavucontrol \
     plasma-desktop && \
   echo "**** cleanup ****" && \
-  pacman -Rsn --noconfirm \
-    gcc \
-    git \
-    $(pacman -Qdtq) && \
   rm -rf \
     /tmp/* \
     /var/cache/pacman/pkg/* \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 985b0497..39a5e2e5 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -3,27 +3,10 @@ FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-arch
 # set version label
 ARG BUILD_DATE
 ARG VERSION
-ARG XFCE_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
 RUN \
-  echo "**** install build deps ****" && \
-  pacman -Sy --noconfirm --needed \
-    base-devel \
-    git && \
-  echo "**** build AUR packages ****" && \
-  cd /tmp && \
-  AUR_PACKAGES="\
-    dbus-x11" && \
-  pacman -Rns --noconfirm -dd dbus && \
-  for PACKAGE in ${AUR_PACKAGES}; do \
-    git clone https://aur.archlinux.org/${PACKAGE}.git && \
-    chown -R abc:abc ${PACKAGE} && \
-    cd ${PACKAGE} && \
-    sudo -u abc makepkg -sAci --skipinteg --noconfirm --needed && \
-    cd /tmp ;\
-  done && \
   echo "**** install packages ****" && \
   pacman -Sy --noconfirm --needed \
     discover \
@@ -31,13 +14,8 @@ RUN \
     firefox \
     kate \
     konsole \
-    pavucontrol \
     plasma-desktop && \
   echo "**** cleanup ****" && \
-  pacman -Rsn --noconfirm \
-    gcc \
-    git \
-    $(pacman -Qdtq) && \
   rm -rf \
     /tmp/* \
     /var/cache/pacman/pkg/* \
diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index ee91a91a..3b8ce550 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-PULSE_SCRIPT=/etc/xrdp/pulse/default.pa /usr/bin/pulseaudio --start
+PULSE_SCRIPT=/etc/xrdp/pulse/default.pa /startpulse.sh --start &
 /usr/bin/startplasma-x11 > /dev/null 2>&1