Date: Wednesday, November 17, 2021 @ 18:29:37 Author: sangy Revision: 1050330
archrelease: copy trunk to community-any Added: electrum/repos/community-any/0001-prevent-requirements.txt-from-being-installed-to-usr.patch (from rev 1050329, electrum/trunk/0001-prevent-requirements.txt-from-being-installed-to-usr.patch) electrum/repos/community-any/PKGBUILD (from rev 1050329, electrum/trunk/PKGBUILD) Deleted: electrum/repos/community-any/0001-prevent-requirements.txt-from-being-installed-to-usr.patch electrum/repos/community-any/PKGBUILD -----------------------------------------------------------------+ 0001-prevent-requirements.txt-from-being-installed-to-usr.patch | 78 +++---- PKGBUILD | 101 ++++------ 2 files changed, 88 insertions(+), 91 deletions(-) Deleted: 0001-prevent-requirements.txt-from-being-installed-to-usr.patch =================================================================== --- 0001-prevent-requirements.txt-from-being-installed-to-usr.patch 2021-11-17 18:28:47 UTC (rev 1050329) +++ 0001-prevent-requirements.txt-from-being-installed-to-usr.patch 2021-11-17 18:29:37 UTC (rev 1050330) @@ -1,39 +0,0 @@ -From e72947c8fd50575d69cb005a52f99aeef66f4186 Mon Sep 17 00:00:00 2001 -From: Marcel O'Neil <mar...@marceloneil.com> -Date: Wed, 7 Mar 2018 15:15:54 -0500 -Subject: [PATCH] prevent requirements.txt from being installed to /usr - ---- - MANIFEST.in | 2 ++ - setup.py | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/MANIFEST.in b/MANIFEST.in -index 4fa5491a..b7355bd9 100644 ---- a/MANIFEST.in -+++ b/MANIFEST.in -@@ -4,6 +4,8 @@ include electrum.conf.sample - include electrum.desktop - include *.py - include electrum -+include contrib/requirements/requirements.txt -+include contrib/requirements/requirements-hw.txt - recursive-include lib *.py - recursive-include gui *.py - recursive-include plugins *.py -diff --git a/setup.py b/setup.py -index 63581a61..030993b5 100755 ---- a/setup.py -+++ b/setup.py -@@ -20,7 +20,7 @@ version = imp.load_source('version', 'lib/version.py') - if sys.version_info[:3] < (3, 4, 0): - sys.exit("Error: Electrum requires Python version >= 3.4.0...") - --data_files = ['contrib/requirements/' + r for r in ['requirements.txt', 'requirements-hw.txt']] -+data_files = [] - - if platform.system() in ['Linux', 'FreeBSD', 'DragonFly']: - parser = argparse.ArgumentParser() --- -2.16.2 - Copied: electrum/repos/community-any/0001-prevent-requirements.txt-from-being-installed-to-usr.patch (from rev 1050329, electrum/trunk/0001-prevent-requirements.txt-from-being-installed-to-usr.patch) =================================================================== --- 0001-prevent-requirements.txt-from-being-installed-to-usr.patch (rev 0) +++ 0001-prevent-requirements.txt-from-being-installed-to-usr.patch 2021-11-17 18:29:37 UTC (rev 1050330) @@ -0,0 +1,39 @@ +From e72947c8fd50575d69cb005a52f99aeef66f4186 Mon Sep 17 00:00:00 2001 +From: Marcel O'Neil <mar...@marceloneil.com> +Date: Wed, 7 Mar 2018 15:15:54 -0500 +Subject: [PATCH] prevent requirements.txt from being installed to /usr + +--- + MANIFEST.in | 2 ++ + setup.py | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/MANIFEST.in b/MANIFEST.in +index 4fa5491a..b7355bd9 100644 +--- a/MANIFEST.in ++++ b/MANIFEST.in +@@ -4,6 +4,8 @@ include electrum.conf.sample + include electrum.desktop + include *.py + include electrum ++include contrib/requirements/requirements.txt ++include contrib/requirements/requirements-hw.txt + recursive-include lib *.py + recursive-include gui *.py + recursive-include plugins *.py +diff --git a/setup.py b/setup.py +index 63581a61..030993b5 100755 +--- a/setup.py ++++ b/setup.py +@@ -20,7 +20,7 @@ version = imp.load_source('version', 'lib/version.py') + if sys.version_info[:3] < (3, 4, 0): + sys.exit("Error: Electrum requires Python version >= 3.4.0...") + +-data_files = ['contrib/requirements/' + r for r in ['requirements.txt', 'requirements-hw.txt']] ++data_files = [] + + if platform.system() in ['Linux', 'FreeBSD', 'DragonFly']: + parser = argparse.ArgumentParser() +-- +2.16.2 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-11-17 18:28:47 UTC (rev 1050329) +++ PKGBUILD 2021-11-17 18:29:37 UTC (rev 1050330) @@ -1,52 +0,0 @@ -# Maintainer: Christian Rebischke <chris.rebisc...@archlinux.org> -# Co-Maintainer: Santiago Torres-Arias <santi...@archlinux.org> -# Contributor: Timothy Redaelli <timothy.redae...@gmail.com> -# Contributor: Andy Weidenbaum <archb...@gmail.com> - -pkgname=electrum -pkgver=4.1.3 -pkgrel=1 -pkgdesc="Lightweight Bitcoin wallet" -arch=('any') -makedepends=('python-setuptools') -depends=('python-pyaes' 'python-ecdsa' 'python-pbkdf2' 'python-requests' 'python-qrcode' - 'python-protobuf' 'python-dnspython' 'python-jsonrpclib-pelix' 'python-pysocks' - 'python-pyqt5' 'python-pycryptodomex' 'python-websocket-client' 'python-certifi' - 'python-aiorpcx' 'python-aiohttp' 'python-aiohttp-socks' - 'libsecp256k1' 'python-bitstring') -optdepends=('python-btchip: BTChip hardware wallet support' - 'python-hidapi: Digital Bitbox hardware wallet support' - 'python-matplotlib: plot transaction history in graphical mode' - 'zbar: QR code reading support' - 'python-rpyc: send commands to Electrum Python console from an external script' - 'python-qdarkstyle: optional dark theme in graphical mode' - 'python-pycryptodomex: use PyCryptodome AES implementation instead of pyaes' - ) - -url="https://electrum.org" -license=('MIT') -source=("https://download.electrum.org/${pkgver}/${pkgname^}-${pkgver}.tar.gz" - "${pkgname^}-${pkgver}.tar.gz.asc::https://download.electrum.org/${pkgver}/${pkgname^}-${pkgver}.tar.gz.ThomasV.asc") -sha512sums=('eb1ea44e4bb3573a2035e51b8d0b1f36ddf150368fced2bf27c10939c2e81034505ad543bf6c272b298f5d1ebd8ef2610e5cdf75b758439bb9c007e1c9ccb5e8' - 'SKIP') -validpgpkeys=('6694D8DE7BE8EE5631BED9502BD5824B7F9470E6') - -prepare() { - cd "${pkgname^}-${pkgver}" -} - -build() { - cd "${pkgname^}-${pkgver}" - - python setup.py build -} - -package() { - cd "${pkgname^}-${pkgver}" - - # Make python build reproducible. - # Credit goes to Zren for pointing this out. - export PYTHONHASHSEED=0 - python setup.py install --root="${pkgdir}" --optimize=1 - install -D -m644 LICENCE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE -} Copied: electrum/repos/community-any/PKGBUILD (from rev 1050329, electrum/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-11-17 18:29:37 UTC (rev 1050330) @@ -0,0 +1,49 @@ +# Maintainer: Christian Rebischke <chris.rebisc...@archlinux.org> +# Co-Maintainer: Santiago Torres-Arias <santi...@archlinux.org> +# Contributor: Timothy Redaelli <timothy.redae...@gmail.com> +# Contributor: Andy Weidenbaum <archb...@gmail.com> + +pkgname=electrum +pkgver=4.1.5 +pkgrel=1 +pkgdesc="Lightweight Bitcoin wallet" +arch=('any') +makedepends=('python-setuptools') +depends=('python-pyaes' 'python-ecdsa' 'python-pbkdf2' 'python-requests' 'python-qrcode' + 'python-protobuf' 'python-dnspython' 'python-jsonrpclib-pelix' 'python-pysocks' + 'python-pyqt5' 'python-pycryptodomex' 'python-websocket-client' 'python-certifi' + 'python-aiorpcx' 'python-aiohttp' 'python-aiohttp-socks' + 'libsecp256k1' 'python-bitstring') +optdepends=('python-btchip: BTChip hardware wallet support' + 'python-hidapi: Digital Bitbox hardware wallet support' + 'python-matplotlib: plot transaction history in graphical mode' + 'zbar: QR code reading support' + 'python-rpyc: send commands to Electrum Python console from an external script' + 'python-qdarkstyle: optional dark theme in graphical mode' + 'python-pycryptodomex: use PyCryptodome AES implementation instead of pyaes' + ) + +url="https://electrum.org" +license=('MIT') +source=("https://download.electrum.org/${pkgver}/${pkgname^}-${pkgver}.tar.gz" + "${pkgname^}-${pkgver}.tar.gz.asc::https://download.electrum.org/${pkgver}/${pkgname^}-${pkgver}.tar.gz.ThomasV.asc") +sha512sums=('fbffd2366c8521e37da21dce0a59ca140f63635df5a2f31d5faafbc1267384bc6c76f66502a19cdcb4d4100f249c12bc336a54795a8b840bf299b5fda4bc1c8e' + 'SKIP') +validpgpkeys=('6694D8DE7BE8EE5631BED9502BD5824B7F9470E6') + +prepare() { + cd "${pkgname^}-${pkgver}" +} + +build() { + cd "${pkgname^}-${pkgver}" + + python setup.py build +} + +package() { + cd "${pkgname^}-${pkgver}" + + python setup.py install --root="${pkgdir}" --optimize=1 + install -D -m644 LICENCE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE +}