So maybe gentoo/kde can wrap this into the existing plasma-desktop override-include-dirs workaround/patch, since it seems to be similar stuff. Either that or maybe a USE=tablet for kcm_tablet. Upstream plasma-desktop now requires libwacom: commit 240ca31717ebed55e43ffaf6ac906dea07e9f4c6 Author: Joshua Goins AuthorDate: Sun Jun 16 11:14:58 2024 -0400 Commit: Joshua Goins CommitDate: Sat Nov 2 12:20:23 2024 -0400 kcms/tablet: Begin to use libwacom, use actual number of stylus buttons libwacom has tons of useful information we can use. In this case, we can use it to report the actual number of stylus buttons available and not always 3. That adds this to the root CMakeLists.txt (in addition to the code changes): +# for kcm_tablet +pkg_check_modules(LIBWACOM libwacom REQUIRED IMPORTED_TARGET) + Of course then configure fails with: -- Checking for module 'libwacom' -- Package 'libwacom' not found CMake Error at /share/cmake/Modules/FindPkgConfig.cmake:645 (message): The following required packages were not found: - libwacom Call Stack (most recent call first): /share/cmake/Modules/FindPkgConfig.cmake:873 (_pkg_check_modules_internal) CMakeLists.txt:260 (pkg_check_modules) -- Configuring incomplete, errors occurred!
Thanks for your report, please test https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/2621 by building plasma-desktop-9999 with MYCMAKEARGS=-DBUILD_KCM_TABLET=OFF
(In reply to Andreas Sturmlechner from comment #1) > please test > https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/2621 by > building plasma-desktop-9999 with MYCMAKEARGS=-DBUILD_KCM_TABLET=OFF Seems to be working fine. Built with the patch dropped in /etc/portage/patches and the cmake var set in /etc/portage/package.env and /etc/portage/env. Quit plasma-wayland and remounted / ro (thus verifying no deleted libs still loaded), then restarted plasma-wayland. To be sure it wasn't affected I started the touchpad kcm and everything looks fine there, too. Thanks. I see there's a bit of push-back upstream, but your patch ends up been rather less complicated than I had feared, so I hope they take it.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=ed274146f1de9003cc7bf4ecbce1a6a36b0b9385 commit ed274146f1de9003cc7bf4ecbce1a6a36b0b9385 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2024-11-15 22:19:20 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2024-11-15 22:28:23 +0000 kde-plasma/plasma-desktop: Add IUSE tablet Upstream commit e2a65cb1675d4182f029ec7f2e681af2c0a66255 Closes: https://bugs.gentoo.org/942817 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> kde-plasma/plasma-desktop/metadata.xml | 1 + kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=43e0b96f6c33b0a6b03bb04591585bfeb9537f1a commit 43e0b96f6c33b0a6b03bb04591585bfeb9537f1a Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2024-11-16 08:11:11 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2024-11-16 08:11:35 +0000 kde-plasma/plasma-desktop: Switch IUSE tablet -> input_devices_wacom Bug: https://bugs.gentoo.org/942817 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> kde-plasma/plasma-desktop/metadata.xml | 1 - kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=6a1f72d0da6ec265e1d37382014356851e35347c commit 6a1f72d0da6ec265e1d37382014356851e35347c Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2024-11-17 19:57:42 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2024-11-17 20:04:03 +0000 kde-plasma/plasma-desktop: Backport IUSE input_devices_wacom to 6.2 Bug: https://bugs.gentoo.org/942817 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> .../plasma-desktop-6.2.3-tablet-kcm-optional.patch | 94 ++++++++++++++++++++++ .../plasma-desktop-6.2.49.9999.ebuild | 14 ++-- 2 files changed, 103 insertions(+), 5 deletions(-)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf8be6c305870594df1950c3f8521ee94e8b9cf7 commit bf8be6c305870594df1950c3f8521ee94e8b9cf7 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2024-11-17 19:57:42 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2024-11-18 20:03:46 +0000 kde-plasma/plasma-desktop: Backport IUSE input_devices_wacom to 6.2 Bug: https://bugs.gentoo.org/942817 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> .../plasma-desktop-6.2.3-tablet-kcm-optional.patch | 93 +++++++++++ .../plasma-desktop/plasma-desktop-6.2.3-r1.ebuild | 183 +++++++++++++++++++++ 2 files changed, 276 insertions(+)
