3.1.2 release, remove patch (fixed upstream #4136)

3 files changed, 8 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac53e1e634ff..87f9d01c5ad5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = electrum-mona
 	pkgdesc = A lightweight Monacoin wallet
-	pkgver = 3.1.1
-	pkgrel = 2
+	pkgver = 3.1.2
+	pkgrel = 1
 	url = https://github.com/wakiyamap/electrum-mona
 	arch = any
 	license = MIT
@@ -25,10 +25,8 @@ pkgbase = electrum-mona
 	optdepends = python-trezor: for Trezor hardware support
 	optdepends = python-btchip: for BTChip hardware support
 	optdepends = python-keepkey: for KeepKey hardware support
-	source = electrum-mona-3.1.1.tar.gz::https://github.com/wakiyamap/electrum-mona/archive/3.1.1.tar.gz
-	source = 0001-remove-forced-optional-requirements-install.patch
-	sha512sums = 68ef5af532da98b9e99fde7f2755103b18143d4d77c467340877d2267af5b8d10885a14aca6e522b0bdf609199eafb41339ff7c38d7e896624510b3e3905f4fd
-	sha512sums = 49c73d8716403ba6c9cde84c9ccd666ccd4ac6c9af1c98b7021018a7a629496f47b90182b040e2a7ef9cd4a9c86c31210ec74085e44e2a655b9bc2fbe690470f
+	source = electrum-mona-3.1.2.tar.gz::https://github.com/wakiyamap/electrum-mona/archive/3.1.2.tar.gz
+	sha512sums = 7ce6bd4c94697d8bd2807432bad7d0887b0bf5240df9ec9bcd0d82e40737c92c8d56428d4719a7f7d02c4a64558883842ff1aff4aa34e47e8733d593b369940f
 
 pkgname = electrum-mona
 
diff --git a/0001-remove-forced-optional-requirements-install.patch b/0001-remove-forced-optional-requirements-install.patch
deleted file mode 100644
index 73c5fb6deecf..000000000000
--- a/0001-remove-forced-optional-requirements-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ura electrum-mona/setup.py electrum-mona-3.1.1.new/setup.py
---- electrum-mona.orig/setup.py	2018-03-14 01:36:16.000000000 +0900
-+++ electrum-mona.new/setup.py	2018-03-18 17:45:21.165390904 +0900
-@@ -86,8 +86,3 @@
-     url="https://github.com/wakiyamap/electrum-mona",
-     long_description="""Lightweight Monacoin Wallet"""
- )
--
--# Optional modules (not required to run Electrum)
--import pip
--opt_modules = requirements_hw + ['pycryptodomex']
--[ pip.main(['install', m]) for m in opt_modules ]
diff --git a/PKGBUILD b/PKGBUILD
index 47d066bac062..c43b43025bdb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Musee "lae" Ullah <lae(at)lae(dot)is>
 pkgname=electrum-mona
-pkgver=3.1.1
-pkgrel=2
+pkgver=3.1.2
+pkgrel=1
 pkgdesc="A lightweight Monacoin wallet"
 arch=('any')
 url='https://github.com/wakiyamap/electrum-mona'
@@ -27,15 +27,12 @@ optdepends=('python-matplotlib: for plot history'
             'python-btchip: for BTChip hardware support'
             'python-keepkey: for KeepKey hardware support')
 makedepends=('python-pycurl')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/wakiyamap/${pkgname}/archive/${pkgver}.tar.gz"
-        '0001-remove-forced-optional-requirements-install.patch')
-sha512sums=('68ef5af532da98b9e99fde7f2755103b18143d4d77c467340877d2267af5b8d10885a14aca6e522b0bdf609199eafb41339ff7c38d7e896624510b3e3905f4fd'
-            '49c73d8716403ba6c9cde84c9ccd666ccd4ac6c9af1c98b7021018a7a629496f47b90182b040e2a7ef9cd4a9c86c31210ec74085e44e2a655b9bc2fbe690470f')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/wakiyamap/${pkgname}/archive/${pkgver}.tar.gz")
+sha512sums=('7ce6bd4c94697d8bd2807432bad7d0887b0bf5240df9ec9bcd0d82e40737c92c8d56428d4719a7f7d02c4a64558883842ff1aff4aa34e47e8733d593b369940f')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}/
   pyrcc5 icons.qrc -o gui/qt/icons_rc.py
-  patch -Np1 -i "${srcdir}/0001-remove-forced-optional-requirements-install.patch"
 }
 
 build() {