From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9ACF11382C5 for ; Sat, 10 Mar 2018 05:56:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE570E085E; Sat, 10 Mar 2018 05:56:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92012E085E for ; Sat, 10 Mar 2018 05:56:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 09D3D335C09 for ; Sat, 10 Mar 2018 05:56:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B839B23D for ; Sat, 10 Mar 2018 05:56:04 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1520661332.b5d149489d0d734466fe09c232b5ed42ec9ec9f1.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/, x11-apps/xinit/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch x11-apps/xinit/xinit-1.4.0.ebuild X-VCS-Directories: x11-apps/xinit/files/ x11-apps/xinit/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: b5d149489d0d734466fe09c232b5ed42ec9ec9f1 X-VCS-Branch: master Date: Sat, 10 Mar 2018 05:56:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2af6c347-1e48-4174-85da-5e5d7a36ba61 X-Archives-Hash: 5307d3acb90fe3367a12b86825076525 commit: b5d149489d0d734466fe09c232b5ed42ec9ec9f1 Author: Marty E. Plummer startmail com> AuthorDate: Sat Mar 10 05:32:38 2018 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Mar 10 05:55:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d14948 x11-apps/xinit: rebase xinit-1.3.4-startx-current-vt.patch Patch no longer cleanly applies, fixed it up to apply on new version using quilt. Builds properly on my system. Closes: https://bugs.gentoo.org/650066 Signed-off-by: Marty E. Plummer startmail.com> Closes: https://github.com/gentoo/gentoo/pull/7412 .../xinit/files/xinit-1.4.0-startx-current-vt.patch | 20 ++++++++++++++++++++ x11-apps/xinit/xinit-1.4.0.ebuild | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch b/x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch new file mode 100644 index 00000000000..ecddd3b369e --- /dev/null +++ b/x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch @@ -0,0 +1,20 @@ +--- a/startx.cpp ++++ b/startx.cpp +@@ -200,17 +200,6 @@ XCOMM process server arguments + if [ x"$server" = x ]; then + server=$defaultserver + +-#ifdef __linux__ +- XCOMM When starting the defaultserver start X on the current tty to avoid +- XCOMM the startx session being seen as inactive: +- XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491" +- tty=$(tty) +- if expr "$tty" : '/dev/tty[0-9][0-9]*$' > /dev/null; then +- tty_num=$(echo "$tty" | grep -oE '[0-9]+$') +- vtarg="vt$tty_num -keeptty" +- fi +-#endif +- + XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments + if [ x"$serverargs" = x -a x"$display" = x ]; then + if [ -f "$userserverrc" ]; then diff --git a/x11-apps/xinit/xinit-1.4.0.ebuild b/x11-apps/xinit/xinit-1.4.0.ebuild index ea3e115f959..c2d2baabb33 100644 --- a/x11-apps/xinit/xinit-1.4.0.ebuild +++ b/x11-apps/xinit/xinit-1.4.0.ebuild @@ -28,7 +28,7 @@ PDEPEND="x11-apps/xrdb PATCHES=( "${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch" - "${FILESDIR}/${PN}-1.3.4-startx-current-vt.patch" + "${FILESDIR}/${PN}-1.4.0-startx-current-vt.patch" ) src_configure() {