From: z0noxz <z0noxz@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Electron-Cash: update to 4.1.1
Date: Wed, 30 Sep 2020 09:07:45 +0200 [thread overview]
Message-ID: <20200930070745.jI_CNUD_z9PQjPVc2xF4zNP_jka6qJIi9weEfUJHnjs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22900@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 374 bytes --]
There is an updated pull request by z0noxz against master on the void-packages repository
https://github.com/z0noxz/void-packages Electron-Cash-4.0.15
https://github.com/void-linux/void-packages/pull/22900
Electron-Cash: update to 4.1.1
Signed-off-by: Chris Noxz <chris@noxz.tech>
A patch file from https://github.com/void-linux/void-packages/pull/22900.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-Electron-Cash-4.0.15-22900.patch --]
[-- Type: text/x-diff, Size: 6468 bytes --]
From 32981d5fb91164ce69c58531d55abc624c6a90b3 Mon Sep 17 00:00:00 2001
From: Chris Noxz <chris@noxz.tech>
Date: Sun, 14 Jun 2020 20:07:39 +0200
Subject: [PATCH 1/6] Electron-Cash: update to 4.1.1
Signed-off-by: Chris Noxz <chris@noxz.tech>
---
srcpkgs/Electron-Cash/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/Electron-Cash/template b/srcpkgs/Electron-Cash/template
index 6cf5a5db45c..8a3583209d3 100644
--- a/srcpkgs/Electron-Cash/template
+++ b/srcpkgs/Electron-Cash/template
@@ -1,8 +1,7 @@
# Template file for 'Electron-Cash'
pkgname=Electron-Cash
-version=4.0.12
+version=4.1.1
revision=1
-archs=noarch
build_style=python3-module
hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
depends="python3-PyQt5 python3-PyQt5-svg python3-qrcode python3-dateutil
@@ -14,7 +13,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="MIT"
homepage="https://electroncash.org"
distfiles="https://github.com/Electron-Cash/Electron-Cash/releases/download/${version}/Electron-Cash-${version}.tar.gz"
-checksum=befcedee8e7d5f4a1f2a012c97d8b0f0b452728145ce9d398a1aec69b7f126c7
+checksum=bfab25545cee3309037aa4849fe418c6f59e5e899aa1de1c73ea05957ce914ea
post_install() {
for lib in zbar secp256k1; do
From 10624cdedabedbec129eb807e6bcb26341b76125 Mon Sep 17 00:00:00 2001
From: Chris Noxz <chris@noxz.tech>
Date: Wed, 30 Sep 2020 08:47:31 +0200
Subject: [PATCH 2/6] fix for arm
---
srcpkgs/Electron-Cash/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/Electron-Cash/template b/srcpkgs/Electron-Cash/template
index 8a3583209d3..2f471178f6d 100644
--- a/srcpkgs/Electron-Cash/template
+++ b/srcpkgs/Electron-Cash/template
@@ -16,6 +16,10 @@ distfiles="https://github.com/Electron-Cash/Electron-Cash/releases/download/${ve
checksum=bfab25545cee3309037aa4849fe418c6f59e5e899aa1de1c73ea05957ce914ea
post_install() {
+ case "$XBPS_TARGET_MACHINE" in
+ arm*|aarch*)
+ rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/tor/bin/tor"
+ esac
for lib in zbar secp256k1; do
rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/lib${lib}.so.0"
done
From 45a9fed969b6a02012d200bdef19fc3892cd1d11 Mon Sep 17 00:00:00 2001
From: Chris Noxz <chris@noxz.tech>
Date: Wed, 30 Sep 2020 08:51:50 +0200
Subject: [PATCH 3/6] fix for arm, break the case
---
srcpkgs/Electron-Cash/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Electron-Cash/template b/srcpkgs/Electron-Cash/template
index 2f471178f6d..a04add6fe1f 100644
--- a/srcpkgs/Electron-Cash/template
+++ b/srcpkgs/Electron-Cash/template
@@ -18,7 +18,7 @@ checksum=bfab25545cee3309037aa4849fe418c6f59e5e899aa1de1c73ea05957ce914ea
post_install() {
case "$XBPS_TARGET_MACHINE" in
arm*|aarch*)
- rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/tor/bin/tor"
+ rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/tor/bin/tor" ;;
esac
for lib in zbar secp256k1; do
rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/lib${lib}.so.0"
From 54ac31be9c02486fde914c467c6bfaf3cc048d2a Mon Sep 17 00:00:00 2001
From: Chris Noxz <chris@noxz.tech>
Date: Wed, 30 Sep 2020 08:59:50 +0200
Subject: [PATCH 4/6] fix for arm, add a comment
---
srcpkgs/Electron-Cash/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/Electron-Cash/template b/srcpkgs/Electron-Cash/template
index a04add6fe1f..90fa6d6b259 100644
--- a/srcpkgs/Electron-Cash/template
+++ b/srcpkgs/Electron-Cash/template
@@ -16,10 +16,14 @@ distfiles="https://github.com/Electron-Cash/Electron-Cash/releases/download/${ve
checksum=bfab25545cee3309037aa4849fe418c6f59e5e899aa1de1c73ea05957ce914ea
post_install() {
+ # On arm the step 06-strip-and-debug-pkgs fails as the binary bin/tor isn't
+ # built for arm. A fix for now is to remove it until a better solution can
+ # be found.
case "$XBPS_TARGET_MACHINE" in
arm*|aarch*)
rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/tor/bin/tor" ;;
esac
+
for lib in zbar secp256k1; do
rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/lib${lib}.so.0"
done
From e8459b5e9fc4ed74007438153e55fa3b9505ebd1 Mon Sep 17 00:00:00 2001
From: Chris Noxz <chris@noxz.tech>
Date: Wed, 30 Sep 2020 09:05:34 +0200
Subject: [PATCH 5/6] fix for arm, ...
---
srcpkgs/Electron-Cash/template | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/Electron-Cash/template b/srcpkgs/Electron-Cash/template
index 90fa6d6b259..bab73a0d002 100644
--- a/srcpkgs/Electron-Cash/template
+++ b/srcpkgs/Electron-Cash/template
@@ -16,13 +16,8 @@ distfiles="https://github.com/Electron-Cash/Electron-Cash/releases/download/${ve
checksum=bfab25545cee3309037aa4849fe418c6f59e5e899aa1de1c73ea05957ce914ea
post_install() {
- # On arm the step 06-strip-and-debug-pkgs fails as the binary bin/tor isn't
- # built for arm. A fix for now is to remove it until a better solution can
- # be found.
- case "$XBPS_TARGET_MACHINE" in
- arm*|aarch*)
- rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/tor/bin/tor" ;;
- esac
+ # TODO: build these binaries instead of having to remove pre-built ones
+ rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/tor/bin/tor" ;;
for lib in zbar secp256k1; do
rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/lib${lib}.so.0"
From 6699f7b44c9832f7cac29c16cc889df4031a7cc3 Mon Sep 17 00:00:00 2001
From: Chris Noxz <chris@noxz.tech>
Date: Wed, 30 Sep 2020 09:07:25 +0200
Subject: [PATCH 6/6] fix for arm, ...
---
srcpkgs/Electron-Cash/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Electron-Cash/template b/srcpkgs/Electron-Cash/template
index bab73a0d002..a498b199a61 100644
--- a/srcpkgs/Electron-Cash/template
+++ b/srcpkgs/Electron-Cash/template
@@ -17,7 +17,7 @@ checksum=bfab25545cee3309037aa4849fe418c6f59e5e899aa1de1c73ea05957ce914ea
post_install() {
# TODO: build these binaries instead of having to remove pre-built ones
- rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/tor/bin/tor" ;;
+ rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/tor/bin/tor"
for lib in zbar secp256k1; do
rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/lib${lib}.so.0"
next prev parent reply other threads:[~2020-09-30 7:07 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22900@inbox.vuxu.org>
2020-09-29 13:20 ` [PR PATCH] [Updated] Electron-Cash: update to 4.0.15 z0noxz
2020-09-29 13:22 ` Electron-Cash: update to 4.1.1 z0noxz
2020-09-29 13:26 ` [PR REVIEW] " ericonr
2020-09-29 13:29 ` [PR PATCH] [Updated] " z0noxz
2020-09-29 13:30 ` [PR REVIEW] " z0noxz
2020-09-29 13:36 ` ericonr
2020-09-29 13:38 ` z0noxz
2020-09-29 13:40 ` ericonr
2020-09-29 13:46 ` z0noxz
2020-09-29 13:51 ` ericonr
2020-09-29 14:00 ` [PR PATCH] [Updated] " z0noxz
2020-09-29 15:49 ` z0noxz
2020-09-29 16:01 ` z0noxz
2020-09-29 17:23 ` z0noxz
2020-09-29 17:32 ` ericonr
2020-09-29 17:34 ` ericonr
2020-09-29 17:43 ` z0noxz
2020-09-29 17:53 ` ericonr
2020-09-29 17:56 ` z0noxz
2020-09-30 6:48 ` [PR PATCH] [Updated] " z0noxz
2020-09-30 6:49 ` z0noxz
2020-09-30 6:52 ` [PR PATCH] [Updated] " z0noxz
2020-09-30 7:00 ` z0noxz
2020-09-30 7:02 ` [PR REVIEW] " ericonr
2020-09-30 7:05 ` z0noxz
2020-09-30 7:05 ` [PR PATCH] [Updated] " z0noxz
2020-09-30 7:07 ` z0noxz [this message]
2020-09-30 8:00 ` z0noxz
2020-09-30 8:13 ` z0noxz
2020-10-04 16:35 ` z0noxz
2020-10-04 17:46 ` ericonr
2020-10-04 17:46 ` [PR PATCH] [Merged]: " ericonr
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=20200930070745.jI_CNUD_z9PQjPVc2xF4zNP_jka6qJIi9weEfUJHnjs@z \
--to=z0noxz@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).