wicd: update to 1.7.2.4.

srcpkgs/wicd/patches/831_830.diff

@@ -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()
+

srcpkgs/wicd/patches/835_834.diff

@@ -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()
+

srcpkgs/wicd/patches/dbus_string_fix.patch

@@ -0,0 +1,16 @@
+=== 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. """
+

srcpkgs/wicd/template

@@ -1,15 +1,15 @@
 # Template file for 'wicd'
 pkgname=wicd
-version=1.7.1
+version=1.7.2.4
-revision=4
+revision=1
-makedepends="dhcpcd wpa_supplicant wireless_tools ethtool dbus-python
+makedepends="dhcpcd wpa_supplicant wireless_tools ethtool dbus-glib dbus-python
- pygobject2 python-urwid>=0.9.9"
+ rfkill pygobject2 python-urwid>=0.9.9 python-distribute python-babel"
 short_desc="Open source wired and wireless network manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://wicd.sourceforge.net"
 license="GPL-2"
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
+distfiles="http://launchpad.net/wicd/1.7/${version}/+download/wicd-${version}.tar.gz"
-checksum=19f6f94138eed16fe25ad434d4b0b382056c656a48f2d8cee31ac7ffbf949203
+checksum=dcfdfb5dbbb49dbb9b205fddf064d6b1a4e88f66f1cf40d12fb7fe0e0c7cdc97
 long_desc="
  Wicd is an open source wired and wireless network manager for Linux
  which aims to provide a simple interface to connect to networks with a
@@ -27,10 +27,19 @@ long_desc="
    * Tray icon showing network activity and signal strength
    * A full-featured console interface"
 
-do_install() {
+do_build() {
-	python setup.py configure \
+	python setup.py configure --verbose --no-install-init \
 		--resume=/usr/share/wicd/scripts \
-		--suspend=/usr/share/wicd/scripts
+		--suspend=/usr/share/wicd/scripts \
+		--python=/usr/bin/python2 --lib=/usr/lib --sbin=/usr/bin \
+		--systemd=/usr/lib/systemd/system
+
+	#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
+}
+
+do_install() {
 	python setup.py install --root=${DESTDIR}
 
 	vinstall ${FILESDIR}/wicd.desktop 644 usr/share/applications
@@ -38,14 +47,14 @@ do_install() {
 	vcopy "build/lib/wicd/*.py" usr/lib/wicd
 	chmod 755 ${DESTDIR}/usr/lib/wicd/*.py
 	rm -rf ${DESTDIR}/usr/share/doc
-
+	rm -rf ${DESTDIR}/etc/logrotate.d
-	vmove "lib/*" usr/lib
+	rm -rf ${DESTDIR}/usr/lib/pm-utils
 }
 
 wicd-gtk_package() {
 	noarch=yes
 	depends="wicd>=${version} pygtk notify-python shared-mime-info desktop-file-utils hicolor-icon-theme"
-	short_desc="${short_desc} - GTK UI"
+	short_desc+=" - GTK UI"
 	pycompile_dirs="usr/share/wicd/gtk"
 	pkg_install() {
 		vmove etc/xdg
@@ -62,7 +71,8 @@ wicd-gtk_package() {
 
 wicd_package() {
 	noarch=yes
-	depends="${makedepends}"
+	depends="dbus-glib dhcpcd ethtool net-tools dbus-python python-gobject2 python-urwid
+		rfkill wireless_tools wpa_supplicant"
 	pycompile_module="wicd"
 	pycompile_dirs="usr/lib/wicd usr/share/wicd"
 	conf_files="
@@ -70,8 +80,6 @@ wicd_package() {
 		/etc/wicd/encryption/templates/active"
 	systemd_services="wicd.service on"
 	pkg_install() {
-		vmove etc
+		vmove all
-		vmove usr
-		vmove var
 	}
 }