gentoo auto-resync : 10:05:2023 - 17:43:52

4 files changed, 36 insertions, 141 deletions

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index d798ee6491dd..3875cdad6507 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,8 +1,8 @@
 AUX kwin-5.26.80-gstreamer-optional.patch 948 BLAKE2B 880e77ce6462c115953471dfd4985cc4891a05a910323c1760e01870f04a6930d6d4680811701e12094f1bc3eabbba6b097535408b9148dea4beca31496c7e35 SHA512 66e839c7d603873d675b96430ae48d89366a7f1c5019686c9471ef4fd66449bc4bc22752856665a5d90ab8e503e40d307c4671ac0c2f2991b869e211f7b46c86
+AUX kwin-5.27.5-fix-xcbutils-nativeFloor.patch 931 BLAKE2B 301b2db3db66ded11986583810d8283bf30ed7f6b848db0232e7c91b1c7cb660eacc8f631ff31ed41df826be7d48443235dba7a125b955af968e872a7e903e32 SHA512 baf12c4f2b8a1804fc268ab3a05ff6d207b9cdb07be2faf4327ce53fd0d68f2dc032d92ef11d95cf23f1c9eed3499552c48c3034836b940fc71d1e563e2a2466
 DIST kwin-5.27.4.1-patchset-1.tar.xz 8736 BLAKE2B 26fa987b087c9f7687cb30b4c3d66d1d3cdac855bfa0c59af10429b67f9a75c7f2a9cf76ee0a0125afc31b70097cdc25fcd3a482496cf6fb2dae4c929695098e SHA512 2c2bc1756064f4c772172aad58533412b7ac534d25c1a81bb4b65671a2ce9747e9dbd201826bd0e79d2eb31b8df9473a1dcee7f284f7eb352844c0c8f5ed9049
 DIST kwin-5.27.4.1.tar.xz 7621340 BLAKE2B 53f8001542f03be032fcf09d214e5e1d8be56bfcb506c5440aba7ea2b37515770b4c865e10d11a76722ee0fe2a8376c7a07311ff44d5adacca0c5969425f5cc3 SHA512 b686fce07d48b52f987e459ff42dd29da3cbd80beea1f4f1a7cb52f49a6cce9ad167e549ac876697bc820d158fd7fdbaa39fb1261b3573cb374e058ea09e1bbf
 DIST kwin-5.27.5.tar.xz 7622688 BLAKE2B 267cd1515f2667a4b96f0ffccbced0885c602d4a5227127ba5c9a23ccd9483d5f613fbc40d39e58ca16c42103f0caf09d39b4e5387d2673bd22393519e142e8f SHA512 777bf193ad8e4440ee9866f6b725e191460c5ff4b33e3e517184568fda3aee4936be5274daa33996ae654465b477b108fee83f91e33f0db8f622de7629340de8
 EBUILD kwin-5.27.4.1-r1.ebuild 4402 BLAKE2B 4479c92ad0a612de319ea40c1fec88df3e1a74cbb1aaad844d8db00452c2d76037ca8ad13d41b357bec55dc7d045d55ea72e7657d993843f5e494142ffb01df9 SHA512 584f24c31a2c0fcf82f40eb1281d79471755927fe225dc6674a9600867ea28fb75f6baf8eecebd0362efcf2795a94eeb4aa386f85f9ad27f9caded09a47d3f5a
