From 05c583ccedb1071dcc476250a5b1a55217a097f0 Mon Sep 17 00:00:00 2001
From: yangxuan8282 <yangxuan8282@gmail.com>
Date: Mon, 21 May 2018 23:53:29 +0800
Subject: [PATCH] add some plugins for postmarketos-ui-xfce4 (#1503)

* add some plugins for postmarketos-ui-xfce4
* make start_xfce4.sh start xfce4 properly and add related dependencies
---
 main/postmarketos-ui-xfce4/APKBUILD       | 8 +++++---
 main/postmarketos-ui-xfce4/start_xfce4.sh | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/main/postmarketos-ui-xfce4/APKBUILD b/main/postmarketos-ui-xfce4/APKBUILD
index dd586f3ee..6982a2d64 100644
--- a/main/postmarketos-ui-xfce4/APKBUILD
+++ b/main/postmarketos-ui-xfce4/APKBUILD
@@ -1,11 +1,13 @@
 pkgname=postmarketos-ui-xfce4
 pkgver=0.2
-pkgrel=0
+pkgrel=1
 pkgdesc="(X11) Lightweight GTK+2 desktop (stylus recommended)"
 url="https://github.com/postmarketOS/xfce4-phone"
 arch="noarch"
 license="GPL3"
-depends="xfce4 xorg-server mesa-egl postmarketos-artwork-wallpapers faenza-icon-theme xfce4-battery-plugin"
+depends="xfce4 xorg-server mesa-egl postmarketos-artwork-wallpapers 
+	faenza-icon-theme xfce4-battery-plugin network-manager-applet 
+	xfce4-mixer gnome-keyring consolekit2 lxpolkit"
 makedepends=""
 install="$pkgname.post-install"
 subpackages=""
@@ -20,5 +22,5 @@ package() {
 	cp -a "$builddir"/config "$pkgdir"/etc/skel/.config
 }
 
-sha512sums="34ad0048947b2cefe4de08592c479f717ae4b65a59f06aff9fc05b387ce6516d9f976a79e1efdf1c30a14ee2bc723fcf28f2aaac937f1e0787d95bd16a80332f  start_xfce4.sh
+sha512sums="6cf45653ca0c96eb7fe0a7b78db1565e24e7893a2113b9eabf22285cb58b90a41b94c69de2b3a316ab759719f715555751cc51a30e00f358b940d694e7850625  start_xfce4.sh
 4321a2a24b45f0d33b586ef098cfb236d87f557e7e2fecb180774d1cb1bc9fa1edfe6ce8a1faa646adcb026b4ef1b03b477eae0c46f4c46c8488baabb9c382e3  postmarketos-ui-xfce4-0.2.tar.gz"
diff --git a/main/postmarketos-ui-xfce4/start_xfce4.sh b/main/postmarketos-ui-xfce4/start_xfce4.sh
index 78af1e785..38e1b4270 100644
--- a/main/postmarketos-ui-xfce4/start_xfce4.sh
+++ b/main/postmarketos-ui-xfce4/start_xfce4.sh
@@ -6,7 +6,7 @@
 # display manager in the long run (#656).
 if [ "$(id -u)" = "1000" ] && [ "$(tty)" = "/dev/tty1" ]; then
 	# Start X11 with XFCE4
-	startxfce4 2>&1 | logger -t "$(whoami):x11"
+	ck-launch-session dbus-launch --exit-with-session startxfce4 2>&1 | logger -t "$(whoami):x11"
 
 
 	# In case of failure, restart after 1s