diff --git a/srcpkgs/wicd/patches/deepcopy+python27-fixes.patch b/srcpkgs/wicd/patches/deepcopy+python27-fixes.patch deleted file mode 100644 index 51a2c8312d..0000000000 --- a/srcpkgs/wicd/patches/deepcopy+python27-fixes.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -ur wicd-1.7.0/wicd/configmanager.py wicd-1.7.0.new/wicd/configmanager.py ---- wicd-1.7.0/wicd/configmanager.py 2010-01-15 05:49:11.000000000 +0100 -+++ wicd-1.7.0.new/wicd/configmanager.py 2010-10-08 13:14:22.084345024 +0200 -@@ -35,7 +35,7 @@ - class ConfigManager(RawConfigParser): - """ A class that can be used to manage a given configuration file. """ - def __init__(self, path, debug=False, mark_whitespace="`'`"): -- RawConfigParser.__init__(self) -+ RawConfigParser.__init__(self, allow_no_value=True) - self.config_file = path - self.debug = debug - self.mrk_ws = mark_whitespace -@@ -176,28 +176,35 @@ - - - def _copy_section(self, name): -- # Yes, deepcopy sucks, but it is robust to changes in both -- # this class and RawConfigParser. -- p = copy.deepcopy(self) -- for sname in p.sections(): -- if sname != name: -- p.remove_section(sname) -+ p = ConfigManager("", self.debug, self.mrk_ws) -+ p.add_section(name) -+ for (iname, value) in self.items(name): -+ p.set(name, iname, value) -+ # Store the filename this section was read from. - p.config_file = p.get_option(name, '_filename_', p.config_file) - p.remove_option(name, '_filename_') - return p - - def write(self): - """ Writes the loaded config file to disk. """ -- # Really don't like this deepcopy. -- p = copy.deepcopy(self) -- for sname in p.sections(): -- fname = p.get_option(sname, '_filename_') -+ in_this_file = [] -+ for sname in self.sections(): -+ fname = self.get_option(sname, '_filename_') - if fname and fname != self.config_file: -+ # Write sections from other files - section = self._copy_section(sname) -- p.remove_section(sname) - section._write_one() -+ else: -+ # Save names of local sections -+ in_this_file.append(sname) - -- for sname in p.sections(): -+ # Make an instance with only these sections -+ p = ConfigManager("", self.debug, self.mrk_ws) -+ p.config_file = self.config_file -+ for sname in in_this_file: -+ p.add_section(sname) -+ for (iname, value) in self.items(sname): -+ p.set(sname, iname, value) - p.remove_option(sname, '_filename_') - p._write_one() - -diff -ur wicd-1.7.0/wicd/wicd-daemon.py wicd-1.7.0.new/wicd/wicd-daemon.py ---- wicd-1.7.0/wicd/wicd-daemon.py 2010-01-15 05:49:11.000000000 +0100 -+++ wicd-1.7.0.new/wicd/wicd-daemon.py 2010-10-08 13:11:15.811786603 +0200 -@@ -1802,7 +1802,7 @@ - wicd_bus = dbus.service.BusName('org.wicd.daemon', bus=bus) - daemon = WicdDaemon(wicd_bus, auto_connect=auto_connect) - if not no_poll: -- child_pid = Popen([misc.find_path("python"), "-O", -+ child_pid = Popen([misc.find_path("python2"), "-O", - os.path.join(wpath.daemon, "monitor.py")], - shell=False, close_fds=True).pid - atexit.register(on_exit, child_pid) diff --git a/srcpkgs/wicd/patches/wicd-scripts-execution.patch b/srcpkgs/wicd/patches/wicd-scripts-execution.patch deleted file mode 100644 index 35cf5bb431..0000000000 --- a/srcpkgs/wicd/patches/wicd-scripts-execution.patch +++ /dev/null @@ -1,24 +0,0 @@ -=== modified file 'wicd/networking.py' ---- wicd-1.7.0.orig/wicd/networking.py 2010-01-15 04:02:10 +0000 -+++ wicd-1.7.0/wicd/networking.py 2010-01-27 19:06:21 +0000 -@@ -215,8 +215,8 @@ - if self.pre_disconnect_script: - print 'Running pre-disconnect script' - misc.ExecuteScript(expand_script_macros(self.pre_disconnect_script, -- 'pre-disconnection', (mac, -- name)), -+ 'pre-disconnection', -+ mac, name), - self.debug) - iface.ReleaseDHCP() - iface.SetAddress('0.0.0.0') -@@ -229,7 +229,7 @@ - print 'Running post-disconnect script' - misc.ExecuteScript(expand_script_macros(self.post_disconnect_script, - 'post-disconnection', -- (mac, name)), -+ mac, name), - self.debug) - - def ReleaseDHCP(self): - diff --git a/srcpkgs/wicd/template b/srcpkgs/wicd/template index 28ab06942b..9e08470504 100644 --- a/srcpkgs/wicd/template +++ b/srcpkgs/wicd/template @@ -1,14 +1,12 @@ # Template file for 'wicd' pkgname=wicd -version=1.7.0 -revision=6 -patch_args="-Np1" +version=1.7.1 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" short_desc="Open source wired and wireless network manager" maintainer="Juan RP " homepage="http://wicd.sourceforge.net" license="GPL-2" -checksum=14c5692bf8a4c93c9ac083ce9ad677b0d9022b19f84e777854766b2a6f753b32 +checksum=19f6f94138eed16fe25ad434d4b0b382056c656a48f2d8cee31ac7ffbf949203 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 @@ -40,14 +38,14 @@ Add_dependency full dhcpcd Add_dependency full wpa_supplicant Add_dependency full wireless_tools Add_dependency full ethtool -Add_dependency full shared-mime-info Add_dependency full python-urwid ">=0.9.9" -Add_dependency full hicolor-icon-theme -Add_dependency full desktop-file-utils Add_dependency full notify-python -do_install() -{ +Add_dependency run shared-mime-info +Add_dependency run hicolor-icon-theme +Add_dependency run desktop-file-utils + +do_install() { python setup.py configure --no-install-init \ --resume=/usr/share/wicd/scripts \ --suspend=/usr/share/wicd/scripts