commit:     cddafb8749214e62e42a65ea60f66e7edd0ec394
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 14:55:40 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 15:07:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cddafb87

kde-plasma/kwin: Various 5.27.8 backports

Including regression fix for previous patchset.

Xaver Hugl (2):
      backends/drm: don't assume we never get new subpixel types
      input: add special handling for tabbox modifiers

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=472340
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=473099

Bug: https://bugs.gentoo.org/911788
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/kwin/Manifest              |   1 +
 kde-plasma/kwin/kwin-5.27.7-r2.ebuild | 142 ++++++++++++++++++++++++++++++++++
 2 files changed, 143 insertions(+)

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index ca2a5f5075ef..db802e67ec5c 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,3 +1,4 @@
 DIST kwin-5.27.6.tar.xz 7623016 BLAKE2B 
0b16b3bffa1407351a69373e248a77d10932d30fc8fb2cfb527078cfcefff4d559a56bbbedaf3b3c082d576da6f3985f5681c8376daf0d72fca5a6bed8e14625
 SHA512 
86fd279ce9e82bc41fe5f0cc5f348ec97aaa9589d16cc6b99adf9c27b8cba8a67191be764d4c5e48a042368ef202d78397f756db4efd26ea822584293fdc730b
 DIST kwin-5.27.7-patchset-1.tar.xz 1660 BLAKE2B 
f3bb353c2d2b75fdf7661235790faf01fac09c871ea001878ad993f13f9547aeec8f574a4119feca19e52839918fe26f3ac4bb06e916e5493346cc765e6e083c
 SHA512 
20de2a81f5a26954d186bb7896b70a61f18e23749d1554ca3e4da304d48862bbbc9ac7e59f28882e1f7b13bb82258832ed6c9f71bf2581c473b788256f643154
+DIST kwin-5.27.7-patchset-2.tar.xz 3120 BLAKE2B 
347cb6e497d77a1a75cc00b1cccea075b478b07b69a177b6dab74b3ff0daab5de5b17ef3f059a03212e1180dfab05068fd16b68374c1d5316f655e8b75b130a1
 SHA512 
a18c3b9ed363384179c5b06c5a427a98aa4d78e9df8b08c2c3e418d64db403fa6a2fa0df4bcf3d25fce49f2f81dba14b2349fc42e1123ec6513ab9dd4c524df0
 DIST kwin-5.27.7.tar.xz 7626216 BLAKE2B 
7cf25b3da5c5c9fd76369efd34d16189d4f5e7e2b16d867184e19957b9cacba0ce61d9ba0465e20621c93ca715e348ce03b13d52ecc7b7d5770e1c12c46a2950
 SHA512 
0f9f24d6296fdf7f7ab143ef38f69fb34aa0abbb39a24edebf4a59c1730ce5ccfebebbc1838c2e8eb94db11f8a7c30b6d4dfe2fd1848b9d938781256f555bf7e

diff --git a/kde-plasma/kwin/kwin-5.27.7-r2.ebuild 
b/kde-plasma/kwin/kwin-5.27.7-r2.ebuild
new file mode 100644
index 000000000000..bb2dd7fcb1a2
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.27.7-r2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.106.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.9
+inherit ecm plasma.kde.org optfeature
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on 
Linux"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-2.tar.xz";
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="accessibility caps gles2-only lock multimedia plasma screencast"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+       >=dev-libs/libinput-1.19
+       >=dev-libs/wayland-1.21.0
+       >=dev-qt/qtconcurrent-${QTMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5=[egl,gles2-only=,libinput]
+       >=dev-qt/qtwayland-${QTMIN}:5
+       >=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/kconfig-${KFMIN}:5[qml]
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kcrash-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/kglobalaccel-${KFMIN}:5=[X]
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kidletime-${KFMIN}:5=
+       >=kde-frameworks/kitemviews-${KFMIN}:5
+       >=kde-frameworks/knewstuff-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/kpackage-${KFMIN}:5
+       >=kde-frameworks/kservice-${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
+       media-libs/fontconfig
+       media-libs/freetype
+       media-libs/lcms:2
+       media-libs/libepoxy
+       media-libs/libglvnd
+       >=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X]
+       virtual/libudev:=
+       x11-libs/libX11
+       x11-libs/libXi
+       >=x11-libs/libdrm-2.4.112
+       >=x11-libs/libxcb-1.10
+       >=x11-libs/libxcvt-0.1.1
+       >=x11-libs/libxkbcommon-1.5.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] )
+       lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:5 )
+       plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
+       screencast? ( >=media-video/pipewire-0.3:= )
+"
+RDEPEND="${COMMON_DEPEND}
+       !kde-plasma/kwayland-server
+       >=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]
+       sys-apps/hwdata
+       x11-base/xwayland
+       multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
+"
+DEPEND="${COMMON_DEPEND}
+       >=dev-libs/plasma-wayland-protocols-1.9
+       >=dev-libs/wayland-protocols-1.31
+       >=dev-qt/designer-${QTMIN}:5
+       >=dev-qt/qtconcurrent-${QTMIN}:5
+       x11-base/xorg-proto
+"
+BDEPEND="
+       >=dev-qt/qtwaylandscanner-${QTMIN}:5
+       dev-util/wayland-scanner
+       >=kde-frameworks/kcmutils-${KFMIN}:5
+"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+
+# KDE-bugs 453918, 461657, 472340, 472922, 473099
+PATCHES=( "${WORKDIR}/${P}-patchset-2" )
+
+src_prepare() {
+       ecm_src_prepare
+       use multimedia || eapply 
"${FILESDIR}/${PN}-5.26.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=(
+               # KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still 
hard-depends on it
+               $(cmake_use_find_package accessibility QAccessibilityClient)
+               $(cmake_use_find_package caps Libcap)
+               -DKWIN_BUILD_SCREENLOCKER=$(usex lock)
+               $(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\""
+}

Reply via email to