# HG changeset patch
# User Richard Dunbar <mojo@slitaz.org>
# Date 1370304834 0
# Node ID 662b600e1688c7528ff4f545c3121059a5a1f977
# Parent  75489cc57b2d473e9a28911ec6e10955b8b3011d
Up wicd (1.7.2.4)

diff -r 75489cc57b2d -r 662b600e1688 wicd/receipt
--- a/wicd/receipt	Mon Jun 03 20:00:49 2013 +0000
+++ b/wicd/receipt	Tue Jun 04 00:13:54 2013 +0000
@@ -1,24 +1,30 @@
 # SliTaz package receipt.
 
 PACKAGE="wicd"
-VERSION="1.7.0"
+VERSION="1.7.2.4"
 CATEGORY="network"
 SHORT_DESC="Network connection manager"
 MAINTAINER="jozee@slitaz.org"
 DEPENDS="python dbus-python ethtool wpa_supplicant pygtk"
-BUILD_DEPENDS="python-dev dbus-python-dev python"
+BUILD_DEPENDS="python-distribute python-babel python-dev dbus-python-dev"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://heanet.dl.sourceforge.net/sourceforge/wicd/"
-WGET_URL="$WEB_SITE/$TARBALL"
+WEB_SITE="http://wicd.sourceforge.net/"
+WGET_URL="https://launchpad.net/wicd/${VERSION:0:3}/$VERSION/+download/$TARBALL"
 TAGS="wireless ethernet"
 
 # Rules to configure and make the package.
 compile_rules()
 {
     cd $src
+    # Fix problem with new urwid FS#33378 LP#1075399
+    patch -Np0 -i $stuff/831_830.patch
+    patch -Np0 -i $stuff/835_834.patch
+    patch -Np0 -i $stuff/dbus_string_fix.patch
     python setup.py configure
-    python setup.py install --root=$PWD/_pkg
-   
+    #HACK for https://bugs.launchpad.net/wicd/+bug/928589
+    mkdir -p translations/ast/LC_MESSAGES
+    msgfmt po/ast.po -o translations/ast/LC_MESSAGES/wicd.mo
+    python setup.py install --root=$DESTDIR
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -27,19 +33,19 @@
     mkdir -p $fs/usr
     mkdir -p $fs/etc
     mkdir -p $fs/var
-    cp -a $_pkg/usr/* $fs/usr
-    cp -a $_pkg/etc/* $fs/etc
-    cp -a $_pkg/var/* $fs/var
+    cp -a $install/usr/* $fs/usr
+    cp -a $install/etc/* $fs/etc
+    cp -a $install/var/* $fs/var
     rm -f -r $fs/usr/share/doc
     rm -f -r $fs/usr/share/man
     rm -f -r $fs/usr/share/icons/hicolor/*
     rm -f -r $fs/usr/share/locale
-    cp -a $_pkg/usr/share/icons/hicolor/scalable $fs/usr/share/icons/hicolor
-    cp -a $_pkg/usr/share/icons/hicolor/32x32 $fs/usr/share/icons/hicolor
+    cp -a $install/usr/share/icons/hicolor/scalable $fs/usr/share/icons/hicolor
+    cp -a $install/usr/share/icons/hicolor/32x32 $fs/usr/share/icons/hicolor
     mkdir -p $fs/etc/init.d
-    cp -a stuff/wicd $fs/etc/init.d
+    cp -a $stuff/wicd $fs/etc/init.d
 	# dhclient as fake udhcpc wrapper
-  	cp -a stuff/dhclient $fs/usr/bin 
+  	cp -a $stuff/dhclient $fs/usr/bin 
 	# set permissions
 	chmod +x $fs/usr/bin/dhclient
 	
diff -r 75489cc57b2d -r 662b600e1688 wicd/stuff/831_830.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wicd/stuff/831_830.patch	Tue Jun 04 00:13:54 2013 +0000
@@ -0,0 +1,66 @@
+=== modified file 'curses/curses_misc.py'
+--- curses/curses_misc.py	2012-05-06 15:16:15 +0000
++++ curses/curses_misc.py	2012-11-15 09:26:21 +0000
+@@ -349,7 +349,10 @@
+         # We need this to pick our keypresses
+         self.use_enter = use_enter
+ 
+-        self.focus = focus
++        if urwid.VERSION < (1, 1, 0):
++            self.focus = focus
++        else:
++            self.focus_position = focus
+ 
+         self.callback = callback
+         self.user_args = user_args
+@@ -362,7 +365,11 @@
+         self.list = list
+ 
+     def set_focus(self,index):
+-        self.focus = index
++        if urwid.VERSION < (1, 1, 0):
++            self.focus = index
++        else:
++            self.focus_position = index
++
+         # API changed between urwid 0.9.8.4 and 0.9.9
+         try:
+             self.cbox.set_w(SelText(self.list[index]+self.DOWN_ARROW))
+@@ -376,16 +383,21 @@
+     def build_combobox(self,parent,ui,row):
+         str,trash =  self.label.get_text()
+ 
+-        self.cbox = DynWrap(SelText([self.list[self.focus]+self.DOWN_ARROW]),
++        if urwid.VERSION < (1, 1, 0):
++            index = self.focus
++        else:
++            index = self.focus_position
++
++        self.cbox = DynWrap(SelText([self.list[index]+self.DOWN_ARROW]),
+                 attrs=self.attrs,focus_attr=self.focus_attr)
+         if str != '':
+             w = urwid.Columns([('fixed',len(str),self.label),self.cbox],
+                     dividechars=1)
+-            self.overlay = self.ComboSpace(self.list,parent,ui,self.focus,
++            self.overlay = self.ComboSpace(self.list,parent,ui,index,
+                     pos=(len(str)+1,row))
+         else:
+             w = urwid.Columns([self.cbox])
+-            self.overlay = self.ComboSpace(self.list,parent,ui,self.focus,
++            self.overlay = self.ComboSpace(self.list,parent,ui,index,
+                     pos=(0,row))
+ 
+         self._w = w
+@@ -419,7 +431,10 @@
+         if self.overlay:
+             return self.overlay._listbox.get_focus()
+         else:
+-            return None,self.focus
++            if urwid.VERSION < (1, 1, 0):
++                return None, self.focus
++            else:
++                return None, self.focus_position
+ 
+     def get_sensitive(self):
+         return self.cbox.get_sensitive()
+
diff -r 75489cc57b2d -r 662b600e1688 wicd/stuff/835_834.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wicd/stuff/835_834.patch	Tue Jun 04 00:13:54 2013 +0000
@@ -0,0 +1,43 @@
+=== modified file 'curses/curses_misc.py'
+--- curses/curses_misc.py	2012-11-15 09:26:21 +0000
++++ curses/curses_misc.py	2012-11-16 09:22:47 +0000
+@@ -352,7 +352,7 @@
+         if urwid.VERSION < (1, 1, 0):
+             self.focus = focus
+         else:
+-            self.focus_position = focus
++            self._w.focus_position = focus
+ 
+         self.callback = callback
+         self.user_args = user_args
+@@ -368,7 +368,10 @@
+         if urwid.VERSION < (1, 1, 0):
+             self.focus = index
+         else:
+-            self.focus_position = index
++            try:
++                self._w.focus_position = index
++            except IndexError:
++                pass
+ 
+         # API changed between urwid 0.9.8.4 and 0.9.9
+         try:
+@@ -386,7 +389,7 @@
+         if urwid.VERSION < (1, 1, 0):
+             index = self.focus
+         else:
+-            index = self.focus_position
++            index = self._w.focus_position
+ 
+         self.cbox = DynWrap(SelText([self.list[index]+self.DOWN_ARROW]),
+                 attrs=self.attrs,focus_attr=self.focus_attr)
+@@ -434,7 +437,7 @@
+             if urwid.VERSION < (1, 1, 0):
+                 return None, self.focus
+             else:
+-                return None, self.focus_position
++                return None, self._w.focus_position
+ 
+     def get_sensitive(self):
+         return self.cbox.get_sensitive()
+
diff -r 75489cc57b2d -r 662b600e1688 wicd/stuff/dbus_string_fix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wicd/stuff/dbus_string_fix.patch	Tue Jun 04 00:13:54 2013 +0000
@@ -0,0 +1,15 @@
+=== modified file 'wicd/misc.py'
+--- wicd/misc.py	2012-04-30 19:20:47 +0000
++++ wicd/misc.py	2012-05-03 16:01:49 +0000
+@@ -430,7 +430,10 @@
+     """ Sanitize property names to be used in config-files. """
+     allowed = string.ascii_letters + '_' + string.digits
+     table = string.maketrans(allowed, ' ' * len(allowed))
+-    return s.translate(None, table)
++
++    # s is a dbus.String -- since we don't allow unicode property keys,
++    # make it simple.
++    return str(s).translate(None, table)
+
+ def sanitize_escaped(s):
+     """ Sanitize double-escaped unicode strings. """