diff --git a/anda/tools/kanata/kanata-fix-metadata-auto.diff b/anda/tools/kanata/kanata-fix-metadata-auto.diff index acb539232a..9cd73985c5 100644 --- a/anda/tools/kanata/kanata-fix-metadata-auto.diff +++ b/anda/tools/kanata/kanata-fix-metadata-auto.diff @@ -1,12 +1,12 @@ ---- kanata-1.9.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ kanata-1.9.0/Cargo.toml 2025-06-23T09:19:38.121344+00:00 -@@ -45,23 +45,9 @@ +--- kanata-1.11.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ kanata-1.11.0/Cargo.toml 2026-02-12T16:56:59.169531+00:00 +@@ -47,23 +47,9 @@ "kanata-parser/gui", "win_sendinput_send_scancodes", "win_llhook_read_scancodes", -- "muldiv", -- "strip-ansi-escapes", - "open", +- "dep:muldiv", +- "dep:strip-ansi-escapes", + "dep:open", - "dep:windows-sys", - "winapi/processthreadsapi", - "native-windows-gui/tray-notification", @@ -20,29 +20,19 @@ - "native-windows-gui/animation-timer", ] interception_driver = [ -- "kanata-interception", +- "dep:kanata-interception", "kanata-parser/interception_driver", ] passthru_ahk = [ -@@ -75,9 +61,7 @@ - wasm = ["instant/wasm-bindgen"] - win_llhook_read_scancodes = ["kanata-parser/win_llhook_read_scancodes"] - win_manifest = [ -- "embed-resource", - "indoc", -- "regex", - ] - win_sendinput_send_scancodes = ["kanata-parser/win_sendinput_send_scancodes"] - zippychord = ["kanata-parser/zippychord"] -@@ -186,97 +170,9 @@ - [target.'cfg(target_os = "linux")'.dependencies.signal-hook] - version = "0.3.14" +@@ -202,88 +188,9 @@ + [target.'cfg(not(any(target_arch = "wasm32", target_os = "android")))'.dependencies.arboard] + version = "3.4" -[target.'cfg(target_os = "macos")'.dependencies.core-graphics] -version = "0.24.0" - -[target.'cfg(target_os = "macos")'.dependencies.karabiner-driverkit] --version = "0.1.5" +-version = "0.2.0" - -[target.'cfg(target_os = "macos")'.dependencies.libc] -version = "0.2" @@ -91,6 +81,9 @@ - "wincon", - "timeapi", - "mmsystem", +- "winuser", +- "windef", +- "minwindef", -] - -[target.'cfg(target_os = "windows")'.dependencies.windows-sys] @@ -114,18 +107,6 @@ - "Wdk_System_SystemServices", -] -optional = true -- --[target.'cfg(target_os = "windows")'.build-dependencies.embed-resource] --version = "2.4.2" --optional = true -- --[target.'cfg(target_os = "windows")'.build-dependencies.indoc] --version = "2.0.4" --optional = true -- --[target.'cfg(target_os = "windows")'.build-dependencies.regex] --version = "1.10.4" --optional = true - [profile.release] opt-level = "z" diff --git a/anda/tools/kanata/rust-kanata.spec b/anda/tools/kanata/rust-kanata.spec index db1f52c9a0..f503bc4d9e 100644 --- a/anda/tools/kanata/rust-kanata.spec +++ b/anda/tools/kanata/rust-kanata.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 27 +# Generated by rust2rpm 28 %bcond check 1 %global crate kanata @@ -15,7 +15,7 @@ Source: %{crates_source} Patch: kanata-fix-metadata-auto.diff Packager: madonuko -BuildRequires: anda-srpm-macros cargo-rpm-macros >= 24 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Multi-layer keyboard customization.} @@ -67,6 +67,18 @@ use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+cargo-clippy-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+cargo-clippy-devel %{_description} + +This package contains library source intended for building other packages which +use the "cargo-clippy" feature of the "%{crate}" crate. + +%files -n %{name}+cargo-clippy-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+cmd-devel Summary: %{summary} BuildArch: noarch @@ -91,18 +103,6 @@ use the "gui" feature of the "%{crate}" crate. %files -n %{name}+gui-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+indoc-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+indoc-devel %{_description} - -This package contains library source intended for building other packages which -use the "indoc" feature of the "%{crate}" crate. - -%files -n %{name}+indoc-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+interception_driver-devel Summary: %{summary} BuildArch: noarch @@ -115,18 +115,6 @@ use the "interception_driver" feature of the "%{crate}" crate. %files -n %{name}+interception_driver-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+open-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+open-devel %{_description} - -This package contains library source intended for building other packages which -use the "open" feature of the "%{crate}" crate. - -%files -n %{name}+open-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+passthru_ahk-devel Summary: %{summary} BuildArch: noarch @@ -151,18 +139,6 @@ use the "perf_logging" feature of the "%{crate}" crate. %files -n %{name}+perf_logging-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+serde_json-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+serde_json-devel %{_description} - -This package contains library source intended for building other packages which -use the "serde_json" feature of the "%{crate}" crate. - -%files -n %{name}+serde_json-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+simulated_input-devel Summary: %{summary} BuildArch: noarch @@ -199,18 +175,6 @@ use the "tcp_server" feature of the "%{crate}" crate. %files -n %{name}+tcp_server-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+wasm-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+wasm-devel %{_description} - -This package contains library source intended for building other packages which -use the "wasm" feature of the "%{crate}" crate. - -%files -n %{name}+wasm-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+win_llhook_read_scancodes-devel Summary: %{summary} BuildArch: noarch @@ -247,6 +211,18 @@ use the "win_sendinput_send_scancodes" feature of the "%{crate}" crate. %files -n %{name}+win_sendinput_send_scancodes-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+winiov2-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+winiov2-devel %{_description} + +This package contains library source intended for building other packages which +use the "winiov2" feature of the "%{crate}" crate. + +%files -n %{name}+winiov2-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+zippychord-devel Summary: %{summary} BuildArch: noarch