1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00

x11/sddm: Restore a patch for the Xsession script.

Make it start D-Bus and ConsoleKit again.

PR:		272637
Sponsored by:	Serenity Cybersecurity, LLC
This commit is contained in:
Gleb Popov 2023-08-13 16:19:17 +03:00
parent 3f0d6e0663
commit 6553c93b0a
2 changed files with 16 additions and 2 deletions

View File

@ -1,6 +1,6 @@
PORTNAME= sddm
PORTVERSION= 0.20.0
PORTREVISION= 1
PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= x11
@ -18,7 +18,8 @@ LICENSE_FILE_GPLv2+ = ${WRKSRC}/LICENSE
LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LICENSE.CC-BY-3.0
BUILD_DEPENDS= rst2man.py-${PYTHON_VER}:textproc/py-docutils@${PY_FLAVOR}
RUN_DEPENDS= dbus-run-session:devel/dbus \
RUN_DEPENDS= consolekit2>1.2.5:sysutils/consolekit2 \
dbus-launch:devel/dbus \
xauth:x11/xauth \
xmessage:x11/xmessage
@ -51,6 +52,7 @@ post-patch:
@${REINPLACE_CMD} -e 's#/etc/X11#${LOCALBASE}/etc/X11#' \
-e 's#/usr/bin/#${LOCALBASE}/bin/#g' \
-e 's#/usr/share/#${LOCALBASE}/share/#' \
-e 's#%%LOCALBASE%%#${LOCALBASE}#g' \
${WRKSRC}/data/scripts/Xsession \
${WRKSRC}/src/common/Configuration.h

View File

@ -0,0 +1,12 @@
Start a session D-Bus before anything else.
Then register ourselves with ConsoleKit via $STARTUP
--- data/scripts/Xsession.orig 2023-06-23 12:28:38 UTC
+++ data/scripts/Xsession
@@ -90,5 +90,5 @@ else
if [ -z "$*" ]; then
exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
else
- exec $@
+ exec %%LOCALBASE%%/bin/dbus-launch --exit-with-x11 -- $STARTUP "$@"
fi