From: RunningDroid <RunningDroid@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] qflipper: update to 1.1.3.
Date: Sat, 17 Sep 2022 09:48:51 +0200 [thread overview]
Message-ID: <20220917074851.c0BHs4asnyshS7XUqHgBFph4Rz4hJXiuCXhuyDGRpvM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39325@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1527 bytes --]
There is an updated pull request by RunningDroid against master on the void-packages repository
https://github.com/RunningDroid/void-packages update_qflipper
https://github.com/void-linux/void-packages/pull/39325
qflipper: update to 1.1.3.
- disable building on i686 and point to upstream bug: https://github.com/flipperdevices/qFlipper/issues/120
- add configure args that upstream recommends: https://github.com/flipperdevices/qFlipper#standalone-build
- add configure arg to disable update checker
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/39325.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_qflipper-39325.patch --]
[-- Type: text/x-diff, Size: 1993 bytes --]
From 55041756b4df92824f8614603971a5e8e9464f73 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Thu, 1 Sep 2022 01:58:23 -0400
Subject: [PATCH] qflipper: update to 1.1.3.
- disable building on i686 and point to upstream bug
https://github.com/flipperdevices/qFlipper/issues/120
- add configure args that upstream recommends:
https://github.com/flipperdevices/qFlipper#standalone-build
- add configure arg to disable update checker
---
srcpkgs/qflipper/template | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qflipper/template b/srcpkgs/qflipper/template
index 351e7d35fdaf..2fca433477d9 100644
--- a/srcpkgs/qflipper/template
+++ b/srcpkgs/qflipper/template
@@ -1,10 +1,12 @@
# Template file for 'qflipper'
pkgname=qflipper
-version=1.1.0
+version=1.1.3
revision=1
_nanopb_version=0.4.5
+archs="~i686" #https://github.com/flipperdevices/qFlipper/issues/120
wrksrc="qFlipper-${version}"
build_style=qmake
+configure_args="-spec linux-g++ CONFIG+=qtquickcompiler DEFINES+=DISABLE_APPLICATION_UPDATES"
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"
@@ -14,9 +16,13 @@ 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/${_nanopb_version}.tar.gz"
-checksum="ccafe9b7e4f6c0cabe6e030dae7b0672062bdee048f461aa3429cde5371ef6c2
+checksum="eccdca2ad8afc4207b677dffd0ffd4d55a34b87191ffd79ae212804e484a7a5a
7d57ebcf26885c9758f95f26bf06d366744599f9a2ff4de477a348eb13e7a7d8"
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" qt5-serialport-devel qt5-quickcontrols2-devel qt5-svg-devel qt5-declarative-devel"
+fi
+
post_extract() {
rmdir 3rdparty/nanopb
ln -s ../../nanopb-0.4.5 3rdparty/nanopb
next prev parent reply other threads:[~2022-09-17 7:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-17 6:17 [PR PATCH] " RunningDroid
2022-09-17 6:19 ` [PR PATCH] [Updated] " RunningDroid
2022-09-17 7:48 ` RunningDroid [this message]
2022-09-18 5:01 ` [PR REVIEW] " sgn
2022-09-18 5:03 ` sgn
2022-09-18 5:04 ` sgn
2022-09-18 12:03 ` sgn
2022-09-18 12:21 ` [PR REVIEW] " sgn
2022-09-18 13:25 ` [PR PATCH] [Updated] " sgn
2022-09-18 13:26 ` sgn
2022-09-18 13:35 ` [PR PATCH] [Merged]: " sgn
2022-09-18 23:17 ` [PR REVIEW] " RunningDroid
2022-09-19 1:02 ` sgn
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=20220917074851.c0BHs4asnyshS7XUqHgBFph4Rz4hJXiuCXhuyDGRpvM@z \
--to=runningdroid@users.noreply.github.com \
--cc=ml@inbox.vuxu.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;
as well as URLs for NNTP newsgroup(s).