From b8aa4b9eee2956111aab82c99ef24787b0e57db3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 11 Mar 2022 16:00:18 +0100
Subject: [PATCH] xinit: remove skel files.

We shipped two skeleton files for ~/.xinitrc and ~/.xsession, but the
default behavior of xinit/startx is more useful than an .xinitrc that
doesn't start a window manager, and the .xsession had a bug calling
bash -i which resulted in appending the .xinitrc into the user history...
drop this unnecessary stuff.

Users can copy /etc/X11/xinit/xinitrc as a starting point.
---
 srcpkgs/xinit/files/xinitrc  | 17 -----------------
 srcpkgs/xinit/files/xsession | 10 ----------
 srcpkgs/xinit/template       |  8 ++------
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/xinit/files/xinitrc
 delete mode 100644 srcpkgs/xinit/files/xsession

diff --git a/srcpkgs/xinit/files/xinitrc b/srcpkgs/xinit/files/xinitrc
deleted file mode 100644
index dbd080d00361..000000000000
--- a/srcpkgs/xinit/files/xinitrc
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-  for f in /etc/X11/xinit/xinitrc.d/*; do
-    [ -x "$f" ] && . "$f"
-  done
-  unset f
-fi
-
-# exec gnome-session
-# exec startkde
-# exec startxfce4
-# ...or the Window Manager of your choice
diff --git a/srcpkgs/xinit/files/xsession b/srcpkgs/xinit/files/xsession
deleted file mode 100644
index a16dc0b8421f..000000000000
--- a/srcpkgs/xinit/files/xsession
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-#
-# ~/.xsession
-#
-# Executed by xdm/gdm/kdm at login
-#
-
-/bin/bash --login -i ~/.xinitrc
-
diff --git a/srcpkgs/xinit/template b/srcpkgs/xinit/template
index be836ebc94ad..b687c0ccd2c4 100644
--- a/srcpkgs/xinit/template
+++ b/srcpkgs/xinit/template
@@ -1,7 +1,7 @@
 # Template file for 'xinit'
 pkgname=xinit
 version=1.4.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-xinitdir=/etc/X11/xinit"
 hostmakedepends="pkg-config"
@@ -15,13 +15,9 @@ checksum=de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9
 
 conf_files="
 	/etc/X11/xinit/xinitrc
-	/etc/X11/xinit/xserverrc
-	/etc/skel/.xinitrc
-	/etc/skel/.xsession"
+	/etc/X11/xinit/xserverrc"
 
 post_install() {
-	vinstall ${FILESDIR}/xinitrc 644 etc/skel .xinitrc
-	vinstall ${FILESDIR}/xsession 644 etc/skel .xsession
 	vinstall ${FILESDIR}/xserverrc 644 etc/X11/xinit
 	vlicense COPYING
 }