[PR PATCH] qflipper: fix cross, improve template

[PR PATCH] qflipper: fix cross, improve template

[paper42]

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

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages qflipper-cross
https://github.com/void-linux/void-packages/pull/37616

qflipper: fix cross, improve template
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (only build-tested)

cc @Vaelatern

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qflipper-cross-37616.patch --]
[-- Type: text/x-diff, Size: 1950 bytes --]

From d5cee5eb40f48388e87e517815a1245878a1c7f3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 19 Jun 2022 23:02:28 +0200
Subject: [PATCH] qflipper: fix cross, improve template

---
 srcpkgs/qflipper/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/qflipper/template b/srcpkgs/qflipper/template
index e6dca500c280..351e7d35fdaf 100644
--- a/srcpkgs/qflipper/template
+++ b/srcpkgs/qflipper/template
@@ -2,14 +2,10 @@
 pkgname=qflipper
 version=1.1.0
 revision=1
+_nanopb_version=0.4.5
 wrksrc="qFlipper-${version}"
 build_style=qmake
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
-hostmakedepends="qt5-qmake pkgconf"
+hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
 makedepends="qt5-devel qt5-serialport-devel libusb-devel qt5-quickcontrols2-devel qt5-svg-devel qt5-declarative-devel"
 depends="qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Desktop application for updating Flipper Zero firmware via PC"
@@ -17,7 +13,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://flipperzero.one"
 distfiles="https://github.com/flipperdevices/qFlipper/archive/refs/tags/${version}.tar.gz
- https://github.com/nanopb/nanopb/archive/refs/tags/0.4.5.tar.gz"
+ https://github.com/nanopb/nanopb/archive/refs/tags/${_nanopb_version}.tar.gz"
 checksum="ccafe9b7e4f6c0cabe6e030dae7b0672062bdee048f461aa3429cde5371ef6c2
  7d57ebcf26885c9758f95f26bf06d366744599f9a2ff4de477a348eb13e7a7d8"
 
@@ -25,7 +21,7 @@ post_extract() {
 	rmdir 3rdparty/nanopb
 	ln -s ../../nanopb-0.4.5 3rdparty/nanopb
 	assemble_date="$(date -d "$(stat --printf=%y qflipper_common.pri)" +%s)"
-	sed -i qflipper_common.pri \
+	vsed -i qflipper_common.pri \
 		-e "s/\$\$GIT_VERSION/${version}/" \
 		-e "s/\$\$GIT_COMMIT/unavailable/" \
 		-e "s/\$\$GIT_TIMESTAMP/${assemble_date}/" \

Re: [PR PATCH] [Merged]: qflipper: fix cross, improve template

[Vaelatern]

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

There's a merged pull request on the void-packages repository

qflipper: fix cross, improve template
https://github.com/void-linux/void-packages/pull/37616

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (only build-tested)

cc @Vaelatern

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->