cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge the recent changes from GiveConsole/TakeConsole.

Browse Source
This commit is contained in:
ajacoutot 2019-05-12 21:28:50 +00:00
parent d009a872de
commit 4629b1f0d0
6 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/gnome/gdm/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.277 2019/05/08 21:32:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.278 2019/05/12 21:28:50 ajacoutot Exp $
COMMENT= GNOME display manager
GNOME_PROJECT= gdm
GNOME_VERSION= 3.32.0
REVISION= 0
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} puflogh1000X248.gif:0
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}

3
x11/gnome/gdm/patches/patch-common_gdm-address_c
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-common_gdm-address_c,v 1.1 2011/09/12 07:39:21 ajacoutot Exp $
$OpenBSD: patch-common_gdm-address_c,v 1.2 2019/05/12 21:28:50 ajacoutot Exp $
--- common/gdm-address.c.orig Thu Jun 16 15:24:47 2011
+++ common/gdm-address.c Thu Jun 16 15:25:19 2011
@@ -29,6 +29,8 @@

8
x11/gnome/gdm/patches/patch-data_Init_in
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-data_Init_in,v 1.9 2018/03/22 16:51:08 ajacoutot Exp $
$OpenBSD: patch-data_Init_in,v 1.10 2019/05/12 21:28:50 ajacoutot Exp $
Index: data/Init.in
--- data/Init.in.orig
+++ data/Init.in
@ -18,7 +19,7 @@ Index: data/Init.in
gdmwhich () {
COMMAND="$1"
OUTPUT=
@@ -85,5 +94,12 @@ if [ "x$SETXKBMAP" != "x" ] ; then
@@ -85,5 +94,15 @@ if [ "x$SETXKBMAP" != "x" ] ; then
fi
fi
fi
@ -27,6 +28,9 @@ Index: data/Init.in
+if [ -c /dev/drm0 ]; then
+ /sbin/chown _gdm /dev/drm0
+fi
+if [ -c /dev/drmR128 ]; then
+ /sbin/chown _gdm /dev/drmR128
+fi
+# XXX OpenBSD needs an implementation of XDG_RUNTIME_DIR
+rm -rf /var/db/gdm/.cache/gnome-shell/runtime-state-*

13
x11/gnome/gdm/patches/patch-data_PostSession_in
View File

@ -1,12 +1,17 @@
$OpenBSD: patch-data_PostSession_in,v 1.4 2017/04/16 12:43:20 ajacoutot Exp $
--- data/PostSession.in.orig Thu Dec 26 16:30:16 2013
+++ data/PostSession.in Thu Dec 26 16:31:15 2013
@@ -1,3 +1,8 @@
$OpenBSD: patch-data_PostSession_in,v 1.5 2019/05/12 21:28:50 ajacoutot Exp $
Index: data/PostSession.in
--- data/PostSession.in.orig
+++ data/PostSession.in
@@ -1,3 +1,11 @@
#!/bin/sh
+# /etc/X11/xenodm/TakeConsole, fbtab(5)
+if [ -c /dev/drm0 ]; then
+ /sbin/chown root /dev/drm0
+fi
+if [ -c /dev/drmR128 ]; then
+ /sbin/chown root /dev/drmR128
+fi
+
exit 0

13
x11/gnome/gdm/patches/patch-data_PreSession_in
View File

@ -1,7 +1,9 @@
$OpenBSD: patch-data_PreSession_in,v 1.6 2017/04/16 12:43:20 ajacoutot Exp $
--- data/PreSession.in.orig Thu Dec 26 16:04:18 2013
+++ data/PreSession.in Thu Dec 26 16:09:50 2013
@@ -7,3 +7,8 @@
$OpenBSD: patch-data_PreSession_in,v 1.7 2019/05/12 21:28:50 ajacoutot Exp $
Index: data/PreSession.in
--- data/PreSession.in.orig
+++ data/PreSession.in
@@ -7,3 +7,11 @@
# Note that output goes into the .xsession-errors file for easy debugging
#
PATH="@X_PATH@:$PATH"
@ -10,3 +12,6 @@ $OpenBSD: patch-data_PreSession_in,v 1.6 2017/04/16 12:43:20 ajacoutot Exp $
+if [ -c /dev/drm0 ]; then
+ /sbin/chown $USER /dev/drm0
+fi
+if [ -c /dev/drmR128 ]; then
+ /sbin/chown $USER /dev/drmR128
+fi

5
x11/gnome/gdm/pkg/gdm.rc
View File

@ -1,6 +1,6 @@
#!/bin/ksh
#
# $OpenBSD: gdm.rc,v 1.43 2018/01/14 14:42:18 rpe Exp $
# $OpenBSD: gdm.rc,v 1.44 2019/05/12 21:28:50 ajacoutot Exp $
daemon="${TRUEPREFIX}/sbin/gdm"
@ -27,6 +27,9 @@ rc_post() {
if [[ -c /dev/drm0 ]]; then
chown root /dev/drm0
fi
if [[ -c /dev/drmR128 ]]; then
chown root /dev/drmR128
fi
# XXX OpenBSD needs an implementation of XDG_RUNTIME_DIR
rm -rf /var/db/gdm/.cache/gnome-shell/runtime-state-*
}