Fixed xpra start

1 files changed, 19 insertions, 3 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 23632a98a8ac..a471659d6c9d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bug <bug2000@gmail.com>
 pkgname=xpra-winswitch
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Modified version of xpra by Winswitch"
 arch=('i686' 'x86_64')
 url='http://xpra.org/'
@@ -20,7 +20,22 @@ optdepends=('x264: Codec' 'python2-dbus: dbus features'
 conflicts=('parti-all')
 provides=('parti-all')
 makedepends=('python2-setuptools' 'cython2')
-backup=('etc/xpra/xpra.conf' 'etc/xpra/xorg.conf')
+backup=('etc/xpra/xpra.conf' 'etc/xpra/xorg.conf'
+        'etc/xpra/cuda.conf' 'etc/xpra/nvenc.keys'
+        'etc/xpra/conf.d/05_features.conf'
+        'etc/xpra/conf.d/10_network.conf'
+        'etc/xpra/conf.d/12_ssl.conf'
+        'etc/xpra/conf.d/15_file_transfers.conf'
+        'etc/xpra/conf.d/16_printing.conf'
+        'etc/xpra/conf.d/20_sound.conf'
+        'etc/xpra/conf.d/30_picture.conf'
+        'etc/xpra/conf.d/35_webcam.conf'
+        'etc/xpra/conf.d/40_client.conf'
+        'etc/xpra/conf.d/42_client_keyboard.conf'
+        'etc/xpra/conf.d/50_server_network.conf'
+        'etc/xpra/conf.d/55_server_x11.conf'
+        'etc/xpra/conf.d/60_server.conf'
+        'etc/xpra/conf.d/65_proxy.conf')
 install=xpra-winswitch.install
 source=("https://xpra.org/src/xpra-$pkgver.tar.xz"
         "xpra-winswitch.install")
@@ -36,7 +51,8 @@ build() {
 package() {
   cd ${srcdir}/xpra-$pkgver
   python2 setup.py install --root=${pkgdir} || return 1
-  sed -i -e '/^xvfb\s*=\s*Xorg/s/Xorg/xpra_Xdummy/' ${pkgdir}/etc/xpra/xpra.conf
+  sed -i -e '/^xvfb\s*=\s*Xorg/s|Xorg|/usr/lib/xorg-server/Xorg|' ${pkgdir}/etc/xpra/conf.d/55_server_x11.conf
+  sed -i -e "s|$(echo ${pkgdir})||g" ${pkgdir}/etc/xpra/conf.d/55_server_x11.conf
   mkdir -p ${pkgdir}/usr/lib/sysusers.d
   echo g xpra - - > ${pkgdir}/usr/lib/sysusers.d/xpra.conf
 }