[arch-commits] Commit in electrum/trunk (5 files)

[Timothy Redaelli]

    Date: Tuesday, March 3, 2015 @ 12:39:46
  Author: tredaelli
Revision: 128613

upgpkg: electrum 2.0-1

Modified:
  electrum/trunk/PKGBUILD
  electrum/trunk/electrum.install
Deleted:
  electrum/trunk/gtk3.patch
  electrum/trunk/pyqt4-4.11.patch
  electrum/trunk/setup.py.patch

------------------+
 PKGBUILD         |   37 +++++++++++--------------------------
 electrum.install |    2 +-
 gtk3.patch       |   13 -------------
 pyqt4-4.11.patch |   13 -------------
 setup.py.patch   |   11 -----------
 5 files changed, 12 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-03 11:31:20 UTC (rev 128612)
+++ PKGBUILD	2015-03-03 11:39:46 UTC (rev 128613)
@@ -5,31 +5,21 @@
 # http://bitcoin-otc.com/viewgpg.php?nick=ThomasV
 
 pkgname=electrum
-pkgver=1.9.8
-pkgrel=4
+pkgver=2.0
+pkgrel=1
 pkgdesc="Lightweight Bitcoin wallet"
 arch=('any')
-depends=('python2-ecdsa' 'python2-pbkdf2' 'python2-pyqt4' 'python2-sip' 'python2-slowaes')
-makedepends=('gettext' 'python2-pycurl' 'python2-setuptools')
-optdepends=('desktop-file-utils: update desktop database'
-            'pygtk: GTK user interface'
-            'python2-zbar: QR code reading support')
+depends=('python2-ecdsa' 'python2-pbkdf2' 'python2-requests' 'python2-pyasn1' 'python2-qrcode' 'python2-protobuf'
+	 'python2-tlslite' 'python2-dnspython' 'python2-pyqt4' 'python2-sip' 'python2-slowaes')
+makedepends=('gettext' 'python2-pycurl' 'python2-setuptools' 'desktop-file-utils')
+optdepends=('python2-zbar: QR code reading support')
 url="https://electrum.org"
 license=('GPL3')
-source=("https://download.electrum.org/${pkgname^}-${pkgver}.tar.gz"{,.asc}
-        setup.py.patch
-        gtk3.patch
-        pyqt4-4.11.patch)
-md5sums=('e3918fec0254267f08e41a1fb8691382'
-         'SKIP'
-         '562f61b12e8bc80de23fb56b8ce56fe7'
-         'b74882fe1c8319faf8f7d1ecbb6e30f6'
-         '0e865e4f0337f9a6acef6d15581627ed')
-sha256sums=('8fc144a32013e4a747fea27fff981762a6b9e14cde9ffb405c4c721975d846ff'
-            'SKIP'
-            '5f8d846dedce20601f3131e687bd2dc54ca8df0137cbdaa1b06eab11eb6a52da'
-            'ba97ed1716af25fb64e439415cbe55aadac3d6528ab29f7a0ea0f93b5a539299'
-            '2542b0891b3e25674b4ab0755b4bf23523144b3e86dfb6281f852117e2e3d973')
+source=("https://download.electrum.org/${pkgname^}-${pkgver}.tar.gz"{,.asc})
+md5sums=('ad9db1c037babe0829c55e3a3c1f7630'
+         'SKIP')
+sha256sums=('69942f9edf4067e4a9b6cb66e7a5ae17215bab295f83647999656f847481bdcf'
+            'SKIP')
 validpgpkeys=('6694D8DE7BE8EE5631BED9502BD5824B7F9470E6')
 
 provides=('electrum')
@@ -38,10 +28,6 @@
 prepare() {
   cd ${pkgname^}-${pkgver}
 
-  patch -p1 < "${srcdir}"/setup.py.patch
-  patch -p1 < "${srcdir}"/gtk3.patch
-  patch -p1 < "${srcdir}"/pyqt4-4.11.patch
-
   find . -type f -exec sed -i 's#/usr/bin/python#/usr/bin/python2#g' {} +
   find . -type f -exec sed -i 's#/usr/bin/env python#/usr/bin/env python2#g' {} +
 }
@@ -49,7 +35,6 @@
 build() {
   cd ${pkgname^}-${pkgver}
 
-  python2 mki18n.py
   pyrcc4 icons.qrc -o gui/qt/icons_rc.py
   python2 setup.py build
 }

Modified: electrum.install
===================================================================
--- electrum.install	2015-03-03 11:31:20 UTC (rev 128612)
+++ electrum.install	2015-03-03 11:39:46 UTC (rev 128613)
@@ -7,5 +7,5 @@
 }
 
 post_remove() {
-  update-desktop-database -q
+  post_install
 }

Deleted: gtk3.patch
===================================================================
--- gtk3.patch	2015-03-03 11:31:20 UTC (rev 128612)
+++ gtk3.patch	2015-03-03 11:39:46 UTC (rev 128613)
@@ -1,13 +0,0 @@
-diff --git a/gui/gtk.py b/gui/gtk.py
-index cd9178f8..fe302181 100644
---- a/gui/gtk.py
-+++ b/gui/gtk.py
-@@ -87,7 +87,7 @@ def restore_create_dialog():
-     # ask if the user wants to create a new wallet, or recover from a seed. 
-     # if he wants to recover, and nothing is found, do not create wallet
-     dialog = Gtk.Dialog("electrum", parent=None, 
--                        flags=Gtk.DialogFlags.MODAL|Gtk.DialogFlags.NO_SEPARATOR, 
-+                        flags=Gtk.DialogFlags.MODAL,
-                         buttons= ("create", 0, "restore",1, "cancel",2)  )
- 
-     label = Gtk.Label("Wallet file not found.\nDo you want to create a new wallet,\n or to restore an existing one?"  )

Deleted: pyqt4-4.11.patch
===================================================================
--- pyqt4-4.11.patch	2015-03-03 11:31:20 UTC (rev 128612)
+++ pyqt4-4.11.patch	2015-03-03 11:39:46 UTC (rev 128613)
@@ -1,13 +0,0 @@
---- Electrum-1.9.8/gui/qt/installwizard.py.orig	2014-09-19 22:05:42.536699757 +0000
-+++ Electrum-1.9.8/gui/qt/installwizard.py	2014-09-19 22:06:48.993369698 +0000
-@@ -31,8 +31,8 @@
-     def set_layout(self, layout):
-         w = QWidget()
-         w.setLayout(layout)
--        self.stack.setCurrentIndex(self.stack.addWidget(w))
--
-+        self.stack.addWidget(w)
-+        self.stack.setCurrentWidget(w)
- 
-     def restore_or_create(self):
- 

Deleted: setup.py.patch
===================================================================
--- setup.py.patch	2015-03-03 11:31:20 UTC (rev 128612)
+++ setup.py.patch	2015-03-03 11:39:46 UTC (rev 128613)
@@ -1,11 +0,0 @@
---- ./setup.py	2014-03-16 12:53:25.136657771 -0700
-+++ ./setup.py	2014-03-16 12:53:42.736657586 -0700
-@@ -16,8 +16,6 @@
-     sys.exit("Error: Electrum requires Python version >= 2.6.0...")
- 
- usr_share = '/usr/share'
--if not os.access(usr_share, os.W_OK):
--    usr_share = os.getenv("XDG_DATA_HOME", os.path.join(os.getenv("HOME"), ".local", "share"))
- 
- data_files = []
- if (len(sys.argv) > 1 and (sys.argv[1] == "sdist")) or (platform.system() != 'Windows' and platform.system() != 'Darwin'):