commit: d8a6ce0f6db9297cb47efccfe21555e9706e424c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Nov 15 14:13:15 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Nov 23 14:59:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8a6ce0f
kde-plasma/kwin: Fix XWayland abstract socket address Upstream commit 5a9a3e96898bd29ccbf31d9ff92dfb80274ce265 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=442362 Reported-by: Benn Snyder <benn.snyder <AT> gmail.com> Bug: https://bugs.gentoo.org/813888 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...-5.23.3-fix-xwayland-abstract-socket-addr.patch | 49 ++++++++ kde-plasma/kwin/kwin-5.23.3-r1.ebuild | 138 +++++++++++++++++++++ 2 files changed, 187 insertions(+) diff --git a/kde-plasma/kwin/files/kwin-5.23.3-fix-xwayland-abstract-socket-addr.patch b/kde-plasma/kwin/files/kwin-5.23.3-fix-xwayland-abstract-socket-addr.patch new file mode 100644 index 000000000000..7cd8d135ab28 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.23.3-fix-xwayland-abstract-socket-addr.patch @@ -0,0 +1,49 @@ +From 5a9a3e96898bd29ccbf31d9ff92dfb80274ce265 Mon Sep 17 00:00:00 2001 +From: Weng Xuetian <[email protected]> +Date: Thu, 11 Nov 2021 12:25:13 -0800 +Subject: [PATCH] Fix XWayland abstract socket address. + +NUL-termination byte is not needed for abstract socket. This leads to +XWayland listening to a wrong address. + +Confirmed with lsof. + +BUG: 442362 + + +(cherry picked from commit 83a036e9d40475d5c07177bf2e8bba9bc0fd4aa5) +--- + src/xwl/lib/xwaylandsocket.cpp | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/src/xwl/lib/xwaylandsocket.cpp b/src/xwl/lib/xwaylandsocket.cpp +index 786ab5cbbf..7cf9310584 100644 +--- a/src/xwl/lib/xwaylandsocket.cpp ++++ b/src/xwl/lib/xwaylandsocket.cpp +@@ -42,19 +42,18 @@ UnixSocketAddress::UnixSocketAddress(const QString &socketPath, Type type) + const QByteArray encodedSocketPath = QFile::encodeName(socketPath); + + int byteCount = offsetof(sockaddr_un, sun_path) + encodedSocketPath.size() + 1; +- if (type == Type::Abstract) { +- byteCount++; // For the first '\0'. +- } + m_buffer.resize(byteCount); + + sockaddr_un *address = reinterpret_cast<sockaddr_un *>(m_buffer.data()); + address->sun_family = AF_UNIX; + + if (type == Type::Unix) { +- qstrcpy(address->sun_path, encodedSocketPath); ++ memcpy(address->sun_path, encodedSocketPath.data(), encodedSocketPath.size()); ++ address->sun_path[encodedSocketPath.size()] = '\0'; + } else { ++ // Abstract domain socket does not need the NUL-termination byte. + *address->sun_path = '\0'; +- qstrcpy(address->sun_path + 1, encodedSocketPath); ++ memcpy(address->sun_path + 1, encodedSocketPath.data(), encodedSocketPath.size()); + } + } + +-- +GitLab + diff --git a/kde-plasma/kwin/kwin-5.23.3-r1.ebuild b/kde-plasma/kwin/kwin-5.23.3-r1.ebuild new file mode 100644 index 000000000000..cf0d965820df --- /dev/null +++ b/kde-plasma/kwin/kwin-5.23.3-r1.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="optional" +KFMIN=5.86.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org optfeature + +DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux" + +LICENSE="GPL-2+" +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="accessibility caps gles2-only multimedia plasma screencast" + +RESTRICT="test" + +COMMON_DEPEND=" + >=dev-libs/libinput-1.14 + >=dev-libs/wayland-1.2 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kactivities-${KFMIN}:5 + >=kde-frameworks/kauth-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5= + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kidletime-${KFMIN}:5= + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kpackage-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwayland-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5=[X] + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/breeze-${PVCUT}:5 + >=kde-plasma/kdecoration-${PVCUT}:5 + >=kde-plasma/kscreenlocker-${PVCUT}:5 + >=kde-plasma/kwayland-server-${PVCUT}:5 + media-libs/fontconfig + media-libs/freetype + media-libs/lcms:2 + media-libs/libepoxy + >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] + virtual/libudev:= + x11-libs/libX11 + x11-libs/libXi + x11-libs/libdrm + >=x11-libs/libxcb-1.10 + >=x11-libs/libxkbcommon-0.7.0 + x11-libs/xcb-util-cursor + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-wm + accessibility? ( media-libs/libqaccessibilityclient:5 ) + caps? ( sys-libs/libcap ) + gles2-only? ( media-libs/mesa[gles2] ) + plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 ) + screencast? ( >=media-video/pipewire-0.3:= ) +" +# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216 +RDEPEND="${COMMON_DEPEND} + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtvirtualkeyboard-${QTMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] + || ( + x11-base/xwayland + x11-base/xorg-server[wayland(-)] + ) + multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] ) +" +DEPEND="${COMMON_DEPEND} + >=dev-qt/designer-${QTMIN}:5 + >=dev-qt/qtconcurrent-${QTMIN}:5 + x11-base/xorg-proto + test? ( + >=dev-libs/wayland-protocols-1.19 + >=dev-qt/qtwayland-${QTMIN}:5 + ) +" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" + +PATCHES=( + "${FILESDIR}/${P}-fix-xwayland-abstract-socket-addr.patch" # KDE-bug 442362, bug 813888 +) + +src_prepare() { + ecm_src_prepare + use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch" + + # TODO: try to get a build switch upstreamed + if ! use screencast; then + sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package accessibility QAccessibilityClient) + $(cmake_use_find_package caps Libcap) + $(cmake_use_find_package plasma KF5Runner) + ) + + ecm_src_configure +} + +pkg_postinst() { + ecm_pkg_postinst + optfeature "color management support" x11-misc/colord + elog + elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised" + elog "windows to the end of the list was changed so that it remains in the" + elog "original order. To revert to the well established behavior:" + elog + elog " - Edit ~/.config/kwinrc" + elog " - Find [TabBox] section" + elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\"" +}
