* [PR PATCH] qflipper: update to 1.1.3.
@ 2022-09-17 6:17 RunningDroid
2022-09-17 6:19 ` [PR PATCH] [Updated] " RunningDroid
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: RunningDroid @ 2022-09-17 6:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1522 bytes --]
There is a new 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: 1725 bytes --]
From 98d829ac9caac7ea3265b12a92a27ccf5c5d266b 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
- add configure args that upstream recommends: https://github.com/flipperdevices/qFlipper#standalone-build
- add configure arg to disable update checker
---
srcpkgs/qflipper/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qflipper/template b/srcpkgs/qflipper/template
index 351e7d35fdaf..4b5c7c886135 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,7 +16,7 @@ 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"
post_extract() {
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] qflipper: update to 1.1.3.
2022-09-17 6:17 [PR PATCH] qflipper: update to 1.1.3 RunningDroid
@ 2022-09-17 6:19 ` RunningDroid
2022-09-17 7:48 ` RunningDroid
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: RunningDroid @ 2022-09-17 6:19 UTC (permalink / raw)
To: ml
[-- 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: 1781 bytes --]
From c79cd5b3a5c44c5b19fe9a27397e16c73a39bd19 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 | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qflipper/template b/srcpkgs/qflipper/template
index 351e7d35fdaf..4b5c7c886135 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,7 +16,7 @@ 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"
post_extract() {
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] qflipper: update to 1.1.3.
2022-09-17 6:17 [PR PATCH] qflipper: update to 1.1.3 RunningDroid
2022-09-17 6:19 ` [PR PATCH] [Updated] " RunningDroid
@ 2022-09-17 7:48 ` RunningDroid
2022-09-18 5:01 ` [PR REVIEW] " sgn
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: RunningDroid @ 2022-09-17 7:48 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR REVIEW] qflipper: update to 1.1.3.
2022-09-17 6:17 [PR PATCH] qflipper: update to 1.1.3 RunningDroid
2022-09-17 6:19 ` [PR PATCH] [Updated] " RunningDroid
2022-09-17 7:48 ` RunningDroid
@ 2022-09-18 5:01 ` sgn
2022-09-18 5:03 ` sgn
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: sgn @ 2022-09-18 5:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/39325#discussion_r973660333
Comment:
Remove `-spec`
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR REVIEW] qflipper: update to 1.1.3.
2022-09-17 6:17 [PR PATCH] qflipper: update to 1.1.3 RunningDroid
` (2 preceding siblings ...)
2022-09-18 5:01 ` [PR REVIEW] " sgn
@ 2022-09-18 5:03 ` sgn
2022-09-18 5:04 ` sgn
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: sgn @ 2022-09-18 5:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 181 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/39325#discussion_r973660486
Comment:
How come it's buildable for arm 32bit?
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: qflipper: update to 1.1.3.
2022-09-17 6:17 [PR PATCH] qflipper: update to 1.1.3 RunningDroid
` (3 preceding siblings ...)
2022-09-18 5:03 ` sgn
@ 2022-09-18 5:04 ` sgn
2022-09-18 12:03 ` sgn
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: sgn @ 2022-09-18 5:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 164 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/39325#issuecomment-1250192296
Comment:
Anyway, move to qt6 please
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: qflipper: update to 1.1.3.
2022-09-17 6:17 [PR PATCH] qflipper: update to 1.1.3 RunningDroid
` (4 preceding siblings ...)
2022-09-18 5:04 ` sgn
@ 2022-09-18 12:03 ` sgn
2022-09-18 12:21 ` [PR REVIEW] " sgn
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: sgn @ 2022-09-18 12:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 164 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/39325#issuecomment-1250192296
Comment:
Anyway, move to qt6 please
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR REVIEW] qflipper: update to 1.1.3.
2022-09-17 6:17 [PR PATCH] qflipper: update to 1.1.3 RunningDroid
` (5 preceding siblings ...)
2022-09-18 12:03 ` sgn
@ 2022-09-18 12:21 ` sgn
2022-09-18 13:25 ` [PR PATCH] [Updated] " sgn
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: sgn @ 2022-09-18 12:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/39325#discussion_r973712346
Comment:
Well, because you're doing it wrong. Those addition `*-devel` packages in `hostmakedepends` is wrong!!
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] qflipper: update to 1.1.3.
2022-09-17 6:17 [PR PATCH] qflipper: update to 1.1.3 RunningDroid
` (6 preceding siblings ...)
2022-09-18 12:21 ` [PR REVIEW] " sgn
@ 2022-09-18 13:25 ` sgn
2022-09-18 13:26 ` sgn
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: sgn @ 2022-09-18 13:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1518 bytes --]
There is an updated pull request by sgn 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: 2823 bytes --]
From a21ad60beb50c46bac6b0df1105575f16fb85264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 18 Sep 2022 20:24:53 +0700
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
Close: #39325
---
srcpkgs/qflipper/patches/fix-build-32-bit.patch | 10 ++++++++++
srcpkgs/qflipper/template | 11 ++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/qflipper/patches/fix-build-32-bit.patch
diff --git a/srcpkgs/qflipper/patches/fix-build-32-bit.patch b/srcpkgs/qflipper/patches/fix-build-32-bit.patch
new file mode 100644
index 000000000000..cd93b8440b40
--- /dev/null
+++ b/srcpkgs/qflipper/patches/fix-build-32-bit.patch
@@ -0,0 +1,10 @@
+--- a/dfu/device/stm32wb55/infotable.h
++++ b/dfu/device/stm32wb55/infotable.h
+@@ -52,6 +52,7 @@ struct FUSDeviceInfoTable
+ uint32_t reserved2;
+ uint64_t UID64;
+ uint16_t deviceID;
++ uint32_t padding_ /* padding for 32 bits build */;
+ };
+
+ struct DeviceInfoTable {
diff --git a/srcpkgs/qflipper/template b/srcpkgs/qflipper/template
index 351e7d35fdaf..cc2603745cd5 100644
--- a/srcpkgs/qflipper/template
+++ b/srcpkgs/qflipper/template
@@ -1,10 +1,11 @@
# Template file for 'qflipper'
pkgname=qflipper
-version=1.1.0
+version=1.1.3
revision=1
-_nanopb_version=0.4.5
+_nanopb_version=0.4.6
wrksrc="qFlipper-${version}"
build_style=qmake
+configure_args="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,12 +15,12 @@ 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
- 7d57ebcf26885c9758f95f26bf06d366744599f9a2ff4de477a348eb13e7a7d8"
+checksum="eccdca2ad8afc4207b677dffd0ffd4d55a34b87191ffd79ae212804e484a7a5a
+ caa97d55fb9c98b4cfa0b069acd9657f706e9629af0baeaefcae0a0e8c4a64d2"
post_extract() {
rmdir 3rdparty/nanopb
- ln -s ../../nanopb-0.4.5 3rdparty/nanopb
+ mv ../nanopb-${_nanopb_version} 3rdparty/nanopb
assemble_date="$(date -d "$(stat --printf=%y qflipper_common.pri)" +%s)"
vsed -i qflipper_common.pri \
-e "s/\$\$GIT_VERSION/${version}/" \
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] qflipper: update to 1.1.3.
2022-09-17 6:17 [PR PATCH] qflipper: update to 1.1.3 RunningDroid
` (7 preceding siblings ...)
2022-09-18 13:25 ` [PR PATCH] [Updated] " sgn
@ 2022-09-18 13:26 ` sgn
2022-09-18 13:35 ` [PR PATCH] [Merged]: " sgn
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: sgn @ 2022-09-18 13:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1518 bytes --]
There is an updated pull request by sgn 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: 2546 bytes --]
From c429ad09c175063d139c401d6daa435aef02a7f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 18 Sep 2022 20:24:53 +0700
Subject: [PATCH] qflipper: update to 1.1.3.
---
srcpkgs/qflipper/patches/fix-build-32-bit.patch | 10 ++++++++++
srcpkgs/qflipper/template | 11 ++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/qflipper/patches/fix-build-32-bit.patch
diff --git a/srcpkgs/qflipper/patches/fix-build-32-bit.patch b/srcpkgs/qflipper/patches/fix-build-32-bit.patch
new file mode 100644
index 000000000000..cd93b8440b40
--- /dev/null
+++ b/srcpkgs/qflipper/patches/fix-build-32-bit.patch
@@ -0,0 +1,10 @@
+--- a/dfu/device/stm32wb55/infotable.h
++++ b/dfu/device/stm32wb55/infotable.h
+@@ -52,6 +52,7 @@ struct FUSDeviceInfoTable
+ uint32_t reserved2;
+ uint64_t UID64;
+ uint16_t deviceID;
++ uint32_t padding_ /* padding for 32 bits build */;
+ };
+
+ struct DeviceInfoTable {
diff --git a/srcpkgs/qflipper/template b/srcpkgs/qflipper/template
index 351e7d35fdaf..cc2603745cd5 100644
--- a/srcpkgs/qflipper/template
+++ b/srcpkgs/qflipper/template
@@ -1,10 +1,11 @@
# Template file for 'qflipper'
pkgname=qflipper
-version=1.1.0
+version=1.1.3
revision=1
-_nanopb_version=0.4.5
+_nanopb_version=0.4.6
wrksrc="qFlipper-${version}"
build_style=qmake
+configure_args="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,12 +15,12 @@ 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
- 7d57ebcf26885c9758f95f26bf06d366744599f9a2ff4de477a348eb13e7a7d8"
+checksum="eccdca2ad8afc4207b677dffd0ffd4d55a34b87191ffd79ae212804e484a7a5a
+ caa97d55fb9c98b4cfa0b069acd9657f706e9629af0baeaefcae0a0e8c4a64d2"
post_extract() {
rmdir 3rdparty/nanopb
- ln -s ../../nanopb-0.4.5 3rdparty/nanopb
+ mv ../nanopb-${_nanopb_version} 3rdparty/nanopb
assemble_date="$(date -d "$(stat --printf=%y qflipper_common.pri)" +%s)"
vsed -i qflipper_common.pri \
-e "s/\$\$GIT_VERSION/${version}/" \
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Merged]: qflipper: update to 1.1.3.
2022-09-17 6:17 [PR PATCH] qflipper: update to 1.1.3 RunningDroid
` (8 preceding siblings ...)
2022-09-18 13:26 ` sgn
@ 2022-09-18 13:35 ` sgn
2022-09-18 23:17 ` [PR REVIEW] " RunningDroid
2022-09-19 1:02 ` sgn
11 siblings, 0 replies; 13+ messages in thread
From: sgn @ 2022-09-18 13:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1353 bytes --]
There's a merged pull request on the void-packages repository
qflipper: update to 1.1.3.
https://github.com/void-linux/void-packages/pull/39325
Description:
- 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
-->
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR REVIEW] qflipper: update to 1.1.3.
2022-09-17 6:17 [PR PATCH] qflipper: update to 1.1.3 RunningDroid
` (9 preceding siblings ...)
2022-09-18 13:35 ` [PR PATCH] [Merged]: " sgn
@ 2022-09-18 23:17 ` RunningDroid
2022-09-19 1:02 ` sgn
11 siblings, 0 replies; 13+ messages in thread
From: RunningDroid @ 2022-09-18 23:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 360 bytes --]
New review comment by RunningDroid on void-packages repository
https://github.com/void-linux/void-packages/pull/39325#discussion_r973794905
Comment:
Sorry, I added the `*-devel` packages to `hostmakedepends` because the cross builds on my machine were complaining about being unable to find the QT modules for those packages and that appeared to resolve it.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR REVIEW] qflipper: update to 1.1.3.
2022-09-17 6:17 [PR PATCH] qflipper: update to 1.1.3 RunningDroid
` (10 preceding siblings ...)
2022-09-18 23:17 ` [PR REVIEW] " RunningDroid
@ 2022-09-19 1:02 ` sgn
11 siblings, 0 replies; 13+ messages in thread
From: sgn @ 2022-09-19 1:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 329 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/39325#discussion_r973808337
Comment:
Don't add `-spec` into configure args, it will be set by `build-style` and some magic needs to be done for cross compilation.
In the end of the day, it will use same spec with linux-g++
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2022-09-19 1:02 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-17 6:17 [PR PATCH] qflipper: update to 1.1.3 RunningDroid
2022-09-17 6:19 ` [PR PATCH] [Updated] " RunningDroid
2022-09-17 7:48 ` RunningDroid
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
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).