pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/finance/electrum electrum: do not check version of aio...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1361af63e431
branches:  trunk
changeset: 770143:1361af63e431
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Nov 25 19:52:43 2021 +0000

description:
electrum: do not check version of aiorpcX

diffstat:

 finance/electrum/Makefile                        |   7 +++++--
 finance/electrum/distinfo                        |   3 ++-
 finance/electrum/patches/patch-electrum_electrum |  15 +++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diffs (60 lines):

diff -r ad0471be7b19 -r 1361af63e431 finance/electrum/Makefile
--- a/finance/electrum/Makefile Thu Nov 25 19:51:19 2021 +0000
+++ b/finance/electrum/Makefile Thu Nov 25 19:52:43 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/11/25 08:51:23 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2021/11/25 19:52:43 adam Exp $
 
 VERSION=       4.1.5
 DISTNAME=      Electrum-${VERSION}
@@ -23,7 +23,7 @@
 # Seems to work without qdarkstyle? Commented out as it's currently not packaged
 #DEPENDS+=     ${PYPKGPREFIX}-qdarkstyle<2.9:../../
 DEPENDS+=      ${PYPKGPREFIX}-aiorpcX>0.18:../../net/py-aiorpcX
-DEPENDS+=      ${PYPKGPREFIX}-aiohttp>=3.3.0<4.0.0:../../www/py-aiohttp
+DEPENDS+=      ${PYPKGPREFIX}-aiohttp>=3.3.0:../../www/py-aiohttp
 DEPENDS+=      ${PYPKGPREFIX}-aiohttp-socks>=0.3:../../www/py-aiohttp-socks
 DEPENDS+=      ${PYPKGPREFIX}-certifi-[0-9]*:../../security/py-certifi
 DEPENDS+=      ${PYPKGPREFIX}-bitstring-[0-9]*:../../devel/py-bitstring
@@ -33,6 +33,9 @@
 REPLACE_PYTHON+=       electrum/electrum
 REPLACE_PYTHON+=       electrum/scripts/*.py
 
+post-install:
+       ${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/electrum/electrum.orig
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff -r ad0471be7b19 -r 1361af63e431 finance/electrum/distinfo
--- a/finance/electrum/distinfo Thu Nov 25 19:51:19 2021 +0000
+++ b/finance/electrum/distinfo Thu Nov 25 19:52:43 2021 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2021/11/08 16:37:04 cirnatdan Exp $
+$NetBSD: distinfo,v 1.8 2021/11/25 19:52:43 adam Exp $
 
 BLAKE2s (Electrum-4.1.5.tar.gz) = f9a35a7671bb8dfae3e04d9cbbda657cc2919595bc1b2923f87bab883df11580
 SHA512 (Electrum-4.1.5.tar.gz) = fbffd2366c8521e37da21dce0a59ca140f63635df5a2f31d5faafbc1267384bc6c76f66502a19cdcb4d4100f249c12bc336a54795a8b840bf299b5fda4bc1c8e
 Size (Electrum-4.1.5.tar.gz) = 12066769 bytes
 SHA1 (patch-electrum-ecc_fast.py) = 3e500f6b8fda61ae757a1ae6072b66449ab55883
+SHA1 (patch-electrum_electrum) = 3e5bdea8f1af7d3ce72e4043a9d0439c45de6694
 SHA1 (patch-setup.py) = 7f6472a2278073c15cdfe4c25f911871165b085f
diff -r ad0471be7b19 -r 1361af63e431 finance/electrum/patches/patch-electrum_electrum
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/finance/electrum/patches/patch-electrum_electrum  Thu Nov 25 19:52:43 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-electrum_electrum,v 1.1 2021/11/25 19:52:43 adam Exp $
+
+Allow newer py-aiorpcX.
+
+--- electrum/electrum.orig     2021-11-25 08:44:10.000000000 +0000
++++ electrum/electrum
+@@ -63,8 +63,6 @@ def check_imports():
+         import aiorpcx
+     except ImportError as e:
+         sys.exit(f"Error: {str(e)}. Try 'sudo python3 -m pip install <module-name>'")
+-    if not ((0, 18, 7) <= aiorpcx._version < (0, 19)):
+-        raise RuntimeError(f'aiorpcX version {aiorpcx._version} does not match required: 0.18.7<=ver<0.19')
+     # the following imports are for pyinstaller
+     from google.protobuf import descriptor
+     from google.protobuf import message



Home | Main Index | Thread Index | Old Index