Re: [PR PATCH] [Updated] qmk: update to 1.0.0.

[reedts <reedts@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]

There is an updated pull request by reedts against master on the void-packages repository

https://github.com/reedts/void-packages qmk_1.0.0
https://github.com/void-linux/void-packages/pull/32685

qmk: update to 1.0.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32685.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qmk_1.0.0-32685.patch --]
[-- Type: text/x-diff, Size: 2305 bytes --]

From 7aa0f879c695b69dddfbb123f830a4f99ded8741 Mon Sep 17 00:00:00 2001
From: reedts <j.reedts@gmail.com>
Date: Thu, 26 Aug 2021 13:13:45 +0200
Subject: [PATCH 1/2] qmk: update to 1.0.0.

---
 srcpkgs/qmk/template | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/qmk/template b/srcpkgs/qmk/template
index 033ff91fa1ff..cd717f840b82 100644
--- a/srcpkgs/qmk/template
+++ b/srcpkgs/qmk/template
@@ -1,27 +1,20 @@
 # Template file for 'qmk'
 pkgname=qmk
-version=0.0.35
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-appdirs
- python3-argcomplete
- python3-colorama
- python3-hjson
- python3-nose2
- flake8
- python3-yapf
- dfu-programmer
- avrdude
- dfu-util
- avr-gcc
- cross-arm-none-eabi"
+version=1.0.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-wheel"
+depends="avrdude dfu-programmer dfu-util avr-gcc hidapi"
 short_desc="CLI tool for working with QMK firmware of mechanical keyboards"
 maintainer="RinsedSloth <afernandezh@protonmail.com>"
 license="MIT"
 homepage="https://github.com/qmk/qmk_cli"
 distfiles="${PYPI_SITE}/q/qmk/qmk-${version}.tar.gz"
-checksum=e704ca31cdca264bfdd99c72a4849a9e9762043e4bf328118c49af92d1c0a3b5
+checksum=da62eec73c4548cc37b0b9be3937202dc3a301dc2f2663610ecca751a610f9ca
+
+if [ -z "$CROSS_BUILD" ]; then
+	depends+=" cross-arm-none-eabi"
+fi
 
 post_install() {
 	vlicense LICENSE

From c8995b8a03163465ff01bfe816e2625578793ce3 Mon Sep 17 00:00:00 2001
From: reedts <j.reedts@gmail.com>
Date: Mon, 30 Aug 2021 20:34:00 +0200
Subject: [PATCH 2/2] Use target arch to determine additional dependency

---
 srcpkgs/qmk/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qmk/template b/srcpkgs/qmk/template
index cd717f840b82..37803c62eea8 100644
--- a/srcpkgs/qmk/template
+++ b/srcpkgs/qmk/template
@@ -12,9 +12,11 @@ homepage="https://github.com/qmk/qmk_cli"
 distfiles="${PYPI_SITE}/q/qmk/qmk-${version}.tar.gz"
 checksum=da62eec73c4548cc37b0b9be3937202dc3a301dc2f2663610ecca751a610f9ca
 
-if [ -z "$CROSS_BUILD" ]; then
-	depends+=" cross-arm-none-eabi"
-fi
+case "$XBPS_TARGET_MACHINE" in
+	ppc*|i686*|x86_64*)
+		depends+=" cross-arm-none-eabi"
+		;;
+esac
 
 post_install() {
 	vlicense LICENSE