-EBUILD kwin-5.27.4.1.ebuild 4236 BLAKE2B c3583470daf0dfb1fe49036389cd6c974fd8014b1daf3691f2edf7f90a2ebfbe205bb78a32506028df1fb314e1ec9047014e1796a73afe5ea056447b45762b3e SHA512 a2538432fa347726a8348a000cdf70c2ce88505468cf02e1ba132c15a4924153edc7843a576efb08776f39ce5170c313b1a97e63117bf1ef1ffb8fd414865b22
-EBUILD kwin-5.27.5.ebuild 4239 BLAKE2B 9d1c87a9d24b8a344fe299c4d60c4d0bbb1d2f4996fdfc9d92966b9fb38561377907f5a48016b84ae7c35134ccddb1902563c0237fade23f816bdb65fb915f28 SHA512 836a9a772c26a92800334af64a53c3e8185eb4c04b75d78312278f3078f8212248a5a0cb5b3fe91f1e9c23dc0af63c1fa95048220a7ff83f5a5e8d7943599248
+EBUILD kwin-5.27.5-r1.ebuild 4302 BLAKE2B e2348bc35229b66a8e62b1279266b85f8465599a9ac94960c520ae7a8135f695480d83d2961b0294b0515ae28d14bbd04dc846606f328387cd00eeca3ab95698 SHA512 b1b0735492d9e73565367852da3ed733ea0ea3dfe80af2089ae300ac8831683bc5bfb2b9da676feeec720e56bbc8afadf5a8a4f98a203f73991079981045cee0
 MISC metadata.xml 505 BLAKE2B 41f9200ff14d77161bb0863065be67315f5459fa8232da5f0cf18aacd8abb15f7e858277a59a219e59f777fbd2d2d1f035c941d1a06e459b01935b70921e678d SHA512 19c2af1c8b56be6989b617adc24fc0a8bc33d4913eecf22a4ecef3c1a2cf2994e814655f3a885a75ad17613af1dc41b6babb5e4375a3e217f0cc5842ba969a29
diff --git a/kde-plasma/kwin/files/kwin-5.27.5-fix-xcbutils-nativeFloor.patch b/kde-plasma/kwin/files/kwin-5.27.5-fix-xcbutils-nativeFloor.patch
new file mode 100644
index 000000000000..97fed89af956
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.27.5-fix-xcbutils-nativeFloor.patch
@@ -0,0 +1,32 @@
+From 2237391e979b2423462bb5eaf1fdf4c0876f7476 Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Wed, 10 May 2023 12:28:24 +0200
+Subject: [PATCH] xcbutils: fix nativeFloor
+
+The floor was not done in the X-native coordinate space but with double
+scaling
+
+BUG: 459373
+
+
+(cherry picked from commit a48c98f5aba71fab8bc1e1d5dd18668833631920)
+---
+ src/utils/xcbutils.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/utils/xcbutils.cpp b/src/utils/xcbutils.cpp
+index cea0ef7c894..9731f483c0b 100644
+--- a/src/utils/xcbutils.cpp
++++ b/src/utils/xcbutils.cpp
+@@ -646,7 +646,7 @@ QSizeF fromXNative(const QSize &s)
+ 
+ static qreal nativeFloor(qreal value)
+ {
+-    return std::floor(value / kwinApp()->xwaylandScale()) * kwinApp()->xwaylandScale();
++    return std::floor(value * kwinApp()->xwaylandScale()) / kwinApp()->xwaylandScale();
+ }
+ 
+ QRectF nativeFloor(const QRectF &rect)
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/kwin-5.27.4.1.ebuild b/kde-plasma/kwin/kwin-5.27.4.1.ebuild
deleted file mode 100644
index 0d699eaa879d..000000000000
--- a/kde-plasma/kwin/kwin-5.27.4.1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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"
-
-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"
-
-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\""
-}
diff --git a/kde-plasma/kwin/kwin-5.27.5.ebuild b/kde-plasma/kwin/kwin-5.27.5-r1.ebuild
index beb16fbcca7d..1cb246c16ea3 100644
--- a/kde-plasma/kwin/kwin-5.27.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.27.5-r1.ebuild
@@ -103,6 +103,8 @@ BDEPEND="
 "
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
+PATCHES=( "${FILESDIR}/${P}-fix-xcbutils-nativeFloor.patch" )
+
 src_prepare() {
 	ecm_src_prepare
 	use multimedia || eapply "${FILESDIR}/${PN}-5.26.80-gstreamer-optional.patch"