From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] rpi-imager: fix ftbfs
Date: Sun, 22 Nov 2020 07:08:37 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26597@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages rpi-image-fix-ftbfs
https://github.com/void-linux/void-packages/pull/26597
rpi-imager: fix ftbfs
A patch file from https://github.com/void-linux/void-packages/pull/26597.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpi-image-fix-ftbfs-26597.patch --]
[-- Type: text/x-diff, Size: 1462 bytes --]
From 2731d5f0ac722c0784a8d35e68043769f70534cc 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, 22 Nov 2020 13:05:15 +0700
Subject: [PATCH] rpi-imager: fix ftbfs
---
srcpkgs/rpi-imager/template | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 799d3803c03..f50227c753a 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -3,8 +3,9 @@ pkgname=rpi-imager
version=1.4
revision=1
build_style=cmake
-hostmakedepends="qt5-devel"
-makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel libcurl-devel libarchive-devel util-linux"
+hostmakedepends="qt5-host-tools qt5-qmake"
+makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel
+ libcurl-devel libarchive-devel"
depends="qt5-quickcontrols2 qt5-svg util-linux"
short_desc="Raspberry Pi Imaging Utility"
maintainer="Adam Gausmann <agausmann@fastmail.com>"
@@ -12,3 +13,11 @@ license="Apache-2.0"
homepage="https://github.com/raspberrypi/rpi-imager"
distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
checksum="f42359fca67a61fa37f0dfd0167749b7d758263b8501c07473d416542d78e004"
+
+post_patch() {
+ vsed -i -e 's/CURL REQUIRED \([0-9.]*\)/CURL \1 REQUIRED/' CMakeLists.txt
+}
+
+pre_configure() {
+ ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
+}
next reply other threads:[~2020-11-22 6:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-22 6:08 sgn [this message]
2020-11-22 6:20 ` [PR PATCH] [Closed]: " the-maldridge
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26597@inbox.vuxu.org \
--to=sgn@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).