commit:     3e7e44cfb81235e8f92c5eccf1b57c1666e5402a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 28 19:56:45 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 20:32:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e7e44cf

kde-plasma/kwin: Backport more 5.27.4 fixes

Aleix Pol (1):
      dpms: Make sure we are not calling the interface after the output is gone

Nate Graham (1):
      Revert "backends/libinput: don't multiply v120 value by scroll speed"

Xaver Hugl (1):
      workspace: prevent dangling pointers in output order list

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=466346
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=464592

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

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

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index e67eda4d7534..8f1cdc376698 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,3 +1,4 @@
 DIST kwin-5.26.5.tar.xz 6658216 BLAKE2B 
8e49136fb1b38a6fad3ef6f71f130236e121f54e98519133e615a83dad9a6fe620e279d6e769d70aff393b07c541bb70779eb974bf0c1dacb29e61e3b1ac69f0
 SHA512 
ef374b18fdedbb5322e0abba9f5dcd023391d96c7564c22e3a73a8fc030ef682f892f68fc618175da17527ec5fbd786e0efb452f5e52f29ffb1237eee912b5d8
 DIST kwin-5.27.3-patchset-2.tar.xz 10352 BLAKE2B 
344f6b5dee94eda6a76f713c8f7f00c75fb52a5dc52cc48de64ac5b1e7a3e32ab5fccc51809d3517b10279079286272f9badeb0e5d802764ce653fd6d24da699
 SHA512 
6340dd788c0dedb3dc7a9c3d4b3099179839f80c9078c7b9d5bbfaaa4a4d480df46bc461e606a7d8dde6a3a58a444cf45a1110b917860386a3c70fd9dba5c11d
+DIST kwin-5.27.3-patchset-3.tar.xz 11688 BLAKE2B 
b326ab38b4e8ddb39a32a2932c07d9ebb8ed310ee2f2ead28deccc7190ed769d25f0427d7387433aa7711ac2d539e1230c473e1eba47aa94393cf8103bf4ea5d
 SHA512 
c115582b2163da7db2c4b3763c9193c10f3d32c4d0514adb93aaa1d4e2b18347582e20acabacc1c981feb593f6fe00d0553c737ca84b8828562f170b8bd51750
 DIST kwin-5.27.3.tar.xz 7609424 BLAKE2B 
53f53cd92c7d90b269b6bc4b816b0750b6976cb81fe1899fd29ec859593080bfcee2b0b43fb0f2379f3b3ee0717e7f48f94f68a1880f3cf9fcbb1fe94c4a87bd
 SHA512 
2a259bcd8bfc1bbc0b42fec9e58553560919681b95e5b6e03408e7ea046e63c9b527c85fbdf4dcdd5df82df8e4b2e6e1654c84c243c1f2564aaa593f2d970476

diff --git a/kde-plasma/kwin/kwin-5.27.3-r3.ebuild 
b/kde-plasma/kwin/kwin-5.27.3-r3.ebuild
new file mode 100644
index 000000000000..67c9ab964774
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.27.3-r3.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.102.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.7
+VIRTUALX_REQUIRED="test"
+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-3.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"
+
+PATCHES=( "${WORKDIR}/${P}-patchset-3" ) # KDE-bugs 465790, 465775, 465740, 
466346, 464592
+
+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