gentoo auto-resync : 25:09:2023 - 05:24:31

3 files changed, 117 insertions, 0 deletions

diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index f43dbb2a14ff..d107d740e6f4 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,6 +1,8 @@
 AUX kscreen-5.27.8-cmake.patch 700 BLAKE2B dee1571184fc769af26a6e2bd85c19bde63cece2dd47b9635252bcd923d695ac26cc620f1c5d34fb825c5e344efa6ef07d85cdca43ba2e8702885eaca06ba071 SHA512 8bd75293b38fa8b60df085e4e2fc638470368f44a9b9c1f61716bde7ae7da0682d901b2f0f3e27ee4bf7f6f5a8dbf5059874018fab3dc563b42d5a2fdc262bc8
+AUX kscreen-5.27.8-libinput-calibration-matrix.patch 2304 BLAKE2B 3dca96079d99589c7c7cb52a7936b4eb5382d35f422b3fc5a0ebad03584621b6ae4493386bfff59783f5ee5258a9610f11a25abb9ab7a6c9e1d28f5c7d5672df SHA512 7f19112cddf80b93b2a0a37e236ab232e78f6f19da00b45be52c29f05328f0f6bbbbe0b67133acb5b509c60b7019465c3ff56079342e9b6fd9a48e2f0d6d4183
 DIST kscreen-5.27.7.tar.xz 185132 BLAKE2B 752e4be58f3ef8f3781f84d17455b1b9c24964e8754dc4ff7c063f853097f82fcb5e9c2da8b2d5fa70725c1ac0f6b883410cbd4804aed3138c4cdfff8884ced0 SHA512 6c6c17066b320c4480534adfa0c39fb69d2b89e00b033613fd61a4d9ed6df112a750eef4b95301a42eddd4cbaec9e9e8bb77ffdc2dc9e377b07709afc67f0588
 DIST kscreen-5.27.8.tar.xz 185204 BLAKE2B 71e8047cc1dc574e1b7b6781f14648166c93d87896db66014608a601407add48a948f4271b17da543687b1e127d8a57c77b4e27bd81854ffc41912fc3bf1bed2 SHA512 65ee754921374fd8bce504a7ad862d41f97817226f15830371e3fcc2998504fce3777271107e18e1d590a1295645884a0f8e42d17164f0377236e45b3cc0045d
 EBUILD kscreen-5.27.7.ebuild 1349 BLAKE2B 5b26cbf36679a28e0609893349db488fc10a52bbfd702c9d92950f587172e47e8971c5f9c755b25a19d974fe230abb291f9f05434cab57dcc6ab1242a5915cc0 SHA512 186dafccbd398fce50090b35c3bb06726e162ec878e90e6cd3d0c79065effe2ee26ab70135d0098c2100d7a25e97e7c82688f18230abfee85d542dcdf4780305
 EBUILD kscreen-5.27.8-r1.ebuild 1392 BLAKE2B 1f02c190d8a911a60b0c1d88bef5c7ab59d1b14a7fc85c67edec0ed3869f2a85e308693da60ea1bbc45f525bffbdc0769fd3d0dbf15fe29d5ac7b540deddf41e SHA512 8c7188a4e7085fff604d819661abcd8a5db9860859258882d7a9edf02ee99fce8b971cfa715217889cce47db9d37ae3f1055a666bc3f212bf62cd9f5f3192b2b
