From be5e1de612911c2186af969a16e43ed189fd9eff Mon Sep 17 00:00:00 2001
From: wmcbtech30 <bautista.wyatt.marcus_30@outlook.com>
Date: Tue, 22 Mar 2022 11:27:32 +0800
Subject: [PATCH] xfce4-session: disable initialization of xinit when no
 DISPLAY was found Since we don't have proper xorg display server. xinit would
 be useless here

---
 x11-packages/xfce4-session/build.sh           |  2 +-
 .../disable-xinit-null-display.patch          | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 x11-packages/xfce4-session/disable-xinit-null-display.patch

diff --git a/x11-packages/xfce4-session/build.sh b/x11-packages/xfce4-session/build.sh
index 3c67aa1a2..e02db1ab1 100644
--- a/x11-packages/xfce4-session/build.sh
+++ b/x11-packages/xfce4-session/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A session manager for XFCE environment"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=4.16.0
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=http://archive.xfce.org/src/xfce/xfce4-session/${TERMUX_PKG_VERSION:0:4}/xfce4-session-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=22f273f212481d71e0b5618c62710cd85f69aea74f5ea5c0093f7918b07d17b7
 TERMUX_PKG_DEPENDS="gnupg, hicolor-icon-theme, libsm, libwnck, libxfce4ui, xfce4-settings, xfdesktop, pango, xfwm4, xorg-iceauth, xorg-xrdb"
diff --git a/x11-packages/xfce4-session/disable-xinit-null-display.patch b/x11-packages/xfce4-session/disable-xinit-null-display.patch
new file mode 100644
index 000000000..9896a60ed
--- /dev/null
+++ b/x11-packages/xfce4-session/disable-xinit-null-display.patch
@@ -0,0 +1,20 @@
+diff -uNr xfce4-session-4.16.0.mod/scripts/startxfce4.in xfce4-session-4.16.0/scripts/startxfce4.in
+--- xfce4-session-4.16.0.mod/scripts/startxfce4.in	2016-05-02 21:02:14.000000000 +0000
++++ xfce4-session-4.16.0/scripts/startxfce4.in	2022-03-22 03:38:13.853954163 +0000
+@@ -89,14 +89,9 @@
+ export XDG_CONFIG_DIRS
+ 
+ if test "x$DISPLAY" = "x"
++  echo "$0: Failed to connect to display"
++  exit 1
+ then
+-  echo "$0: Starting X server"
+-  prog=xinit
+-
+-  if test ! "x$XDG_VTNR" = "x"; then
+-    SERVERRC="vt$XDG_VTNR $SERVERRC"
+-  fi
+-else
+   echo "$0: X server already running on display $DISPLAY"
+   prog=/bin/sh
+ fi