From nobody Sun Mar 27 20:04:25 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 774F71A50717; Sun, 27 Mar 2022 20:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KRRcT2tnyz4mQZ; Sun, 27 Mar 2022 20:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648411465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LBKdPWSdMUVFsgiVezwtkqaFB2sEWpf6FiuKeu8n1+U=; b=pwUZ7ogPh5cOERre3VpG77i9GLKHlhb3C0a9ol3fodwWC7F17pEDsx9QOCF9UkLyOnuaBu D2r68mvLUfAb4tQOf9ObDjkPwV8N5xvHyPfcQcz7hwzCDysCDIjw/k0lJttC+LOxjE6eS5 4ypJLL9IV1vX8D7uYWVAnb7yTiHlxxTVNhawLGxyyRpL3T1ZpzWO6PISYgZ+ATUp8LxNOM 4Sty+OySyfu9r455nZrW0khHuJ9E6xTO/5rQL78OIIlreGGQ/8jHRgcpCLtdb5Wt/Yfx1k BafKmlf4cJGWa1WgQVYHX2lkNOb2cFkkn3y/i7agqBNock3U9yx1ARZEXhfEFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 41D591BE15; Sun, 27 Mar 2022 20:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22RK4PcS023299; Sun, 27 Mar 2022 20:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22RK4PHR023298; Sun, 27 Mar 2022 20:04:25 GMT (envelope-from git) Date: Sun, 27 Mar 2022 20:04:25 GMT Message-Id: <202203272004.22RK4PHR023298@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 016555283010 - main - x11/gdm: Fix bug where we go to console on logout List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 016555283010d8f61e6d5a2713442010fddb46dc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648411465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LBKdPWSdMUVFsgiVezwtkqaFB2sEWpf6FiuKeu8n1+U=; b=atEUiuMj0TZa2aGN8OOoBDPj+Qwtys5IpuehU9g69qxTWR3m+RyKStmObWsLQ5MgDuwWiy dt4AgW2dkb0vxa22yC+9Nuj5+M9kqMiGpFxzfBf/xYk61oc8n/N8u44Z5vRF/uQo7AcMEM pKOoTY8Ho5TUaBjaItsG46+EvOC4TQAfo7VKeYdGWBmc7vYIW7kB7UbOksdCN+UJ9Falf2 WOViFlDYUH4a2A88qFK1OLG1BWW7FdN53Yr45uAf3RjMApHkRx73AnmL/P/vF06QRlby3N qrD1aqdRkZ0RKQ4wYEtaA6bkb9iikwqXon9hrWwaGRH0udK9dUayUGq0B8Naqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648411465; a=rsa-sha256; cv=none; b=XzayRFhuDSM1lc4aXRROKBCKzQv73fjmFtSobSu5f4lTkAJomZcuQlK4HCQ5MVTI1BxacW JDauIDwE4HxX17qQ1KTPVpJv75W/ttKItR63cd2G99r+RvfLhuwzN2jJLm3uAU+hzgJ/Tg Yb4HWcQXUzaayHWWGzYOuKPkMLvDHa7Hrb6N6YS7Gysa1jSz5x54cWyfIoEMC0Eqb1IkxG XGJ9mLGjTRjcIklXt89BHmF4UoFfzTc27zTViVo6yA9+nyi0xJ9qi9HtSiMaKDZKjhOQaw jrykdc955svIvFAYUh1X1zDUC0/uFgXfks8IQikK3QFbCUVmksjcXVocNordwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=016555283010d8f61e6d5a2713442010fddb46dc commit 016555283010d8f61e6d5a2713442010fddb46dc Author: Neel Chauhan AuthorDate: 2022-03-27 20:04:23 +0000 Commit: Neel Chauhan CommitDate: 2022-03-27 20:04:23 +0000 x11/gdm: Fix bug where we go to console on logout --- x11/gdm/Makefile | 1 + x11/gdm/files/patch-data_Init.in | 66 --------------------------------- x11/gdm/files/patch-data_PostSession.in | 14 +++---- x11/gdm/files/patch-data_PreSession.in | 14 ------- 4 files changed, 6 insertions(+), 89 deletions(-) diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index d724d456eee5..eb2116ffa0b8 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -2,6 +2,7 @@ PORTNAME= gdm PORTVERSION= 42.0 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/} DIST_SUBDIR= gnome diff --git a/x11/gdm/files/patch-data_Init.in b/x11/gdm/files/patch-data_Init.in deleted file mode 100644 index 7ec028b66b5b..000000000000 --- a/x11/gdm/files/patch-data_Init.in +++ /dev/null @@ -1,66 +0,0 @@ ---- data/Init.in.orig 2022-03-21 18:12:40 UTC -+++ data/Init.in -@@ -6,6 +6,19 @@ OLD_IFS=$IFS - PATH="@X_PATH@:$PATH" - OLD_IFS=$IFS - -+# enhance fade in look; -+# gnome-shell-3.38.1/data/theme/gnome-shell-sass/widgets/_screen-shield.scss: -+# #lockDialogGroup { -+# background-color: lighten(#2e3436, 8%); -+# } -+xsetroot -solid "#2e3436" -+ -+# wait for ttys to be initialized -+while ! pgrep -qf "^/usr/libexec/getty "; do -+ sleep 1 -+ [ $((i++)) -ge 10 ] && break -+done -+ - gdmwhich () { - COMMAND="$1" - OUTPUT= -@@ -22,10 +35,10 @@ gdmwhich () { - echo "$OUTPUT" - } - --if [ -f /etc/X11/Xresources ]; then -- sysresources=/etc/X11/Xresources -+if [ -f /usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/etc/X11/Xresources ]; then -+ sysresources=/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/etc/X11/Xresources - else -- sysresources=/usr/etc/X11/Xresources -+ sysresources=/usr/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/etc/X11/Xresources - fi - - # merge in defaults -@@ -33,10 +46,10 @@ fi - xrdb -nocpp -merge "$sysresources" - fi - --if [ -f /etc/X11/Xmodmap ]; then -- sysmodmap=/etc/X11/Xmodmap -+if [ -f /usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/etc/X11/Xmodmap ]; then -+ sysmodmap=/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/etc/X11/Xmodmap - else -- sysmodmap=/usr/etc/X11/Xmodmap -+ sysmodmap=/usr/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/etc/X11/Xmodmap - fi - - XMODMAP=`gdmwhich xmodmap` -@@ -93,5 +106,15 @@ fi - fi - fi - fi -+ -+# /usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/etc/X11/xenodm/GiveConsole, fbtab(5) -+if [ -c /dev/dri/card0 ]; then -+ /usr/sbin/chown _gdm /dev/dri/card0 -+fi -+if [ -c /dev/dri/renderD128 ]; then -+ /usr/sbin/chown _gdm /dev/dri/renderD128 -+fi -+# XXX OpenBSD needs an implementation of XDG_RUNTIME_DIR -+rm -rf /var/db/gdm/.cache/gnome-shell/runtime-state-* - - exit 0 diff --git a/x11/gdm/files/patch-data_PostSession.in b/x11/gdm/files/patch-data_PostSession.in index d8752cc882b3..bb4969327dec 100644 --- a/x11/gdm/files/patch-data_PostSession.in +++ b/x11/gdm/files/patch-data_PostSession.in @@ -1,14 +1,10 @@ ---- data/PostSession.in.orig 2022-03-21 18:12:40 UTC +--- data/PostSession.in.orig 2022-03-27 19:50:55 UTC +++ data/PostSession.in -@@ -1,3 +1,11 @@ +@@ -1,3 +1,7 @@ #!/bin/sh -+# /usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/etc/X11/xenodm/TakeConsole, fbtab(5) -+if [ -c /dev/dri/card0 ]; then -+ /usr/sbin/chown root /dev/dri/card0 -+fi -+if [ -c /dev/dri/renderD128 ]; then -+ /usr/sbin/chown root /dev/dri/renderD128 -+fi ++# XXX: I hate this "solution", but we need to manually restart gdm here ++# otherwise we reach the console when we logout ++/usr/sbin/service gdm restart + exit 0 diff --git a/x11/gdm/files/patch-data_PreSession.in b/x11/gdm/files/patch-data_PreSession.in deleted file mode 100644 index 31abf42f57d9..000000000000 --- a/x11/gdm/files/patch-data_PreSession.in +++ /dev/null @@ -1,14 +0,0 @@ ---- data/PreSession.in.orig 2022-03-21 18:12:40 UTC -+++ data/PreSession.in -@@ -7,3 +7,11 @@ PATH="@X_PATH@:$PATH" - # Note that output goes into the .xsession-errors file for easy debugging - # - PATH="@X_PATH@:$PATH" -+ -+# /usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/usr/local/etc/X11/xenodm/GiveConsole, fbtab(5) -+if [ -c /dev/dri/card0 ]; then -+ /usr/sbin/chown $USER /dev/dri/card0 -+fi -+if [ -c /dev/dri/renderD128 ]; then -+ /usr/sbin/chown $USER /dev/dri/renderD128 -+fi