[arch-commits] Commit in wicd/trunk (PKGBUILD wicd-1.7.2.4-urwid-1.3.0.patch)

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Fri Dec 5 20:18:37 UTC 2014


    Date: Friday, December 5, 2014 @ 21:18:36
  Author: bpiotrowski
Revision: 227307

upgpkg: wicd 1.7.2.4-10

fix wicd-curses compatibility with urwid 1.3.0 (FS#42962)

Added:
  wicd/trunk/wicd-1.7.2.4-urwid-1.3.0.patch
Modified:
  wicd/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   11 ++++++++---
 wicd-1.7.2.4-urwid-1.3.0.patch |   17 +++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-05 18:58:32 UTC (rev 227306)
+++ PKGBUILD	2014-12-05 20:18:36 UTC (rev 227307)
@@ -5,7 +5,7 @@
 pkgbase=wicd
 pkgname=('wicd' 'wicd-gtk')
 pkgver=1.7.2.4
-pkgrel=9
+pkgrel=10
 arch=(any)
 url="http://wicd.sourceforge.net/"
 license=('GPL2')
@@ -15,12 +15,14 @@
         wicd.desktop
         dbus_string_fix.patch
 	http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/diff/831
-	http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/diff/835)
+	http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/diff/835
+        wicd-1.7.2.4-urwid-1.3.0.patch)
 md5sums=('c2435ddfdef0b9898852d72a85a45f0f'
          '326df163a5732d38741371baa4fce9e5'
          '744b3c12fe901ed435351e884dc8cb1d'
          '0d2355bc2eb7234a537f42f1773edfe0'
-         '1630d7fe8f09911302d33b26286ff9b8')
+         '1630d7fe8f09911302d33b26286ff9b8'
+         '797a1663714da24e446c50698bba25b5')
 makedepends=('python2' 'python2-babel' 'python2-setuptools' 'gettext' 'dbus-glib' 'dhcpcd' 
              'ethtool' 'inetutils' 'net-tools' 'pygtk' 'python2-dbus' 'python2-gobject2' 
              'python2-urwid' 'rfkill' 'shared-mime-info' 'wireless_tools' 'wpa_supplicant'
@@ -31,6 +33,7 @@
   cd $pkgbase-$pkgver
 
   find . -type f -exec sed -i 's@#!/usr.*python@#!/usr/bin/python2@' {} \;
+  sed -i 's/pybabel/pybabel2/g' setup.py 
   export PYTHON=python2
   
   sed -i 's|/usr/sbin/|/usr/bin/|' other/wicd.service
@@ -40,6 +43,7 @@
   # Fix problem with new urwid FS#33378 LP#1075399
   patch -Np0 -i "$srcdir/831"
   patch -Np0 -i "$srcdir/835"
+  patch -p1  -i "$srcdir/wicd-1.7.2.4-urwid-1.3.0.patch"
 }
 
 build() {
@@ -53,6 +57,7 @@
 			     --lib=/usr/lib \
 			     --sbin=/usr/bin \
 			     --systemd=/usr/lib/systemd/system
+  python2 setup.py compile_translations
   
   #HACK for https://bugs.launchpad.net/wicd/+bug/928589
   mkdir -p translations/ast/LC_MESSAGES

Added: wicd-1.7.2.4-urwid-1.3.0.patch
===================================================================
--- wicd-1.7.2.4-urwid-1.3.0.patch	                        (rev 0)
+++ wicd-1.7.2.4-urwid-1.3.0.patch	2014-12-05 20:18:36 UTC (rev 227307)
@@ -0,0 +1,17 @@
+diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py
+index 641aa52..603609b 100755
+--- a/curses/wicd-curses.py
++++ b/curses/wicd-curses.py
+@@ -927,9 +927,10 @@ class appGUI():
+         if not ui._started:
+             return False
+ 
+-        input_data = ui.get_input_nonblocking()
++        ui.set_input_timeouts(max_wait=0)
++        input_data = ui.get_input()
+         # Resolve any "alarms" in the waiting
+-        self.handle_keys(input_data[1])
++        self.handle_keys(input_data)
+ 
+         # Update the screen
+         canvas = self.frame.render( (self.size),True )



More information about the arch-commits mailing list