+EBUILD kscreen-5.27.8-r2.ebuild 1464 BLAKE2B d31d861aa6d02b8990229d608fa50d5f6fc9f91918a5e02f0e83f996a5f69c4c8916b9ad0ada58a2fafc2af72abb616612dabf19bde38668bc9ec24c92ff59b8 SHA512 c4c68aefe360b786a03e2875bb75a40af74c6a63fcbf828dc5f708ef3309e7abb75707bf6a176becd485658c6df91fe7ee3ed51847cda087c0c21c9da5e87cbf
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreen/files/kscreen-5.27.8-libinput-calibration-matrix.patch b/kde-plasma/kscreen/files/kscreen-5.27.8-libinput-calibration-matrix.patch
new file mode 100644
index 000000000000..f6e404ae1d52
--- /dev/null
+++ b/kde-plasma/kscreen/files/kscreen-5.27.8-libinput-calibration-matrix.patch
@@ -0,0 +1,60 @@
+From 49dbf9b9fb021d63ef5b712460483e6fe8c23a1c Mon Sep 17 00:00:00 2001
+From: theofficial gman <dofficialgman@gmail.com>
+Date: Sun, 24 Sep 2023 11:59:21 +0000
+Subject: [PATCH] Only modify `Coordinate Transformation Matrix`
+
+Allow `libinput Calibration Matrix` to exist as whatever it has set to by default.
+This allows for a UDEV rule to be made to set the calibration matrix in cases where
+the display and touchscreen do not have the same orientation or pixel sizing.
+This now matches the mutter implementation.
+
+BUG: 474110
+
+If my authorship is unsuitable (no real name used), I give permission for you to pick and reauthor at your wish.
+
+
+(cherry picked from commit c8f33c8fa3b194c883443457801119016cbbfe9f)
+---
+ kded/daemon.cpp | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/kded/daemon.cpp b/kded/daemon.cpp
+index f7cadee2..63ddf51a 100644
+--- a/kded/daemon.cpp
++++ b/kded/daemon.cpp
+@@ -483,7 +483,6 @@ void KScreenDaemon::alignX11TouchScreen()
+     if (matrixAtom == 0) {
+         return;
+     }
+-    auto calibrationMatrixAtom = getAtom(connection, "libinput Calibration Matrix");
+     auto floatAtom = getAtom(connection, "FLOAT");
+     if (floatAtom == 0) {
+         return;
+@@ -532,23 +531,17 @@ void KScreenDaemon::alignX11TouchScreen()
+         std::unique_ptr<Atom, XDeleter> properties(XIListProperties(display, info->id, &nProperties));
+ 
+         bool matrixAtomFound = false;
+-        bool libInputCalibrationAtomFound = false;
+ 
+         Atom *atom = properties.get();
+         Atom *atomEnd = properties.get() + nProperties;
+         for (; atom != atomEnd; atom++) {
+             if (!internalOutputRect.isEmpty() && *atom == matrixAtom) {
+                 matrixAtomFound = true;
+-            } else if (!internalOutputRect.isEmpty() && *atom == calibrationMatrixAtom) {
+-                libInputCalibrationAtomFound = true;
+             }
+         }
+ 
+-        if (libInputCalibrationAtomFound) {
+-            setMatrixAtom(info, calibrationMatrixAtom, transform);
+-        }
+         if (matrixAtomFound) {
+-            setMatrixAtom(info, matrixAtom, libInputCalibrationAtomFound ? QTransform() : transform);
++            setMatrixAtom(info, matrixAtom, transform);
+         }
+ 
+         // For now we assume there is only one touchscreen
+-- 
+GitLab
+
diff --git a/kde-plasma/kscreen/kscreen-5.27.8-r2.ebuild b/kde-plasma/kscreen/kscreen-5.27.8-r2.ebuild
new file mode 100644
index 000000000000..4016d62b3484
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.27.8-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=5.106.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.9
+inherit ecm plasma.kde.org
+
+DESCRIPTION="KDE Plasma screen management"
+HOMEPAGE="https://invent.kde.org/plasma/kscreen"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# bug #580440, last checked 5.6.3
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsensors-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/layer-shell-qt-${PVCUT}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5=
+	x11-libs/libX11
+	x11-libs/libxcb:=
+	x11-libs/libXi
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch" # bug 914142
+	"${FILESDIR}/${P}-libinput-calibration-matrix.patch" # KDE-bug 474110
+)