gentoo auto-resync : 20:09:2023 - 17:12:31

6 files changed, 226 insertions, 1 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 559573a1fa21..b8d317223ea9 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index b8bef8ba7341..d3678be59c57 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,7 +1,10 @@
 AUX kwin-5.26.80-gstreamer-optional.patch 948 BLAKE2B 880e77ce6462c115953471dfd4985cc4891a05a910323c1760e01870f04a6930d6d4680811701e12094f1bc3eabbba6b097535408b9148dea4beca31496c7e35 SHA512 66e839c7d603873d675b96430ae48d89366a7f1c5019686c9471ef4fd66449bc4bc22752856665a5d90ab8e503e40d307c4671ac0c2f2991b869e211f7b46c86
+AUX kwin-5.27.8-cmake.patch 1127 BLAKE2B 74ed8d9295f5fa35da7e531f0e455177a33e24ecc6b73bb8ce825be458ad3d4f115adcd92933e9c88b957be8365bbab8b00431e708d78e6b8e1c8f1c8174cc61 SHA512 f1f0cc8ab5ff7842879b62ab2bd2397c900b82ce10555193ee91fbbeee994474f63d825be797c9ceb83167701d7fa8ae7ee45f1c541ad3eae863cae0b5778a8f
+AUX kwin-5.27.8-crashfix.patch 1294 BLAKE2B 4dd8711a3bd442ad15f1f305087ffccbf146b5635f05df4bbb1a285fd2981a374333856c09ec80a0dcc496005078ce3ebd0e635abf1fcc533d2020aac7cac2b8 SHA512 32d6a1158d88cf78f8a7be15af6f6f737192d49dc87dd4989a9557015b341acd3e96a35de7442d43c748d544ac72ef5703b55120415dfd71d8e7617ca9aba253
 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
 DIST kwin-5.27.8.tar.xz 7631012 BLAKE2B 75bee4f9e13d231a92785eebd7cffcaa8bee556efbf33a731eaa1918c6c471954bc3d059c13f2e2c5f7cce83610a044c73b798bca54ae9c39fe816ae5013054b SHA512 7947d0bf85cd67b83d79580fa355e5217cd4d356b2daa94aff67c637de38625be9f949d4a1441414ba488426ce85a352c6e81d24afdda4930c7d738d575d5163
 EBUILD kwin-5.27.7-r2.ebuild 4379 BLAKE2B 54046db25a345a0beab0983ff5fd1c75c0da99b2bd20619ef582d44d8dfb8e48d94753ce0239568202633147fd20d99d032e8eb90fc6566e153bc2c334a27018 SHA512 be97d9786d305e8b4c82730707523bcdea5b536df660aa5ed3237b2c31b1689473b07f283cb69087e73c3f1e02d226d100c5d1926d81403cf146319b7eb9af47
-EBUILD kwin-5.27.8-r1.ebuild 4136 BLAKE2B c92fa914722e11eb4098b9763c52de342289b404ed95019475d47c9ca41fa3658fb2518b2f10a21fb83d4b070e4986c7a3499281fa7a312b203b133c7a2f11e0 SHA512 eeef26805ec29d51ead6fe26a7350aadd8dc29e4efdaa1e8ca5c8472906d2018e358678b0a04122c79c4ee63a257095608bf3b4ebfc436aa7bf68539d1898831
+EBUILD kwin-5.27.8-r1.ebuild 4193 BLAKE2B 4d39e468fe63ca70baabdfefdfaf757626ac66409beb8fc3a518317966889a8d96e84e71afccc23a90387d05a1e50ea839db436aa11916473c767c19743ceb8d SHA512 83798698df78edd83331551c9ffe879a7be070762c55e10d90c3791fdef4d4186f7a68f3d609503094a79816ffa35cf65a3a5702221240539cd9a395590d0346
+EBUILD kwin-5.27.8-r2.ebuild 4246 BLAKE2B 4ed14c12dd098d0e277aed578cda35a1cca95b62b49fec121b3c7207d564006fdf234552890237f88feb95372ab68bc653c312949d705948fca919b2a563c6cd SHA512 223cf5fc0872121374eb50591a22775f728f9f23a46e5ef2f62e443241ef28a03de470df784f964392fb3192281da170f71e540da9c4aed7dcf425340d95bda0
 MISC metadata.xml 505 BLAKE2B 41f9200ff14d77161bb0863065be67315f5459fa8232da5f0cf18aacd8abb15f7e858277a59a219e59f777fbd2d2d1f035c941d1a06e459b01935b70921e678d SHA512 19c2af1c8b56be6989b617adc24fc0a8bc33d4913eecf22a4ecef3c1a2cf2994e814655f3a885a75ad17613af1dc41b6babb5e4375a3e217f0cc5842ba969a29
