From 32981d5fb91164ce69c58531d55abc624c6a90b3 Mon Sep 17 00:00:00 2001 From: Chris Noxz 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 --- 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 " 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 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 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 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 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 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"