From nobody Mon Nov 08 17:53:24 2021 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 D70DA18436F3; Mon, 8 Nov 2021 17:53:24 +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 4HnzHS5hVYz4tbF; Mon, 8 Nov 2021 17:53:24 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A2962161B6; Mon, 8 Nov 2021 17:53:24 +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 1A8HrO20068794; Mon, 8 Nov 2021 17:53:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A8HrOi1068793; Mon, 8 Nov 2021 17:53:24 GMT (envelope-from git) Date: Mon, 8 Nov 2021 17:53:24 GMT Message-Id: <202111081753.1A8HrOi1068793@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: a11f9c00e714 - 2021Q4 - x11-wm/plasma5-kwin: unbreak Xwayland support after 4ea20bee5063 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: a11f9c00e714212a48009593bb5c71c62dd47515 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=a11f9c00e714212a48009593bb5c71c62dd47515 commit a11f9c00e714212a48009593bb5c71c62dd47515 Author: Jan Beich AuthorDate: 2021-11-02 15:32:37 +0000 Commit: Jan Beich CommitDate: 2021-11-08 17:35:36 +0000 x11-wm/plasma5-kwin: unbreak Xwayland support after 4ea20bee5063 kwin_xwl: Failed to find free X11 connection socket PR: 259614 Approved by: tcberner (cherry picked from commit 03033c16bb99787ae83ea1a938550adfc1a6660a) --- x11-wm/plasma5-kwin/Makefile | 1 + .../files/patch-src_xwl_xwaylandsocket.cpp | 35 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/x11-wm/plasma5-kwin/Makefile b/x11-wm/plasma5-kwin/Makefile index 53230df60d29..64a87653bc99 100644 --- a/x11-wm/plasma5-kwin/Makefile +++ b/x11-wm/plasma5-kwin/Makefile @@ -1,5 +1,6 @@ PORTNAME= kwin DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= x11-wm kde kde-plasma MAINTAINER= kde@FreeBSD.org diff --git a/x11-wm/plasma5-kwin/files/patch-src_xwl_xwaylandsocket.cpp b/x11-wm/plasma5-kwin/files/patch-src_xwl_xwaylandsocket.cpp new file mode 100644 index 000000000000..ad44c2215dca --- /dev/null +++ b/x11-wm/plasma5-kwin/files/patch-src_xwl_xwaylandsocket.cpp @@ -0,0 +1,35 @@ +$ kwin_wayland --xwayland +[...] +kwin_xwl: Failed to find free X11 connection socket +Failed to establish X11 socket + +--- src/xwl/xwaylandsocket.cpp.orig 2021-08-31 11:41:03 UTC ++++ src/xwl/xwaylandsocket.cpp +@@ -179,10 +179,17 @@ XwaylandSocket::XwaylandSocket() + continue; + } + ++#if defined(Q_OS_LINUX) + const int abstractFileDescriptor = listen_helper(socketFilePath, UnixSocketAddress::Type::Abstract); ++#else ++ const int abstractFileDescriptor = listen_helper(socketFilePath + "_", UnixSocketAddress::Type::Unix); ++#endif + if (abstractFileDescriptor == -1) { + QFile::remove(lockFilePath); + QFile::remove(socketFilePath); ++#if !defined(Q_OS_LINUX) ++ QFile::remove(socketFilePath + "_"); ++#endif + close(unixFileDescriptor); + continue; + } +@@ -208,6 +215,9 @@ XwaylandSocket::~XwaylandSocket() + } + if (!m_socketFilePath.isEmpty()) { + QFile::remove(m_socketFilePath); ++#if !defined(Q_OS_LINUX) ++ QFile::remove(m_socketFilePath + "_"); ++#endif + } + if (!m_lockFilePath.isEmpty()) { + QFile::remove(m_lockFilePath);