commit:     ed274146f1de9003cc7bf4ecbce1a6a36b0b9385
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 15 22:19:20 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 15 22:28:23 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ed274146

kde-plasma/plasma-desktop: Add IUSE tablet

Upstream commit e2a65cb1675d4182f029ec7f2e681af2c0a66255

Closes: https://bugs.gentoo.org/942817
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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(-)

diff --git a/kde-plasma/plasma-desktop/metadata.xml 
b/kde-plasma/plasma-desktop/metadata.xml
index a6a6f9e8ba..cd57c1d37f 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -13,6 +13,7 @@
                <flag name="scim">Enable applets that use 
<pkg>app-i18n/scim</pkg></flag>
                <flag name="screencast">Enable screencast portal thumbnails 
using <pkg>kde-plasma/kpipewire</pkg></flag>
                <flag name="sdl">Enable gamepad support using 
<pkg>media-libs/libsdl2</pkg></flag>
+               <flag name="tablet">Build system settings module for tablets 
using <pkg>dev-libs/libwacom</pkg></flag>
                <flag name="webengine">Build the OpenDesktop integration 
plugin</flag>
        </use>
 </pkgmetadata>

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index b8f9ea19c2..b197836176 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz";
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
 KEYWORDS=""
-IUSE="ibus scim screencast sdl +semantic-desktop webengine"
+IUSE="ibus scim screencast sdl +semantic-desktop +tablet webengine"
 
 RESTRICT="test" # missing selenium-webdriver-at-spi
 
@@ -25,12 +25,10 @@ RESTRICT="test" # missing selenium-webdriver-at-spi
 # kde-frameworks/kwindowsystem[X]: Uses KX11Extras
 COMMON_DEPEND="
        dev-libs/icu:=
-       dev-libs/wayland
        >=dev-qt/qt5compat-${QTMIN}:6[qml]
        >=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,sql,widgets,xml]
        >=dev-qt/qtdeclarative-${QTMIN}:6
        >=dev-qt/qtsvg-${QTMIN}:6
-       >=dev-qt/qtwayland-${QTMIN}:6
        >=kde-frameworks/attica-${KFMIN}:6
        >=kde-frameworks/karchive-${KFMIN}:6
        >=kde-frameworks/kauth-${KFMIN}:6
@@ -87,15 +85,20 @@ COMMON_DEPEND="
        scim? ( app-i18n/scim )
        sdl? ( media-libs/libsdl2[joystick] )
        semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
+       tablet? (
+               dev-libs/wayland
+               dev-libs/libwacom:=
+               >=dev-qt/qtwayland-${QTMIN}:6
+       )
        webengine? (
                kde-apps/kaccounts-integration:6
                >=net-libs/accounts-qt-1.17[qt6(+)]
        )
 "
 DEPEND="${COMMON_DEPEND}
-       >=dev-libs/wayland-protocols-1.25
        dev-libs/boost
        x11-base/xorg-proto
+       tablet? ( >=dev-libs/wayland-protocols-1.25 )
        test? (
                >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
                >=kde-plasma/kactivitymanagerd-${PVCUT}:6
@@ -119,9 +122,9 @@ RDEPEND="${COMMON_DEPEND}
 "
 BDEPEND="
        dev-util/intltool
-       dev-util/wayland-scanner
        >=kde-frameworks/kcmutils-${KFMIN}:6
        virtual/pkgconfig
+       tablet? ( dev-util/wayland-scanner )
 "
 
 PATCHES=(
@@ -152,6 +155,7 @@ src_configure() {
                $(cmake_use_find_package ibus GLIB2)
                $(cmake_use_find_package sdl SDL2)
                $(cmake_use_find_package semantic-desktop KF6Baloo)
+               -DBUILD_KCM_TABLET=$(usex tablet)
                $(cmake_use_find_package webengine AccountsQt6)
                $(cmake_use_find_package webengine KAccounts6)
        )

Reply via email to