[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/

[Matt Turner]

commit:     cc79c7e2d44b7ded89e01024cb48a960095550ae
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Feb 17 16:30:37 2017 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 17:16:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc79c7e2

x11-apps/xinit: remove unused patch

 .../xinit/files/0001-Gentoo-customizations.patch   | 61 ----------------------
 1 file changed, 61 deletions(-)

diff --git a/x11-apps/xinit/files/0001-Gentoo-customizations.patch b/x11-apps/xinit/files/0001-Gentoo-customizations.patch
deleted file mode 100644
index a25ef4ba2a..0000000000
--- a/x11-apps/xinit/files/0001-Gentoo-customizations.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From d24cea5021fab8a11b1492a031319939d133d221 Mon Sep 17 00:00:00 2001
-From: Tomas Chvatal <scarabeus@gentoo.org>
-Date: Mon, 1 Nov 2010 16:46:36 +0100
-Subject: [PATCH] Gentoo customizations.
-
-
-Signed-off-by: Tomas Chvatal <scarabeus@gentoo.org>
----
- xinitrc.cpp |   26 ++++++++++++++++++--------
- 1 files changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/xinitrc.cpp b/xinitrc.cpp
-index 049a8e4..80c3ad9 100644
---- a/xinitrc.cpp
-+++ b/xinitrc.cpp
-@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD
- 
- userresources=$HOME/.Xresources
- usermodmap=$HOME/.Xmodmap
--sysresources=XINITDIR/.Xresources
--sysmodmap=XINITDIR/.Xmodmap
-+sysresources=XINITDIR/Xresources
-+sysmodmap=XINITDIR/Xmodmap
- 
- XCOMM merge in defaults and keymaps
- 
-@@ -84,15 +84,25 @@ fi
- XCOMM This is the fallback case if nothing else is executed above
- #endif /* !defined(__SCO__)  && !defined(__UNIXWARE__) */
- 
-+if [ -n "`/etc/X11/chooser.sh`" ]; then
-+	command="`/etc/X11/chooser.sh`"
-+else
-+	failsafe="yes"
-+fi
-+
- if [ -d XINITDIR/xinitrc.d ] ; then
--	for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do
-+	for f in XINITDIR/xinitrc.dXSLASHGLOB ; do
- 		[ -x "$f" ] && . "$f"
- 	done
- 	unset f
- fi
- 
--TWM &
--XCLOCK -geometry 50x50-1+1 &
--XTERM -geometry 80x50+494+51 &
--XTERM -geometry 80x20+494-0 &
--exec XTERM -geometry 80x66+0+0 -name login
-+if [ -n "$failsafe" ]; then
-+	TWM &
-+	XCLOCK -geometry 50x50-1+1 &
-+	XTERM -geometry 80x50+494+51 &
-+	XTERM -geometry 80x20+494-0 &
-+	exec XTERM -geometry 80x66+0+0 -name login
-+else
-+	exec $command
-+fi
--- 
-1.7.3.1
-

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/

[Austin English]

commit:     2bb6b9e50bdb8efc9a4627e60a4e63d38e8d6255
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 21:41:12 2017 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 21:47:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bb6b9e5

x11-apps/xinit: use /lib/gentoo/functions.sh instead of deprecated /etc/init.d/functions.sh

Also bail out early if the machine is not running OpenRC, with an
appropriate error

Acked-By: Manuel Rüger <mrueg <AT> gentoo.org>

Gentoo-Bug: https://bugs.gentoo.org/504140
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 x11-apps/xinit/files/startDM.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
index 66cceb3a68f..21fb452df1e 100644
--- a/x11-apps/xinit/files/startDM.sh
+++ b/x11-apps/xinit/files/startDM.sh
@@ -1,12 +1,17 @@
 #!/bin/sh
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
 
 # We need to source /etc/profile for stuff like $LANG to work
 # bug #10190.
 . /etc/profile
 
-. /etc/init.d/functions.sh
+. /lib/gentoo/functions.sh
+
+# Bail out early if on a non-OpenRC system:
+if [ ! -d /run/openrc ]; then
+    eerror "$0 should only be used on OpenRC systems"
+fi
 
 # baselayout-1 compat
 if ! type get_options >/dev/null 2>/dev/null ; then

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/

[Matt Turner]

commit:     dd42e7509a42d4bd8f139a7910eb519d939924f4
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 19 16:05:31 2017 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 19 16:05:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd42e750

Revert "x11-apps/xinit: use /lib/gentoo/functions.sh instead of deprecated /etc/init.d/functions.sh"

This reverts commit 2bb6b9e50bdb8efc9a4627e60a4e63d38e8d6255.

Gentoo-Bug: https://bugs.gentoo.org/634706

 x11-apps/xinit/files/startDM.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
index 21fb452df1e..66cceb3a68f 100644
--- a/x11-apps/xinit/files/startDM.sh
+++ b/x11-apps/xinit/files/startDM.sh
@@ -1,17 +1,12 @@
 #!/bin/sh
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
 
 # We need to source /etc/profile for stuff like $LANG to work
 # bug #10190.
 . /etc/profile
 
-. /lib/gentoo/functions.sh
-
-# Bail out early if on a non-OpenRC system:
-if [ ! -d /run/openrc ]; then
-    eerror "$0 should only be used on OpenRC systems"
-fi
+. /etc/init.d/functions.sh
 
 # baselayout-1 compat
 if ! type get_options >/dev/null 2>/dev/null ; then

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/

[Matt Turner]

commit:     66cb52db08b0d4223ccaed443077d4c5eff525b7
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon May 21 03:56:23 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon May 21 03:58:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66cb52db

x11-apps/xinit: Restore necessary patch

Accidentally removed in e773ede4cc6c (x11-apps/xinit: Drop old versions)

 .../files/xinit-1.3.3-gentoo-customizations.patch  | 61 ++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch b/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch
new file mode 100644
index 00000000000..48dceabc500
--- /dev/null
+++ b/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch
@@ -0,0 +1,61 @@
+From d24cea5021fab8a11b1492a031319939d133d221 Mon Sep 17 00:00:00 2001
+From: Tomas Chvatal <scarabeus@gentoo.org>
+Date: Mon, 1 Nov 2010 16:46:36 +0100
+Subject: [PATCH] Gentoo customizations.
+
+
+Signed-off-by: Tomas Chvatal <scarabeus@gentoo.org>
+---
+ xinitrc.cpp |   26 ++++++++++++++++++--------
+ 1 files changed, 18 insertions(+), 8 deletions(-)
+
+diff --git a/xinitrc.cpp b/xinitrc.cpp
+index 049a8e4..80c3ad9 100644
+--- a/xinitrc.cpp
++++ b/xinitrc.cpp
+@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD
+ 
+ userresources=$HOME/.Xresources
+ usermodmap=$HOME/.Xmodmap
+-sysresources=XINITDIR/.Xresources
+-sysmodmap=XINITDIR/.Xmodmap
++sysresources=XINITDIR/Xresources
++sysmodmap=XINITDIR/Xmodmap
+ 
+ XCOMM merge in defaults and keymaps
+ 
+@@ -84,15 +84,25 @@ fi
+ XCOMM This is the fallback case if nothing else is executed above
+ #endif /* !defined(__SCO__)  && !defined(__UNIXWARE__) */
+ 
++if [ -n "`/etc/X11/chooser.sh`" ]; then
++	command="`/etc/X11/chooser.sh`"
++else
++	failsafe="yes"
++fi
++
+ if [ -d XINITDIR/xinitrc.d ] ; then
+-	for f in XINITDIR/xinitrc.d/?*.sh ; do
++	for f in XINITDIR/xinitrc.d/?* ; do
+ 		[ -x "$f" ] && . "$f"
+ 	done
+ 	unset f
+ fi
+ 
+-TWM &
+-XCLOCK -geometry 50x50-1+1 &
+-XTERM -geometry 80x50+494+51 &
+-XTERM -geometry 80x20+494-0 &
+-exec XTERM -geometry 80x66+0+0 -name login
++if [ -n "$failsafe" ]; then
++	TWM &
++	XCLOCK -geometry 50x50-1+1 &
++	XTERM -geometry 80x50+494+51 &
++	XTERM -geometry 80x20+494-0 &
++	exec XTERM -geometry 80x66+0+0 -name login
++else
++	exec $command
++fi
+-- 
+1.7.3.1
+

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/

[Matt Turner]

commit:     9ad67a504fa8619fff2d6c223b5fe7a288c4d5b3
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 28 17:50:26 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Feb 28 17:50:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ad67a50

x11-apps/xinit: s/SVCNAME/RC_SVCNAME/

Closes: https://bugs.gentoo.org/313287
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-apps/xinit/files/startDM.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
index 66cceb3a68f..e2da6098d6a 100644
--- a/x11-apps/xinit/files/startDM.sh
+++ b/x11-apps/xinit/files/startDM.sh
@@ -17,7 +17,7 @@ fi
 # We enable this by default
 export GDK_USE_XFT=1
 
-export SVCNAME=xdm
+export RC_SVCNAME=xdm
 EXEC="$(get_options service)"
 NAME="$(get_options name)"
 PIDFILE="$(get_options pidfile)"

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/

[Matt Turner]

commit:     3ba45433f1a974b4fb6a37c3099cc731a445de8f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 18:41:10 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed May 15 18:51:15 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba45433

x11-apps/xinit: Drop long-dead GTK envar

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-apps/xinit/files/startDM.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
index a4bf30e31ba..640bb24b7a2 100644
--- a/x11-apps/xinit/files/startDM.sh
+++ b/x11-apps/xinit/files/startDM.sh
@@ -18,10 +18,6 @@ if ! type get_options >/dev/null 2>/dev/null ; then
 	[ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh
 fi
 
-# Great new Gnome2 feature, AA
-# We enable this by default
-export GDK_USE_XFT=1
-
 export RC_SVCNAME=xdm
 EXEC="$(get_options service)"
 NAME="$(get_options name)"

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/

[Matt Turner]

commit:     89bd37128eb6bb0142b3e62288dc9c73b3259aed
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Dec 12 13:26:52 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Dec 12 14:18:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89bd3712

x11-apps/xinit: remove unused file

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/23268
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-apps/xinit/files/startDM.sh | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
deleted file mode 100644
index 640bb24b7a26..000000000000
--- a/x11-apps/xinit/files/startDM.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# We need to source /etc/profile for stuff like $LANG to work
-# bug #10190.
-. /etc/profile
-
-. /lib/rc/sh/functions.sh
-
-# Bail out early if on a non-OpenRC system:
-if [ ! -d /run/openrc ]; then
-	eerror "$0 should only be used on OpenRC systems"
-fi
-
-# baselayout-1 compat
-if ! type get_options >/dev/null 2>/dev/null ; then
-	[ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh
-fi
-
-export RC_SVCNAME=xdm
-EXEC="$(get_options service)"
-NAME="$(get_options name)"
-PIDFILE="$(get_options pidfile)"
-START_STOP_ARGS="$(get_options start_stop_args)"
-
-start-stop-daemon --start --exec ${EXEC} \
-${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} ${START_STOP_ARGS} || \
-eerror "ERROR: could not start the Display Manager"
-
-# vim:ts=4