[arch-commits] Commit in electrum/trunk (PKGBUILD gtk3.patch)

[Timothy Redaelli]

    Date: Friday, September 19, 2014 @ 19:43:27
  Author: tredaelli
Revision: 119243

upgpkg: electrum 1.9.8-3

Fix GTK UI

Added:
  electrum/trunk/gtk3.patch
Modified:
  electrum/trunk/PKGBUILD

------------+
 PKGBUILD   |   30 ++++++++++++++++--------------
 gtk3.patch |   13 +++++++++++++
 2 files changed, 29 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-19 17:30:34 UTC (rev 119242)
+++ PKGBUILD	2014-09-19 17:43:27 UTC (rev 119243)
@@ -6,41 +6,44 @@
 
 pkgname=electrum
 pkgver=1.9.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Lightweight Bitcoin wallet"
 arch=('any')
 depends=('python2' 'python2-ecdsa' 'python2-pbkdf2' 'python2-pyqt4' 'python2-sip' 'python2-slowaes' 'qt4' 'sip')
 makedepends=('gettext' 'python2-pycurl' 'python2-setuptools')
 optdepends=('desktop-file-utils: update desktop database'
+            'pygtk: GTK user interface'
             '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)
+        setup.py.patch
+        gtk3.patch)
 md5sums=('e3918fec0254267f08e41a1fb8691382'
-         '4fdd91fe50c4718067b5f22a866ceb53'
-         '562f61b12e8bc80de23fb56b8ce56fe7')
+         'SKIP'
+         '562f61b12e8bc80de23fb56b8ce56fe7'
+         'b74882fe1c8319faf8f7d1ecbb6e30f6')
 sha256sums=('8fc144a32013e4a747fea27fff981762a6b9e14cde9ffb405c4c721975d846ff'
-            '181b88ceecd8701844d79110d31fe71b16d943c47612989f3c51e19270f2a87b'
-            '5f8d846dedce20601f3131e687bd2dc54ca8df0137cbdaa1b06eab11eb6a52da')
+            'SKIP'
+            '5f8d846dedce20601f3131e687bd2dc54ca8df0137cbdaa1b06eab11eb6a52da'
+            'ba97ed1716af25fb64e439415cbe55aadac3d6528ab29f7a0ea0f93b5a539299')
 provides=('electrum')
 install=electrum.install
 
 prepare() {
-  cd ${srcdir}/${pkgname^}-${pkgver}
+  cd ${pkgname^}-${pkgver}
 
-  msg 'Patching setup.py...'
-  patch -p1 < ${srcdir}/setup.py.patch
+  patch -p1 < "${srcdir}"/setup.py.patch
 
-  msg 'Fixing Python version...'
+  patch -p1 < "${srcdir}"/gtk3.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' {} +
 }
 
 build() {
-  cd ${srcdir}/${pkgname^}-${pkgver}
+  cd ${pkgname^}-${pkgver}
 
-  msg 'Building...'
   python2 mki18n.py
   pyrcc4 icons.qrc -o gui/qt/icons_rc.py
   python2 setup.py build
@@ -47,8 +50,7 @@
 }
 
 package() {
-  cd ${srcdir}/${pkgname^}-${pkgver}
+  cd ${pkgname^}-${pkgver}
 
-  msg 'Installing...'
   python2 setup.py install --root="${pkgdir}" --optimize=1
 }

Added: gtk3.patch
===================================================================
--- gtk3.patch	                        (rev 0)
+++ gtk3.patch	2014-09-19 17:43:27 UTC (rev 119243)
@@ -0,0 +1,13 @@
+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?"  )