commit 2c42b7c76573053253f4cc0462b7a9c37f64fe82 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sat May 4 19:13:08 2019 +1000 [notify] wicd: 1.7.2.4 -> 1.7.4 new dependency mii-tool, closes FS#1124 diff --git a/wicd/.footprint b/wicd/.footprint index dd4296c1..d86ea49e 100644 --- a/wicd/.footprint +++ b/wicd/.footprint @@ -23,6 +23,7 @@ drwxr-xr-x root/root etc/wicd/encryption/templates/ -rw-rw-r-- root/root etc/wicd/encryption/templates/wpa -rw-rw-r-- root/root etc/wicd/encryption/templates/wpa-peap -rw-rw-r-- root/root etc/wicd/encryption/templates/wpa-psk +-rw-rw-r-- root/root etc/wicd/encryption/templates/wpa-psk-hex -rw-rw-r-- root/root etc/wicd/encryption/templates/wpa2-leap -rw-rw-r-- root/root etc/wicd/encryption/templates/wpa2-peap drwxr-xr-x root/root etc/wicd/scripts/ @@ -35,6 +36,9 @@ drwxr-xr-x root/root etc/wicd/scripts/preconnect/ -rw-rw-r-- root/root etc/wicd/scripts/preconnect/.empty_on_purpose drwxr-xr-x root/root etc/wicd/scripts/predisconnect/ -rw-rw-r-- root/root etc/wicd/scripts/predisconnect/.empty_on_purpose +drwxr-xr-x root/root etc/xdg/ +drwxr-xr-x root/root etc/xdg/autostart/ +-rw-rw-r-- root/root etc/xdg/autostart/wicd-tray.desktop drwxr-xr-x root/root lib/ drwxr-xr-x root/root lib/systemd/ drwxr-xr-x root/root lib/systemd/system/ @@ -50,14 +54,11 @@ drwxr-xr-x root/root usr/etc/dbus-1/ drwxr-xr-x root/root usr/etc/dbus-1/system.d/ -rw-rw-r-- root/root usr/etc/dbus-1/system.d/wicd.conf drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/pm-utils/ -drwxr-xr-x root/root usr/lib/pm-utils/sleep.d/ --rwxrwxr-x root/root usr/lib/pm-utils/sleep.d/55wicd drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/wicd-1.7.2.4-py2.7.egg-info +-rw-r--r-- root/root usr/lib/python2.7/site-packages/wicd-1.7.4-py2.7.egg-info drwxr-xr-x root/root usr/lib/python2.7/site-packages/wicd/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/wicd/__init__.py (EMPTY) +-rw-r--r-- root/root usr/lib/python2.7/site-packages/wicd/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/wicd/__init__.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/wicd/backend.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/wicd/backend.pyc @@ -136,54 +137,6 @@ drwxr-xr-x root/root usr/share/man/man8/ -rw-rw-r-- root/root usr/share/man/man8/wicd.8.gz drwxr-xr-x root/root usr/share/pixmaps/ -rw-rw-r-- root/root usr/share/pixmaps/wicd-gtk.xpm -drwxr-xr-x root/root usr/share/pixmaps/wicd/ --rw-rw-r-- root/root usr/share/pixmaps/wicd/bad-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/bad-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/both-bad-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/both-bad-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/both-good-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/both-good-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/both-high-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/both-high-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/both-low-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/both-low-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/good-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/good-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/high-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/high-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/idle-bad-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/idle-bad-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/idle-good-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/idle-good-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/idle-high-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/idle-high-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/idle-low-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/idle-low-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/low-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/low-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/no-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/receiving-bad-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/receiving-bad-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/receiving-good-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/receiving-good-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/receiving-high-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/receiving-high-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/receiving-low-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/receiving-low-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/signal-100.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/signal-25.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/signal-50.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/signal-75.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/transmitting-bad-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/transmitting-bad-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/transmitting-good-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/transmitting-good-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/transmitting-high-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/transmitting-high-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/transmitting-low-signal-lock.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/transmitting-low-signal.png --rw-rw-r-- root/root usr/share/pixmaps/wicd/wired-gui.svg --rw-rw-r-- root/root usr/share/pixmaps/wicd/wired.png drwxr-xr-x root/root usr/share/wicd/ drwxr-xr-x root/root usr/share/wicd/backends/ -rw-rw-r-- root/root usr/share/wicd/backends/be-external.py @@ -224,9 +177,100 @@ drwxr-xr-x root/root usr/share/wicd/gtk/ -rw-r--r-- root/root usr/share/wicd/gtk/netentry.pyc -rw-rw-r-- root/root usr/share/wicd/gtk/prefs.py -rw-r--r-- root/root usr/share/wicd/gtk/prefs.pyc --rw-r--r-- root/root usr/share/wicd/gtk/wicd-client.py +-rw-rw-r-- root/root usr/share/wicd/gtk/wicd-client.py -rw-r--r-- root/root usr/share/wicd/gtk/wicd-client.pyc --rw-r--r-- root/root usr/share/wicd/gtk/wicd.ui +-rw-rw-r-- root/root usr/share/wicd/gtk/wicd.ui +drwxr-xr-x root/root usr/share/wicd/icons/ +drwxr-xr-x root/root usr/share/wicd/icons/hicolor/ +drwxr-xr-x root/root usr/share/wicd/icons/hicolor/16x16/ +drwxr-xr-x root/root usr/share/wicd/icons/hicolor/16x16/status/ +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/16x16/status/signal-100.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/16x16/status/signal-25.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/16x16/status/signal-50.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/16x16/status/signal-75.png +drwxr-xr-x root/root usr/share/wicd/icons/hicolor/22x22/ +drwxr-xr-x root/root usr/share/wicd/icons/hicolor/22x22/status/ +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/bad-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/bad-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/both-bad-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/both-bad-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/both-good-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/both-good-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/both-high-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/both-high-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/both-low-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/both-low-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/good-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/good-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/high-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/high-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/idle-bad-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/idle-bad-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/idle-good-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/idle-good-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/idle-high-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/idle-high-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/idle-low-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/idle-low-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/low-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/low-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/no-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/receiving-bad-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/receiving-bad-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/receiving-good-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/receiving-good-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/receiving-high-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/receiving-high-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/receiving-low-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/receiving-low-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/signal-100.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/signal-25.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/signal-50.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/signal-75.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/transmitting-bad-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/transmitting-bad-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/transmitting-good-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/transmitting-good-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/transmitting-high-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/transmitting-high-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/transmitting-low-signal-lock.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/transmitting-low-signal.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/22x22/status/wired.png +drwxr-xr-x root/root usr/share/wicd/icons/hicolor/24x24/ +drwxr-xr-x root/root usr/share/wicd/icons/hicolor/24x24/status/ +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/24x24/status/signal-100.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/24x24/status/signal-25.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/24x24/status/signal-50.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/24x24/status/signal-75.png +drwxr-xr-x root/root usr/share/wicd/icons/hicolor/32x32/ +drwxr-xr-x root/root usr/share/wicd/icons/hicolor/32x32/status/ +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/32x32/status/signal-100.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/32x32/status/signal-25.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/32x32/status/signal-50.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/32x32/status/signal-75.png +drwxr-xr-x root/root usr/share/wicd/icons/hicolor/36x36/ +drwxr-xr-x root/root usr/share/wicd/icons/hicolor/36x36/status/ +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/36x36/status/signal-100.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/36x36/status/signal-25.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/36x36/status/signal-50.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/36x36/status/signal-75.png +drwxr-xr-x root/root usr/share/wicd/icons/hicolor/48x48/ +drwxr-xr-x root/root usr/share/wicd/icons/hicolor/48x48/devices/ +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/48x48/devices/wired-gui.png +drwxr-xr-x root/root usr/share/wicd/icons/hicolor/48x48/status/ +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/48x48/status/signal-100.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/48x48/status/signal-25.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/48x48/status/signal-50.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/48x48/status/signal-75.png +drwxr-xr-x root/root usr/share/wicd/icons/hicolor/original/ +drwxr-xr-x root/root usr/share/wicd/icons/hicolor/original/status/ +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/original/status/signal-100.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/original/status/signal-25.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/original/status/signal-50.png +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/original/status/signal-75.png +drwxr-xr-x root/root usr/share/wicd/icons/hicolor/scalable/ +drwxr-xr-x root/root usr/share/wicd/icons/hicolor/scalable/devices/ +-rw-rw-r-- root/root usr/share/wicd/icons/hicolor/scalable/devices/wired-gui.svg drwxr-xr-x root/root var/ drwxr-xr-x root/root var/lib/ drwxr-xr-x root/root var/lib/wicd/ diff --git a/wicd/.signature b/wicd/.signature index 4c58261e..4288f5ae 100644 --- a/wicd/.signature +++ b/wicd/.signature @@ -1,9 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37A3ZI8UDesm3fdMTsy0f9uXgL9YCodkJb4J5NKYoQqHkr+7LTjlUnjZjoAwNYy/Qmlgbpz+1c+p2pGgZK+WXQ8= -SHA256 (Pkgfile) = ce783ef2bc9644e83d9b8c844ad83cd41e9725c4938255a391b8696832d22b07 -SHA256 (.footprint) = 0f31192888f5f78166e31c27149bade446641c8704428be55c0d89b8466224a6 -SHA256 (wicd-1.7.2.4.tar.gz) = dcfdfb5dbbb49dbb9b205fddf064d6b1a4e88f66f1cf40d12fb7fe0e0c7cdc97 +RWSagIOpLGJF3+8t+gwYMWkYDNXzCVb4b07xy4/t9YHenUTpFlUl4wX0fV+6EcWBpcJV3Mou0u71v02mkF5uq/1L5mJbSdM2Bwk= +SHA256 (Pkgfile) = d64b08d94e2c93523946608f8ada92938d4dbff85c585e6bf864eba064dba0c8 +SHA256 (.footprint) = d45c6085223d35a4412fbb9c53291a06b30d3798ce1e18282720dc76a1ec2c7c +SHA256 (wicd-1.7.4.tar.gz) = 67989614004773db349791c37675efb914d084bdb221356a05e4369c35e7eb62 SHA256 (wicd.rc) = 2d153bd96d561fae56b8b0bbba58584a634356718b1aa1e29a6c3efc08f25df9 -SHA256 (770) = 665c86a6412fd8178ef3ef1552180d4d6ec86f2c625cb6640816b5952e6b1192 -SHA256 (831) = 6770f31f3a701fcdb019562ec63e53653463aca471d0d907227f6608d671cdf2 -SHA256 (835) = 3eed2084f5631bdeb4a27ce1f729aa4be8cb12414af5364312b09005b75bc7b5 +SHA256 (wicd-1.7.3-bitrate-property.patch) = 06c38a1ac8c7f150473c33da4053badd19ae5b6cbae740b3511be012e63139a1 +SHA256 (wicd-1.7.3-undefined-LANG.patch) = 747f5a0b87460148af67c37cb63c563dd0ec68b362a1853836515f4ccfed182e +SHA256 (wicd-1.7.3-urwid-1.3.0.patch) = eed37078a474fa64da0290c34c9107f2562a76ddc3f73796e00124061862dc6b diff --git a/wicd/Pkgfile b/wicd/Pkgfile index b636164a..efbb0cfa 100644 --- a/wicd/Pkgfile +++ b/wicd/Pkgfile @@ -1,45 +1,41 @@ # Description: A wired and wireless network manager. # URL: http://launchpad.net/wicd # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: dbus-python pygtk urwid wpa_supplicant +# Depends on: dbus-python mii-tool pygtk wireless-tools wpa_supplicant name=wicd -version=1.7.2.4 -release=5 -source=(http://launchpad.net/wicd/1.7/$version/+download/$name-$version.tar.gz +version=1.7.4 +release=1 +source=(https://launchpad.net/wicd/${version%.*}/$version/+download/$name-$version.tar.gz wicd.rc - http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/diff/770 - http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/diff/831 - http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/diff/835) + wicd-1.7.3-bitrate-property.patch + wicd-1.7.3-undefined-LANG.patch + wicd-1.7.3-urwid-1.3.0.patch) build() { cd $name-$version - # https://launchpad.net/bugs/993912 - # http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/770 - patch -p0 -i $SRC/770 - - # https://launchpad.net/bugs/1075399 - # http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/831 - patch -p0 -i $SRC/831 - - # https://launchpad.net/bugs/1075399 - # http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/835 - patch -p0 -i $SRC/835 + patch -p1 -i $SRC/wicd-1.7.3-bitrate-property.patch + patch -p1 -i $SRC/wicd-1.7.3-undefined-LANG.patch + patch -p1 -i $SRC/wicd-1.7.3-urwid-1.3.0.patch # really don't use NLS - rm -r po + rm po/*.po /usr/bin/python setup.py configure \ - --dbus=/usr/etc/dbus-1/system.d \ --etc=/etc/wicd \ + --dbus=/usr/etc/dbus-1/system.d \ + --no-install-kde \ --no-install-acpi \ + --no-install-pmutils \ + --no-install-init \ --no-install-i18n-man \ - --no-install-docs + --no-install-docs \ + --no-install-gnome-shell-extensions + /usr/bin/python setup.py build /usr/bin/python setup.py install --root=$PKG /usr/bin/python -mcompileall $PKG - install -m 0744 -D $SRC/wicd.rc $PKG/etc/rc.d/wicd - rm -r $PKG/etc/xdg + install -m 0744 -D $SRC/wicd.rc $PKG/etc/rc.d/wicd } diff --git a/wicd/wicd-1.7.3-bitrate-property.patch b/wicd/wicd-1.7.3-bitrate-property.patch new file mode 100644 index 00000000..855a2939 --- /dev/null +++ b/wicd/wicd-1.7.3-bitrate-property.patch @@ -0,0 +1,19 @@ +--- a/curses/netentry_curses.py ++++ b/curses/netentry_curses.py +@@ -538,11 +538,12 @@ + self.bitrates = wireless.GetAvailableBitrates() + self.bitrates.append('auto') + self.bitrate_combo.set_list(self.bitrates) +- self.bitrate_combo.set_focus( +- self.bitrates.index( +- wireless.GetWirelessProperty(networkID, 'bitrate') ++ if wireless.GetWirelessProperty(networkID, 'bitrate'): ++ self.bitrate_combo.set_focus( ++ self.bitrates.index( ++ wireless.GetWirelessProperty(networkID, 'bitrate') ++ ) + ) +- ) + self.allow_lower_bitrates_chkbox.set_state( + to_bool(self.format_entry(networkID, 'allow_lower_bitrates')) + ) diff --git a/wicd/wicd-1.7.3-undefined-LANG.patch b/wicd/wicd-1.7.3-undefined-LANG.patch new file mode 100644 index 00000000..b854607d --- /dev/null +++ b/wicd/wicd-1.7.3-undefined-LANG.patch @@ -0,0 +1,24 @@ +Fixes compilation errors when os.environ['LANG'] is undefiend +--- ./setup.py ++++ ./setup.py +@@ -621,7 +621,7 @@ class compile_translations(Command): + shutil.rmtree('translations/') + os.makedirs('translations') + +- oldlang = os.environ['LANG'] ++ oldlang = os.environ.get('LANG', None) + os.environ['LANG'] = 'C' + + for pofile in sorted(glob('po/*.po')): +@@ -656,7 +656,10 @@ class compile_translations(Command): + os.makedirs('translations/' + lang + '/LC_MESSAGES/') + os.system('pybabel compile -D wicd -i %s -l %s -d translations/' % (pofile, lang)) + +- os.environ['LANG'] = oldlang ++ if oldlang is not None: ++ os.environ['LANG'] = oldlang ++ else: ++ del os.environ['LANG'] + + class uninstall(Command): + description = "remove Wicd using uninstall.sh and install.log" diff --git a/wicd/wicd-1.7.3-urwid-1.3.0.patch b/wicd/wicd-1.7.3-urwid-1.3.0.patch new file mode 100644 index 00000000..d7f73dca --- /dev/null +++ b/wicd/wicd-1.7.3-urwid-1.3.0.patch @@ -0,0 +1,15 @@ +--- a/curses/wicd-curses.py ++++ b/curses/wicd-curses.py +@@ -1153,9 +1153,10 @@ + 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)