[arch-commits] Commit in tigervnc/trunk (PKGBUILD more-xsessions.patch)

[Sergej Pupykin]

    Date: Friday, September 11, 2020 @ 12:56:15
  Author: spupykin
Revision: 702792

upgpkg: tigervnc 1.11.0-3

Added:
  tigervnc/trunk/more-xsessions.patch
Modified:
  tigervnc/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   10 +++++++---
 more-xsessions.patch |   17 +++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-11 12:55:25 UTC (rev 702791)
+++ PKGBUILD	2020-09-11 12:56:15 UTC (rev 702792)
@@ -3,7 +3,7 @@
 
 pkgname=tigervnc
 pkgver=1.11.0
-pkgrel=2
+pkgrel=3
 _xorgver=1.20.8
 pkgdesc="Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC."
 arch=('x86_64')
@@ -20,14 +20,18 @@
 source=($pkgname-$pkgver.tar.gz::https://github.com/TigerVNC/tigervnc/archive/v${pkgver}.tar.gz
 	ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2
 	vncserver.service
-	vncviewer.desktop)
+	vncviewer.desktop
+	more-xsessions.patch)
 sha256sums=('3648eca472a92a4e8fe55b27cd397b1bf16bad0b24a3a1988661f44553f5e2c3'
             'd17b646bee4ba0fb7850c1cc55b18e3e8513ed5c02bdf38da7e107f84e2d0146'
             '80f8fc7598d05e645ae73bc3371bbdededf07136a9f024ce6ebbfe469335b16e'
-            '2ada7da1a926d78f11d2dd8ec376ac5877d2ce2bbb57a99526c13d8fcae6ddd7')
+            '2ada7da1a926d78f11d2dd8ec376ac5877d2ce2bbb57a99526c13d8fcae6ddd7'
+            '5606c12553b9891e295bacede6c58f726527ec3eb916efa0c436bb156067ff41')
 
 prepare() {
   cd "$srcdir"/${pkgname}-${pkgver}
+  patch -p1 -i "$srcdir"/more-xsessions.patch
+
   cd unix/xserver
   cp -r "$srcdir"/xorg-server-${_xorgver}/* .
   patch -Np1 -i ../xserver120.patch

Added: more-xsessions.patch
===================================================================
--- more-xsessions.patch	                        (rev 0)
+++ more-xsessions.patch	2020-09-11 12:56:15 UTC (rev 702792)
@@ -0,0 +1,17 @@
+diff -wbBur tigervnc-1.11.0/unix/vncserver/vncserver.in tigervnc-1.11.0.my/unix/vncserver/vncserver.in
+--- tigervnc-1.11.0/unix/vncserver/vncserver.in	2020-09-08 15:16:08.000000000 +0300
++++ tigervnc-1.11.0.my/unix/vncserver/vncserver.in	2020-09-11 15:39:59.980775388 +0300
+@@ -438,7 +438,12 @@
+ 	die "$prog: couldn't find \"$cmd\" on your PATH.\n";
+     }
+ 
+-    foreach $cmd ("/etc/X11/xinit/Xsession", "/etc/X11/Xsession") {
++    foreach $cmd ("/etc/X11/xinit/Xsession", "/etc/X11/Xsession",
++        "/etc/X11/xdm/Xsession",
++        "/usr/share/sddm/scripts/Xsession",
++        "/etc/gdm/Xsession",
++        "/etc/lightdm/Xsession",
++        "/etc/lxdm/Xsession") {
+         if (-x "$cmd") {
+             $Xsession = $cmd;
+             last;