public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Benjamin A. Beasley <code@musicinmybrain.net>
To: git-commits@fedoraproject.org
Subject: [rpms/kdeplasma-addons] f44: Patch kameleon-qmk-helper for qmk-via-api 0.8
Date: Mon, 15 Jun 2026 12:41:18 GMT [thread overview]
Message-ID: <178152727884.1.17404960435372845164.rpms-kdeplasma-addons-cee45a3116da@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/kdeplasma-addons
Branch : f44
Commit : cee45a3116dadc2b67eb66027a80c2c75ef9de23
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date : 2026-06-15T13:30:31+01:00
Stats : +102/-1 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/kdeplasma-addons/c/cee45a3116dadc2b67eb66027a80c2c75ef9de23?branch=f44
Log:
Patch kameleon-qmk-helper for qmk-via-api 0.8
---
diff --git a/kdeplasma-addons-6.7.0-qmk-via-api-0.8.patch b/kdeplasma-addons-6.7.0-qmk-via-api-0.8.patch
new file mode 100644
index 0000000..dd5e977
--- /dev/null
+++ b/kdeplasma-addons-6.7.0-qmk-via-api-0.8.patch
@@ -0,0 +1,92 @@
+From 1dca6f58f662e63efd33b7f592e9fa94f660f424 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Fri, 12 Jun 2026 11:26:56 +0100
+Subject: [PATCH 1/2] Specify SemVer-bounded Rust dependencies for
+ `kameleon-qmk-helper`
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Asking for `"0"` means “anything before version 1,” but pre-1.0 minor
+releases may contain breaking changes.
+---
+ kdeds/kameleon/qmk/kameleon-qmk-helper/Cargo.toml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kdeds/kameleon/qmk/kameleon-qmk-helper/Cargo.toml b/kdeds/kameleon/qmk/kameleon-qmk-helper/Cargo.toml
+index 647c1f288..22e14cdad 100644
+--- a/kdeds/kameleon/qmk/kameleon-qmk-helper/Cargo.toml
++++ b/kdeds/kameleon/qmk/kameleon-qmk-helper/Cargo.toml
+@@ -7,9 +7,9 @@ version = "0.1.0"
+ edition = "2024"
+
+ [dependencies]
+-easy_color = "0"
++easy_color = "0.1"
+ event-listener = "5"
+-qmk-via-api = "0"
++qmk-via-api = "0.7"
+ tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
+ zbus = { version = "5", default-features = false, features = ["tokio"] }
+ zbus_polkit = { version = "5", default-features = false, features = ["tokio"] }
+--
+GitLab
+
+
+From c46827b1adb7a38998e1e58b48f0e8413c541d99 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Fri, 12 Jun 2026 11:36:13 +0100
+Subject: [PATCH 2/2] Update qmk-via-api to 0.8
+
+Set the newly-supported `KeyboardApi::from_device` timeout to 25
+seconds; this is fairly arbitrary, chosen to be a bit under half of the
+60-second timeout in `main`.
+
+https://github.com/srwi/qmk-via-api/compare/0.7.0...0.8.0
+---
+ kdeds/kameleon/qmk/kameleon-qmk-helper/Cargo.toml | 2 +-
+ kdeds/kameleon/qmk/kameleon-qmk-helper/src/main.rs | 8 +++++---
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/kdeds/kameleon/qmk/kameleon-qmk-helper/Cargo.toml b/kdeds/kameleon/qmk/kameleon-qmk-helper/Cargo.toml
+index 22e14cdad..ade00f455 100644
+--- a/kdeds/kameleon/qmk/kameleon-qmk-helper/Cargo.toml
++++ b/kdeds/kameleon/qmk/kameleon-qmk-helper/Cargo.toml
+@@ -9,7 +9,7 @@ edition = "2024"
+ [dependencies]
+ easy_color = "0.1"
+ event-listener = "5"
+-qmk-via-api = "0.7"
++qmk-via-api = "0.8"
+ tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
+ zbus = { version = "5", default-features = false, features = ["tokio"] }
+ zbus_polkit = { version = "5", default-features = false, features = ["tokio"] }
+diff --git a/kdeds/kameleon/qmk/kameleon-qmk-helper/src/main.rs b/kdeds/kameleon/qmk/kameleon-qmk-helper/src/main.rs
+index f7b3e0beb..4509c34d0 100644
+--- a/kdeds/kameleon/qmk/kameleon-qmk-helper/src/main.rs
++++ b/kdeds/kameleon/qmk/kameleon-qmk-helper/src/main.rs
+@@ -57,7 +57,8 @@ impl Helper {
+ let devices = scan_keyboards()
+ .map_err(|e| zbus::fdo::Error::Failed(format!("Failed to scan keyboards: {e}")))?;
+ for device in devices {
+- let api = KeyboardApi::from_device(&device).map_err(|e| {
++ let timeout_ms: i32 = 25000; // This is fairly arbitrary.
++ let api = KeyboardApi::from_device(&device, Some(timeout_ms)).map_err(|e| {
+ zbus::fdo::Error::Failed(format!(
+ "Failed to create API for device {:?}: {e}",
+ device.product
+@@ -127,8 +128,9 @@ impl Helper {
+ .map_err(|i| zbus::fdo::Error::Failed(format!("Failed to scan keyboards: {i}")))?
+ .iter()
+ .any(|device| {
+- let api =
+- KeyboardApi::from_device(&device).expect("Failed to create API for device");
++ let timeout_ms: i32 = 25000; // This is fairly arbitrary.
++ let api = KeyboardApi::from_device(&device, Some(timeout_ms))
++ .expect("Failed to create API for device");
+ api.get_rgblight_effect().is_ok() || api.get_rgb_matrix_effect().is_ok()
+ });
+ Ok(any)
+--
+GitLab
+
diff --git a/kdeplasma-addons.spec b/kdeplasma-addons.spec
index a6178ec..38a13a4 100644
--- a/kdeplasma-addons.spec
+++ b/kdeplasma-addons.spec
@@ -1,7 +1,7 @@
Name: kdeplasma-addons
Summary: Additional Plasmoids for Plasma 6
Version: 6.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LGPL-3.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT
URL: https://invent.kde.org/plasma/%{name}
@@ -9,6 +9,12 @@ URL: https://invent.kde.org/plasma/%{name}
Source0: http://download.kde.org/%{stable_kf6}/plasma/%{version}/%{name}-%{version}.tar.xz
Source1: http://download.kde.org/%{stable_kf6}/plasma/%{version}/%{name}-%{version}.tar.xz.sig
+# Specify SemVer-bounded Rust dependencies for `kameleon-qmk-helper`; update
+# `qmk-via-api` to 0.8
+# https://invent.kde.org/plasma/kdeplasma-addons/-/merge_requests/1080
+# (Without changes to Cargo.lock, which would only cause merge conflicts.)
+Patch: kdeplasma-addons-6.7.0-qmk-via-api-0.8.patch
+
ExcludeArch: %{ix86}
%ifarch %{qt6_qtwebengine_arches}
@@ -184,6 +190,9 @@ cd ../../../../
%{_libdir}/cmake/PlasmaWeather/
%changelog
+* Mon Jun 15 2026 Benjamin A. Beasley <code@musicinmybrain.net> - 6.7.0-2
+- Patch kamelion-qmk-helper for qmk-via-api 0.8
+
* Thu Jun 11 2026 Steve Cossette <farchord@gmail.com> - 6.7.0-1
- 6.7.0
reply other threads:[~2026-06-15 12:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=178152727884.1.17404960435372845164.rpms-kdeplasma-addons-cee45a3116da@fedoraproject.org \
--to=code@musicinmybrain.net \
--cc=git-commits@fedoraproject.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