wicd: update to 1.7.3.

srcpkgs/wicd/patches/831_830.diff

@@ -1,66 +0,0 @@
-=== 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

@@ -1,43 +0,0 @@
-=== 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

@@ -1,16 +0,0 @@
-=== 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,8 +1,9 @@
 # Template file for 'wicd'
 pkgname=wicd
-version=1.7.2.4
+version=1.7.3
-revision=11
+revision=1
 noarch=yes
+build_options="systemd"
 hostmakedepends="python python-setuptools python-Babel"
 depends="dbus-glib dhcpcd ethtool net-tools python-dbus python-gobject2 python-urwid
  rfkill wireless_tools wpa_supplicant"
@@ -16,10 +17,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://wicd.sourceforge.net"
 license="GPL-2"
 distfiles="http://launchpad.net/wicd/1.7/${version}/+download/wicd-${version}.tar.gz"
-checksum=dcfdfb5dbbb49dbb9b205fddf064d6b1a4e88f66f1cf40d12fb7fe0e0c7cdc97
+checksum=91e38857b1651d242ed7e3b3e3fd8b076b4d06a23eedb033310fae510ece8401
-
-build_options="systemd"
-replaces="runit-void<20141013_2"
 
 do_build() {
 	if [ "${build_option_systemd}" ]; then
@@ -29,11 +27,8 @@ do_build() {
 		--resume=/usr/share/wicd/scripts \
 		--suspend=/usr/share/wicd/scripts \
 		--python=/usr/bin/python2 --lib=/usr/lib \
-		--sbin=/usr/sbin ${_args}
+		--sbin=/usr/sbin --distro=arch \
-
+		--no-install-gnome-shell-extensions ${_args}
-	#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}
@@ -62,6 +57,7 @@ wicd-gtk_package() {
 		vmove usr/share/applications
 		vmove usr/share/pixmaps
 		vmove usr/share/icons
+		vmove usr/share/wicd/icons
 		vmove usr/share/wicd/gtk
 		vmove usr/share/man/man1/wicd-client.1
 		vmove usr/share/man/nl/man1/wicd-client.1