From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/files/
Date: Wed, 4 Dec 2024 06:08:31 +0000 (UTC) [thread overview]
Message-ID: <1733292504.6f1c4d43b9b832d2ebccbe8cc223bd3c6e4155bf.asturm@gentoo> (raw)
commit: 6f1c4d43b9b832d2ebccbe8cc223bd3c6e4155bf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 4 06:08:07 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 4 06:08:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f1c4d43
kde-plasma/plasma-desktop: Re-add missing patch
Closes: https://bugs.gentoo.org/945840
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma-desktop-6.2.3-tablet-kcm-optional.patch | 93 ++++++++++++++++++++++
1 file changed, 93 insertions(+)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-tablet-kcm-optional.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-tablet-kcm-optional.patch
new file mode 100644
index 000000000000..b0d2f512ed9e
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-tablet-kcm-optional.patch
@@ -0,0 +1,93 @@
+From 5296ef03a9b14a6a9324d506d04f78e61e8512f6 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 4 Nov 2024 23:15:19 +0100
+Subject: [PATCH] cmake: Add BUILD_KCM_TABLET option to conditionalise Wayland
+ deps
+
+Follow-up to 240ca31717ebed55e43ffaf6ac906dea07e9f4c6
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+(cherry picked from commit 8f0e9b4d625024469b4fbd0468e767e45b464872)
+---
+ CMakeLists.txt | 30 ++++++++++++++++++------------
+ kcms/CMakeLists.txt | 5 ++++-
+ 2 files changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6f764d1ef4..8222cfaed5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,6 +40,7 @@ option(BUILD_KCM_MOUSE_KWIN_WAYLAND "Build the Mouse KCM's KWin+Wayland backend"
+ option(BUILD_KCM_MOUSE_X11 "Build the Mouse KCM's X11 backend" ON)
+ option(BUILD_KCM_TOUCHPAD_KWIN_WAYLAND "Build the Touchpad KCM's KWin+Wayland backend" ON)
+ option(BUILD_KCM_TOUCHPAD_X11 "Build the Touchpad KCM's X11 backend" ON)
++option(BUILD_KCM_TABLET "Build the Tablet KCM" ON)
+
+ find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+ Quick
+@@ -51,7 +52,10 @@ find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+ Core5Compat
+ Sql # kcms/activities
+ )
+-find_package(Qt6 ${QT_MIN_VERSION} CONFIG OPTIONAL_COMPONENTS WaylandClient)
++
++if(BUILD_KCM_TABLET)
++ find_package(Qt6WaylandClient ${QT_MIN_VERSION} CONFIG REQUIRED)
++endif()
+
+ find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
+ Auth
+@@ -139,17 +143,19 @@ set_package_properties(KF6QQC2DesktopStyle PROPERTIES
+ TYPE RUNTIME
+ )
+
+-find_package(WaylandProtocols 1.25)
+-set_package_properties(WaylandProtocols PROPERTIES
+- TYPE REQUIRED
+- PURPOSE "Collection of Wayland protocols that add functionality not available in the Wayland core protocol"
+- URL "https://gitlab.freedesktop.org/wayland/wayland-protocols/"
+-)
+-find_package(Wayland 1.2)
+-set_package_properties(Wayland PROPERTIES
+- TYPE REQUIRED
+- PURPOSE "Required for building Tablet input KCM"
+-)
++if(BUILD_KCM_TABLET)
++ find_package(WaylandProtocols 1.25)
++ set_package_properties(WaylandProtocols PROPERTIES
++ TYPE REQUIRED
++ PURPOSE "Collection of Wayland protocols that add functionality not available in the Wayland core protocol"
++ URL "https://gitlab.freedesktop.org/wayland/wayland-protocols/"
++ )
++ find_package(Wayland 1.2)
++ set_package_properties(Wayland PROPERTIES
++ TYPE REQUIRED
++ PURPOSE "Required for building Tablet input KCM"
++ )
++endif()
+
+ find_package(SDL2 2.0.16)
+ set_package_properties(SDL2 PROPERTIES
+diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt
+index 5b204a7c19..cea880c139 100644
+--- a/kcms/CMakeLists.txt
++++ b/kcms/CMakeLists.txt
+@@ -26,7 +26,6 @@ add_subdirectory(kded)
+ add_subdirectory(runners)
+ add_subdirectory(spellchecking)
+ add_subdirectory(qtquicksettings)
+-add_subdirectory(tablet)
+ add_subdirectory(touchscreen)
+
+ add_subdirectory(workspaceoptions)
+@@ -42,3 +41,7 @@ endif()
+ if (BUILD_KCM_TOUCHPAD_KWIN_WAYLAND OR BUILD_KCM_TOUCHPAD_X11)
+ add_subdirectory(touchpad)
+ endif()
++
++if(BUILD_KCM_TABLET)
++ add_subdirectory(tablet)
++endif()
+--
+2.47.0
+
next reply other threads:[~2024-12-04 6:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-04 6:08 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-02-17 17:36 [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/files/ Conrad Kostecki
2021-02-23 21:24 Andreas Sturmlechner
2020-01-14 22:45 Andreas Sturmlechner
2016-01-18 17:26 Michael Palimaka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1733292504.6f1c4d43b9b832d2ebccbe8cc223bd3c6e4155bf.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox