Date: Mon, 8 Nov 2021 17:39:31 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 03033c16bb99 - main - x11-wm/plasma5-kwin: unbreak Xwayland support after 4ea20bee5063 Message-ID: <202111081739.1A8HdVNh042420@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=03033c16bb99787ae83ea1a938550adfc1a6660a commit 03033c16bb99787ae83ea1a938550adfc1a6660a Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-11-02 15:32:37 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-11-08 17:33:08 +0000 x11-wm/plasma5-kwin: unbreak Xwayland support after 4ea20bee5063 kwin_xwl: Failed to find free X11 connection socket PR: 259614 Approved by: tcberner --- x11-wm/plasma5-kwin/Makefile | 1 + .../files/patch-src_xwl_lib_xwaylandsocket.cpp | 35 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/x11-wm/plasma5-kwin/Makefile b/x11-wm/plasma5-kwin/Makefile index 0a9def8ca3e0..706dac5a37cc 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_lib_xwaylandsocket.cpp b/x11-wm/plasma5-kwin/files/patch-src_xwl_lib_xwaylandsocket.cpp new file mode 100644 index 000000000000..8dcb2c966e48 --- /dev/null +++ b/x11-wm/plasma5-kwin/files/patch-src_xwl_lib_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/lib/xwaylandsocket.cpp.orig 2021-10-26 12:27:37 UTC ++++ src/xwl/lib/xwaylandsocket.cpp +@@ -183,10 +183,17 @@ XwaylandSocket::XwaylandSocket(OperationMode mode) + continue; + } + ++#if defined(Q_OS_LINUX) + const int abstractFileDescriptor = listen_helper(socketFilePath, UnixSocketAddress::Type::Abstract, mode); ++#else ++ const int abstractFileDescriptor = listen_helper(socketFilePath + "_", UnixSocketAddress::Type::Unix, mode); ++#endif + if (abstractFileDescriptor == -1) { + QFile::remove(lockFilePath); + QFile::remove(socketFilePath); ++#if !defined(Q_OS_LINUX) ++ QFile::remove(socketFilePath + "_"); ++#endif + close(unixFileDescriptor); + continue; + } +@@ -212,6 +219,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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111081739.1A8HdVNh042420>