[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/

[Andreas Sturmlechner]

commit:     142207852f767e99c5f494608c674e683ff96466
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 17:03:51 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 17:03:51 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=14220785

kde-plasma/plasma-desktop: Fix upstream header include

Drop synaptics-properties.h parent directory from include.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...ma-desktop-5.18.4.1-override-include-dirs.patch | 31 ++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
index 4a30d92f3f..a9205ffc2a 100644
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
@@ -1,8 +1,8 @@
 From b11915786a97f55074b7bfe4eec6f3c5cc08ae78 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
 Date: Mon, 6 Apr 2020 00:41:07 +0200
-Subject: [PATCH] cmake modules: Allow include dir overrides for various input
- drivers
+Subject: [PATCH 1/2] cmake modules: Allow include dir overrides for various
+ input drivers
 
 FindEvdev - evdev-properties.h
 FindSynaptics - synaptics-properties.h
@@ -84,3 +84,30 @@ index 1550751ae..5b7af5e79 100644
 -- 
 2.26.2
 
+
+From eb7bedd400d854e430808ae469164dfed24b1550 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 24 Apr 2020 18:55:30 +0200
+Subject: [PATCH 2/2] synapticstouchpad.cpp: Drop synaptics-properties.h parent
+ dir from include
+
+---
+ kcms/touchpad/src/backends/x11/synapticstouchpad.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
+index d2f41d70b..3eb3171ee 100644
+--- a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
++++ b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
+@@ -53,7 +53,7 @@
+ 
+ #include <stddef.h>
+ #include <limits.h>
+-#include <xorg/synaptics-properties.h>
++#include <synaptics-properties.h>
+ 
+ #define SYN_MAX_BUTTONS 12
+ 
+-- 
+2.26.2
+

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/

[Andreas Sturmlechner]

commit:     1b21e4a10a811395c5cbbb28dc10a3366f91651f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 18 20:17:15 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 18 20:17:15 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1b21e4a1

kde-plasma/plasma-desktop: Fixup patch

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/plasma-desktop-6.2.3-tablet-kcm-optional.patch      | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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
index e7f549a324..b0d2f512ed 100644
--- 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
@@ -1,4 +1,4 @@
-From 999deeefddc9482e9e360643578442b958a9c2ef Mon Sep 17 00:00:00 2001
+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
@@ -9,12 +9,12 @@ Follow-up to 240ca31717ebed55e43ffaf6ac906dea07e9f4c6
 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
 (cherry picked from commit 8f0e9b4d625024469b4fbd0468e767e45b464872)
 ---
- CMakeLists.txt      | 31 +++++++++++++++++++------------
+ CMakeLists.txt      | 30 ++++++++++++++++++------------
  kcms/CMakeLists.txt |  5 ++++-
- 2 files changed, 23 insertions(+), 13 deletions(-)
+ 2 files changed, 22 insertions(+), 13 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6f764d1ef4..a76dd3ff2f 100644
+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"
@@ -37,7 +37,7 @@ index 6f764d1ef4..a76dd3ff2f 100644
  
  find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
      Auth
-@@ -139,17 +143,20 @@ set_package_properties(KF6QQC2DesktopStyle PROPERTIES
+@@ -139,17 +143,19 @@ set_package_properties(KF6QQC2DesktopStyle PROPERTIES
      TYPE RUNTIME
  )
  
@@ -64,7 +64,6 @@ index 6f764d1ef4..a76dd3ff2f 100644
 +        TYPE REQUIRED
 +        PURPOSE "Required for building Tablet input KCM"
 +    )
-+    pkg_check_modules(LIBWACOM libwacom REQUIRED IMPORTED_TARGET)
 +endif()
  
  find_package(SDL2 2.0.16)

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/

[Andreas Sturmlechner]

commit:     aa2704ffda1940d003c85bc7a74e6c5c12290baa
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  5 18:28:25 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul  5 18:29:57 2025 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=aa2704ff

kde-plasma/plasma-desktop: Drop unused patch

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/plasma-desktop-6.4.0-unused-dep.patch    | 45 ----------------------
 1 file changed, 45 deletions(-)

diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-6.4.0-unused-dep.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-6.4.0-unused-dep.patch
deleted file mode 100644
index bdcf6679cf..0000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-6.4.0-unused-dep.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8235d9ec36720e72cacec2721d67a8682149c677 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heiko.becker@kde.org>
-Date: Fri, 13 Jun 2025 15:55:03 +0200
-Subject: [PATCH] Drop no longer used icu dependency
-
-It's no longer necessary since commit
-6fdca0deaebb9d2adc22c737359e774b618fd358.
----
- CMakeLists.txt                  | 6 ------
- kcms/dateandtime/CMakeLists.txt | 2 --
- 2 files changed, 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a05e390797..ef8a77f44f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -233,12 +233,6 @@ if (BUILD_KCM_TOUCHPAD_X11)
- endif()
- 
- 
--find_package(ICU COMPONENTS i18n uc)
--set_package_properties(ICU PROPERTIES
--    PURPOSE "Retrieving timezone info"
--    TYPE REQUIRED
--)
--
- set_package_properties(XCB PROPERTIES TYPE REQUIRED)
- add_feature_info("XCB-XKB" XCB_XKB_FOUND "Required for building kcm/keyboard")
- add_feature_info("libxft" X11_Xft_FOUND "X FreeType interface library required for font installation")
-diff --git a/kcms/dateandtime/CMakeLists.txt b/kcms/dateandtime/CMakeLists.txt
-index 347ab280a9..72b866af3c 100644
---- a/kcms/dateandtime/CMakeLists.txt
-+++ b/kcms/dateandtime/CMakeLists.txt
-@@ -26,8 +26,6 @@ target_link_libraries(kcm_clock
-     KF6::KIOCore
-     KF6::KIOWidgets
-     KF6::Svg
--    ICU::i18n
--    ICU::uc
- )
- install(TARGETS kcm_clock  DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/kcms/systemsettings_qwidgets )
- 
--- 
-GitLab
-