Skip to content

Commit

Permalink
x11/sddm: Restore a patch for the Xsession script.
Browse files Browse the repository at this point in the history
Make it start D-Bus and ConsoleKit again.

PR:		272637
Sponsored by:	Serenity Cybersecurity, LLC
  • Loading branch information
arrowd committed Aug 13, 2023
1 parent 3f0d6e0 commit 6553c93
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
6 changes: 4 additions & 2 deletions x11/sddm/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PORTNAME= sddm
PORTVERSION= 0.20.0
PORTREVISION= 1
PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= x11

Expand All @@ -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

Expand Down Expand Up @@ -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

Expand Down
12 changes: 12 additions & 0 deletions x11/sddm/files/patch-data_scripts_Xsession
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 6553c93

Please sign in to comment.