3.3

* External Plugins Feature (use with caution, see readme)
* Various fixes and improvements

3 files changed, 9 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 407d64fc9d1e..c289cda27df7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = electron-cash
 	pkgdesc = Lightweight Bitcoin Cash wallet
-	pkgver = 3.2
-	pkgrel = 2
+	pkgver = 3.3
+	pkgrel = 1
 	url = http://www.electroncash.org/
 	install = electron-cash.install
 	arch = any
@@ -36,12 +36,10 @@ pkgbase = electron-cash
 	optdepends = zbar: QR code reading support
 	provides = electron-cash
 	conflicts = electron-cash
-	source = electron-cash-3.2.tar.gz::https://github.com/fyookball/electrum/archive/3.2.tar.gz
+	source = electron-cash-3.3.tar.gz::https://github.com/fyookball/electrum/archive/3.3.tar.gz
 	source = electron-cash.install
-	source = 0001-Revert-Improve-argument-parsing-in-setup.py-Unix-dat.patch
-	sha256sums = 0a50bcad327ee0914c444cdba4d1334a93dfc4fea30e04fc299c4913efe53181
+	sha256sums = 92df7f89321cda8f6d886c203298daa1bf8463ff25a5d58b93907579d181f7f8
 	sha256sums = d682766321f9981ee38aee26dc050209882d8c1c6006e3e509649b47fa1bb073
-	sha256sums = 8f8ba0cb62c9b24f12b2ad39c78f4e18f451231647a7f3bf06ad55b77776a8ac
 
 pkgname = electron-cash
 
diff --git a/0001-Revert-Improve-argument-parsing-in-setup.py-Unix-dat.patch b/0001-Revert-Improve-argument-parsing-in-setup.py-Unix-dat.patch
deleted file mode 100644
index 05fa4e65e889..000000000000
--- a/0001-Revert-Improve-argument-parsing-in-setup.py-Unix-dat.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From bbbcc642a553f8cb9ac7a44f0b003e065879b27b Mon Sep 17 00:00:00 2001
-From: Marcel O'Neil <marcel@marceloneil.com>
-Date: Wed, 25 Apr 2018 12:50:45 -0400
-Subject: [PATCH] Revert "Improve argument parsing in `setup.py` Unix data file
- injection hack"
-
-This reverts commit e10c1df8bb5394f8254a0a3465d5270890d1fdd6.
----
- setup.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 8d1313d5..bf9fe66a 100755
---- a/setup.py
-+++ b/setup.py
-@@ -23,12 +23,12 @@ if sys.version_info[:3] < (3, 5, 0):
- data_files = []
- 
- if platform.system() in ['Linux', 'FreeBSD', 'DragonFly']:
--    parser = argparse.ArgumentParser(add_help=False)
-+    parser = argparse.ArgumentParser()
-     parser.add_argument('--root=', dest='root_path', metavar='dir', default='/')
--    parser.add_argument('--prefix=', dest='prefix_path', metavar='prefix', default=sys.prefix)
-     opts, _ = parser.parse_known_args(sys.argv[1:])
--    usr_share = os.path.join(opts.root_path + opts.prefix_path, "share")
--    if not os.access(usr_share, os.W_OK):
-+    usr_share = os.path.join(sys.prefix, "share")
-+    if not os.access(opts.root_path + usr_share, os.W_OK) and \
-+       not os.access(opts.root_path, os.W_OK):
-         if 'XDG_DATA_HOME' in os.environ.keys():
-             usr_share = os.environ['XDG_DATA_HOME']
-         else:
--- 
-2.17.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 63fc0e4cebb2..467856f9261f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgname='electron-cash'
 pkgdesc='Lightweight Bitcoin Cash wallet'
-pkgver=3.2
-pkgrel=2
+pkgver=3.3
+pkgrel=1
 url='http://www.electroncash.org/'
 install="${pkgname}.install"
 arch=('any')
@@ -51,16 +51,9 @@ conflicts=("${pkgname}")
 install="${pkgname}.install"
 source=(
   "${pkgname}-${pkgver}.tar.gz::https://github.com/fyookball/electrum/archive/${pkgver/.0}.tar.gz"
-  "${pkgname}.install"
-  "0001-Revert-Improve-argument-parsing-in-setup.py-Unix-dat.patch")
-sha256sums=('0a50bcad327ee0914c444cdba4d1334a93dfc4fea30e04fc299c4913efe53181'
-            'd682766321f9981ee38aee26dc050209882d8c1c6006e3e509649b47fa1bb073'
-            '8f8ba0cb62c9b24f12b2ad39c78f4e18f451231647a7f3bf06ad55b77776a8ac')
-
-prepare() {
-  cd "${pkgname/on-cash/um}-${pkgver/.0}"
-  patch -Np1 -i "${srcdir}/0001-Revert-Improve-argument-parsing-in-setup.py-Unix-dat.patch"
-}
+  "${pkgname}.install")
+sha256sums=('92df7f89321cda8f6d886c203298daa1bf8463ff25a5d58b93907579d181f7f8'
+            'd682766321f9981ee38aee26dc050209882d8c1c6006e3e509649b47fa1bb073')
 
 build() {
   cd "${pkgname/on-cash/um}-${pkgver/.0}"