From nobody Sun Aug 13 18:23:39 2023 X-Original-To: dev-commits-ports-all@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 4RP5Wb2nkmz4mWKQ; Sun, 13 Aug 2023 18:23:39 +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 4RP5Wb27nHz3Hlt; Sun, 13 Aug 2023 18:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691951019; 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=5ANQvN/OHtVkTHj/cBpQxk6HudicIsJ56lBpW2vtJaA=; b=mkXnIb+eM6Gjp79BkpswjvECKQTcop9CX4zB6exnEgtgvWfHXiF8+tZpyDzvwbRBDtpTAr hwqaH04FTAypWm4t93Bb73qtU5ZfoqUblWuhezVNkJPEK1+UEo3YmLD2sY7xUyb//VEXbx 2olp2SM7jXLEqt9B867pcfmP0zV4CFMNBdQ6bU1ORe0OFrsjZgquwZVz6ytB0SMMgE6nQ8 XvW3V5k6KF9Vi7cQlbiAxmWvNbdRo2+WrEC42D+H3r30YXQFi6YGneOf2+Rm0APrJ7GvGG GjxKi7Zo3h8UivU1FSIkaGEj1KsI6KOhM8EA7rz5ofHHvrb4x77uQzUwWH/Raw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691951019; 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=5ANQvN/OHtVkTHj/cBpQxk6HudicIsJ56lBpW2vtJaA=; b=Zpuxyzmyfbawrvq47NfhJdq3y6KZiae7IRtIepE4znToqYXovHAv+zItZwcP7bIqhz+sEI oiXvMUvinlN2YZsETyYBJ9Fb5KbCEWhT8teufYHQMqmE1nIJR1/dW7OTC9vJcwqoox3SkD 9lwsx39az8BjUkgvWlk/efjKe1tz3HCOCQFMgQDCVkA+tU9zs+AwV28BRD7M/Xl1PDxnie pQ5+LwbpA91PHTujdefHvfd0x1JBKyUnH1+qVR6GDp2uhWVXtsRWbWNewDXV9kZGOPCk8k jHU9RbvcCa1U6yvu/IYD65iGYXwRnjb87gEBFIxbRNH5TOlszrc54uFVLsYeXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691951019; a=rsa-sha256; cv=none; b=cRzogRXJd+7REFsya6/zgeNN5hzdhuyUIsk4JBF4ZLkhFppvyuNi1im5+mFBDezMN3tA0d ZZzZWxLujxHTmkw3AXQfg9TkRtXb9aIZ3BtJC9K+wDY84lEjiw1UU4ChLPv5PawF2Y1Z8D Yms4IL/ykBufIuT70pk923PLh17G8HmYeKevtER6HC6ZRwSeDzkqka+WgDXIJiQTpzK/Ya eKBJ5viVL7s4WRu8UqRHvA1f0gkee0zzDiv25CAVA8bd4zc58YJ2N1rc/NaMgPySd96Zx5 nF1GPwyNes9Bu7TdimxdwkcQ91tLj/9V0BIBqDRxLuorz83J+v750F/984C17w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RP5Wb1CFqz1C5S; Sun, 13 Aug 2023 18:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37DINdSC018121; Sun, 13 Aug 2023 18:23:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37DINdeo018118; Sun, 13 Aug 2023 18:23:39 GMT (envelope-from git) Date: Sun, 13 Aug 2023 18:23:39 GMT Message-Id: <202308131823.37DINdeo018118@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 6553c93b0a7a - main - x11/sddm: Restore a patch for the Xsession script. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6553c93b0a7ae9491f9af84f63d3115cfa265bc5 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=6553c93b0a7ae9491f9af84f63d3115cfa265bc5 commit 6553c93b0a7ae9491f9af84f63d3115cfa265bc5 Author: Gleb Popov AuthorDate: 2023-08-13 13:19:17 +0000 Commit: Gleb Popov CommitDate: 2023-08-13 18:23:35 +0000 x11/sddm: Restore a patch for the Xsession script. Make it start D-Bus and ConsoleKit again. PR: 272637 Sponsored by: Serenity Cybersecurity, LLC --- x11/sddm/Makefile | 6 ++++-- x11/sddm/files/patch-data_scripts_Xsession | 12 ++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/x11/sddm/Makefile b/x11/sddm/Makefile index 25556e3135bb..f2563817f87c 100644 --- a/x11/sddm/Makefile +++ b/x11/sddm/Makefile @@ -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 diff --git a/x11/sddm/files/patch-data_scripts_Xsession b/x11/sddm/files/patch-data_scripts_Xsession new file mode 100644 index 000000000000..6c4b40a5cc37 --- /dev/null +++ b/x11/sddm/files/patch-data_scripts_Xsession @@ -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