diff --git a/kde-plasma/kwin/files/kwin-5.27.8-cmake.patch b/kde-plasma/kwin/files/kwin-5.27.8-cmake.patch
new file mode 100644
index 000000000000..4c4634140be9
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.27.8-cmake.patch
@@ -0,0 +1,40 @@
+From bd41dd93f37df79c7e14293c26dbff5abe5e4ce4 Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Tue, 21 Mar 2023 20:31:44 +0200
+Subject: [PATCH] Drop unused kitemviews dependency
+
+Seems unused. KWin compiles fine without it.
+
+(cherry picked from commit 2c0acdca11dd25b0a3d5de8125c61d3523e83fbd)
+---
+ CMakeLists.txt                  | 1 -
+ src/kcms/scripts/CMakeLists.txt | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f98937161f..d49f8a9471 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -90,7 +90,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+     NewStuff
+     Service
+     XmlGui
+-    ItemViews
+ )
+ 
+ find_package(Threads)
+diff --git a/src/kcms/scripts/CMakeLists.txt b/src/kcms/scripts/CMakeLists.txt
+index 66966d6d46..fd7a368a97 100644
+--- a/src/kcms/scripts/CMakeLists.txt
++++ b/src/kcms/scripts/CMakeLists.txt
+@@ -18,7 +18,6 @@ target_link_libraries(kcm_kwin_scripts
+     KF5::NewStuffWidgets
+     KF5::Package
+     KF5::QuickAddons
+-    KF5::ItemViews
+ )
+ 
+ kpackage_install_package(package kcm_kwin_scripts kcms)
+-- 
+2.42.0
+
diff --git a/kde-plasma/kwin/files/kwin-5.27.8-crashfix.patch b/kde-plasma/kwin/files/kwin-5.27.8-crashfix.patch
new file mode 100644
index 000000000000..e8d6cca37fee
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.27.8-crashfix.patch
@@ -0,0 +1,39 @@
+From f099b206b6d8cffee1b410a51e540d3750c4a0af Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Tue, 12 Sep 2023 16:23:15 +0200
+Subject: [PATCH] backends/drm: check activePending instead of active for when
+ applying a new gamma ramp is allowed
+
+The crtc may not be set yet in some cases
+
+BUG: 471562
+(cherry picked from commit 57fae99f33aa5d092ebb82e9924fbd7fbb932fc7)
+---
+ src/backends/drm/drm_output.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/backends/drm/drm_output.cpp b/src/backends/drm/drm_output.cpp
+index 558de1f7c4b..c55c4c1832f 100644
+--- a/src/backends/drm/drm_output.cpp
++++ b/src/backends/drm/drm_output.cpp
+@@ -466,7 +466,7 @@ DrmOutputLayer *DrmOutput::primaryLayer() const
+ 
+ bool DrmOutput::setGammaRamp(const std::shared_ptr<ColorTransformation> &transformation)
+ {
+-    if (!m_pipeline->active()) {
++    if (!m_pipeline->activePending()) {
+         return false;
+     }
+     m_pipeline->setGammaRamp(transformation);
+@@ -483,7 +483,7 @@ bool DrmOutput::setGammaRamp(const std::shared_ptr<ColorTransformation> &transfo
+ 
+ bool DrmOutput::setCTM(const QMatrix3x3 &ctm)
+ {
+-    if (!m_pipeline->active()) {
++    if (!m_pipeline->activePending()) {
+         return false;
+     }
+     m_pipeline->setCTM(ctm);
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/kwin-5.27.8-r1.ebuild b/kde-plasma/kwin/kwin-5.27.8-r1.ebuild
index 987500c11e15..9a17232d63c3 100644
--- a/kde-plasma/kwin/kwin-5.27.8-r1.ebuild
+++ b/kde-plasma/kwin/kwin-5.27.8-r1.ebuild
@@ -100,6 +100,8 @@ BDEPEND="
 "
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug 914143
+
 src_prepare() {
 	ecm_src_prepare
 	use multimedia || eapply "${FILESDIR}/${PN}-5.26.80-gstreamer-optional.patch"
diff --git a/kde-plasma/kwin/kwin-5.27.8-r2.ebuild b/kde-plasma/kwin/kwin-5.27.8-r2.ebuild
new file mode 100644
index 000000000000..8afa7812f381
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.27.8-r2.ebuild
@@ -0,0 +1,141 @@
+# 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"
+
+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/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[egl,gles2-only=,libinput]
+	>=dev-qt/qtnetwork-${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/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-keysyms
+	x11-libs/xcb-util-wm
+	accessibility? ( media-libs/libqaccessibilityclient:5 )
+	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
+	>=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
+	>=dev-qt/qtwayland-${QTMIN}:5
+	x11-base/xorg-proto
+	x11-libs/xcb-util-image
+	caps? ( sys-libs/libcap )
+"
+BDEPEND="
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
+	dev-util/wayland-scanner
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch" # bug 914143
+	"${FILESDIR}/${P}-crashfix.patch" # KDE-bug 471562
+)
+
+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\""
+}