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

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

[Michael Palimaka]

commit:     27c4032b49faacc4812030b9f4b131331cace988
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 17:04:12 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 17:25:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c4032b

kde-plasma/plasma-desktop: remove unused patch

Package-Manager: portage-2.2.26

 ...plasma-desktop-5.5.0-favourites-migration.patch | 26 ----------------------
 1 file changed, 26 deletions(-)

diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.5.0-favourites-migration.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.5.0-favourites-migration.patch
deleted file mode 100644
index 60dd237..0000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.5.0-favourites-migration.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 97ced66da372737ae5d36d86c9bc0c6fe684d842 Mon Sep 17 00:00:00 2001
-From: Eike Hein <hein@kde.org>
-Date: Tue, 8 Dec 2015 20:26:26 +0100
-Subject: [PATCH] Fix migration of multiple favorites.
-
-BUG:356398
----
- desktoppackage/contents/updates/obsolete_kickoffrc.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/desktoppackage/contents/updates/obsolete_kickoffrc.js b/desktoppackage/contents/updates/obsolete_kickoffrc.js
-index aae077f..d92cae9 100644
---- a/desktoppackage/contents/updates/obsolete_kickoffrc.js
-+++ b/desktoppackage/contents/updates/obsolete_kickoffrc.js
-@@ -1,7 +1,7 @@
- var kickoffConfig = ConfigFile("kickoffrc");
- 
- kickoffConfig.group = "Favorites";
--var favorites = kickoffConfig.readEntry("FavoriteURLs");
-+var favorites = kickoffConfig.readEntry("FavoriteURLs").split(',');
- 
- kickoffConfig.group = "SystemApplications";
- var systemApplications = kickoffConfig.readEntry("DesktopFiles").split(',');
--- 
-2.4.10
-

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

[Andreas Sturmlechner]

commit:     ab2c550da1ab1b385195c06257a9ad7b0a737258
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jan 14 15:17:12 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 22:45:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab2c550d

kde-plasma/plasma-desktop: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14336
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...lasma-desktop-5.17.4-activities-kcm-hidpi.patch | 27 ----------------------
 1 file changed, 27 deletions(-)

diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.4-activities-kcm-hidpi.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.4-activities-kcm-hidpi.patch
deleted file mode 100644
index 899df110935..00000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.4-activities-kcm-hidpi.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 567f71714faac305947573e307f486a9960cf1d1 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Fri, 13 Dec 2019 16:12:34 +0100
-Subject: [KCMs/Activities] Fix jagginess for activities list icons on high DPI
- systems
-
-BUG: 414945
-FIXED-IN: 5.17.5
----
- kcms/activities/qml/activitiesTab/ActivitiesView.qml | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/kcms/activities/qml/activitiesTab/ActivitiesView.qml b/kcms/activities/qml/activitiesTab/ActivitiesView.qml
-index aac13a2..531ef9f 100644
---- a/kcms/activities/qml/activitiesTab/ActivitiesView.qml
-+++ b/kcms/activities/qml/activitiesTab/ActivitiesView.qml
-@@ -52,6 +52,8 @@ ColumnLayout {
-                         height: Kirigami.Units.iconSizes.medium
-                         width: height
-                         source: model.icon
-+                        sourceSize.width: model.icon.width
-+                        sourceSize.height: model.icon.height
-                     }
- 
-                     QQC2.Label {
--- 
-cgit v1.1

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

[Andreas Sturmlechner]

commit:     cb5cadbe13e5a868a35ddd8c16612d0991e84d86
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 21:23:43 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 21:23:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb5cadbe

kde-plasma/plasma-desktop: Drop unused patch

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

 .../plasma-desktop-5.21.0-keyboard-repeat.patch    | 31 ----------------------
 1 file changed, 31 deletions(-)

diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.0-keyboard-repeat.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.0-keyboard-repeat.patch
deleted file mode 100644
index 8c7902c0e7d..00000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.0-keyboard-repeat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5550af1fd10dccda80be4586f19e3aa0995be2bc Mon Sep 17 00:00:00 2001
-From: Jan Blackquill <uhhadd@gmail.com>
-Date: Wed, 17 Feb 2021 12:34:15 -0500
-Subject: [PATCH] kcms/keyboard: fix migration
-
-TriState::STATE_ON is 0, while TriState::STATE_OFF is 1.
-We're currently migrating 0 -> disabled, when it should be
-1 -> disabled, * -> enabled.
-
-BUG: 431923
-FIXED-IN: 5.21.1
----
- kcms/keyboard/kcminputrc_migrate_repeat_value.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kcms/keyboard/kcminputrc_migrate_repeat_value.py b/kcms/keyboard/kcminputrc_migrate_repeat_value.py
-index 1440c570e..bd1667969 100755
---- a/kcms/keyboard/kcminputrc_migrate_repeat_value.py
-+++ b/kcms/keyboard/kcminputrc_migrate_repeat_value.py
-@@ -4,7 +4,7 @@ import sys
- for line in sys.stdin:
-     line = line.rstrip()
-     print(line, file=sys.stderr)
--    if line.startswith("KeyboardRepeating=0"):
-+    if line.startswith("KeyboardRepeating=1"):
-         print("KeyRepeat=nothing")
-     elif line.startswith("KeyboardRepeating="):
-         print("KeyRepeat=repeat")
--- 
-GitLab
-

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

[Conrad Kostecki]

commit:     10420c5b9efc6f6c10fec28f637b2e91162b1be8
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Feb 17 06:57:41 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Feb 17 17:35:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10420c5b

kde-plasma/plasma-desktop: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/24228
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...top-5.24.0-attica-add-granular-cache-pref.patch | 57 ----------------------
 1 file changed, 57 deletions(-)

diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.0-attica-add-granular-cache-pref.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.0-attica-add-granular-cache-pref.patch
deleted file mode 100644
index fb4d0bacbd90..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.0-attica-add-granular-cache-pref.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 346dafd3a0e19805f77147a9515a7333a05ed584 Mon Sep 17 00:00:00 2001
-From: Dan Leinir Turthra Jensen <admin@leinir.dk>
-Date: Tue, 8 Feb 2022 11:16:16 +0000
-Subject: [PATCH] Add a granular cache preference thing to attica-kde
-
-Commit 798027fd17ab86eea022e5d269aa86138b28b130
-
-This allows us to explicitly add cache preference to specific calls.
-Usually attica calls want to be very current, but in some cases we can
-assume things aren't going to change often (such as the categories
-call), and we can just use the cached version for those calls.
-
-Fix missing variable name
-Commit 8e164050c594855ee3728678d6d0907a10b28db6
-
-Only trust the expiration date if it's less than 24 hours
-Commit b85cf34298c274b5f16cb6c2aead7b87f0dabbb8
-
-Fix build
-Commit 6e8626f2d65a03af3cd12fb5390040c56ca3258d
----
- attica-kde/kdeplugin/kdeplatformdependent.cpp | 20 ++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/attica-kde/kdeplugin/kdeplatformdependent.cpp b/attica-kde/kdeplugin/kdeplatformdependent.cpp
-index c2c90107e..850c91284 100644
---- a/attica-kde/kdeplugin/kdeplatformdependent.cpp
-+++ b/attica-kde/kdeplugin/kdeplatformdependent.cpp
-@@ -125,6 +125,25 @@ QNetworkRequest KdePlatformDependent::addOAuthToRequest(const QNetworkRequest &r
-         const QString bearer = bearer_format.arg(token);
-         notConstReq.setRawHeader("Authorization", bearer.toUtf8());
-     }
-+
-+    // Add cache preference in a granular fashion (we will almost certainly want more of these, but...)
-+    static const QStringList preferCacheEndpoints{QLatin1String{"/content/categories"}};
-+    for (const QString &endpoint : preferCacheEndpoints) {
-+        if (notConstReq.url().toString().endsWith(endpoint)) {
-+            QNetworkCacheMetaData cacheMeta{m_accessManager->cache()->metaData(notConstReq.url())};
-+            if (cacheMeta.isValid()) {
-+                // If the expiration date is valid, but longer than 24 hours, don't trust that things
-+                // haven't changed and check first, otherwise just use the cached version to relieve
-+                // server strain and reduce network traffic.
-+                const QDateTime tomorrow{QDateTime::currentDateTime().addDays(1)};
-+                if (cacheMeta.expirationDate().isValid() && cacheMeta.expirationDate() < tomorrow) {
-+                    notConstReq.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
-+                }
-+            }
-+            break;
-+        }
-+    }
-+
-     return notConstReq;
- }
- 
--- 
-2.34.1
-

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

[Andreas Sturmlechner]

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
+