[arch-commits] Commit in wicd/trunk (4 files)
Ángel Velásquez
angvp at archlinux.org
Wed Jan 28 04:39:56 UTC 2015
Date: Wednesday, January 28, 2015 @ 05:39:55
Author: angvp
Revision: 230155
upgpkg: wicd 1.7.3-1
Bump version to 1.7.3
Added:
wicd/trunk/wicd-1.7.3-urwid-1.3.0.patch
Modified:
wicd/trunk/PKGBUILD
wicd/trunk/wicd.install
Deleted:
wicd/trunk/wicd-1.7.2.4-urwid-1.3.0.patch
--------------------------------+
PKGBUILD | 52 +++++++++++++++------------------------
wicd-1.7.2.4-urwid-1.3.0.patch | 17 ------------
wicd-1.7.3-urwid-1.3.0.patch | 15 +++++++++++
wicd.install | 2 -
4 files changed, 37 insertions(+), 49 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-01-27 21:58:33 UTC (rev 230154)
+++ PKGBUILD 2015-01-28 04:39:55 UTC (rev 230155)
@@ -4,25 +4,19 @@
pkgbase=wicd
pkgname=('wicd' 'wicd-gtk')
-pkgver=1.7.2.4
-pkgrel=10
+pkgver=1.7.3
+pkgrel=1
arch=(any)
-url="http://wicd.sourceforge.net/"
+url="https://launchpad.net/wicd/"
license=('GPL2')
conflicts=('wicd-svn')
install=wicd.install
source=(http://launchpad.net/wicd/1.7/$pkgver/+download/wicd-$pkgver.tar.gz
wicd.desktop
- dbus_string_fix.patch
- http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/diff/831
- http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/diff/835
- wicd-1.7.2.4-urwid-1.3.0.patch)
-md5sums=('c2435ddfdef0b9898852d72a85a45f0f'
+ wicd-1.7.3-urwid-1.3.0.patch)
+md5sums=('162ca2e6f4ab903bb7ab2bc0adb7d1aa'
'326df163a5732d38741371baa4fce9e5'
- '744b3c12fe901ed435351e884dc8cb1d'
- '0d2355bc2eb7234a537f42f1773edfe0'
- '1630d7fe8f09911302d33b26286ff9b8'
- '797a1663714da24e446c50698bba25b5')
+ 'f7e6085e482f37f2b8529326c21cbbbf')
makedepends=('python2' 'python2-babel' 'python2-setuptools' 'gettext' 'dbus-glib' 'dhcpcd'
'ethtool' 'inetutils' 'net-tools' 'pygtk' 'python2-dbus' 'python2-gobject2'
'python2-urwid' 'rfkill' 'shared-mime-info' 'wireless_tools' 'wpa_supplicant'
@@ -37,26 +31,22 @@
export PYTHON=python2
sed -i 's|/usr/sbin/|/usr/bin/|' other/wicd.service
-
- patch -p0 < "$srcdir/dbus_string_fix.patch"
-
- # Fix problem with new urwid FS#33378 LP#1075399
- patch -Np0 -i "$srcdir/831"
- patch -Np0 -i "$srcdir/835"
- patch -p1 -i "$srcdir/wicd-1.7.2.4-urwid-1.3.0.patch"
+ patch -Np0 -i "$srcdir/wicd-1.7.3-urwid-1.3.0.patch"
}
build() {
cd $pkgbase-$pkgver
-
- python2 setup.py configure --no-install-init \
- --resume=/usr/share/wicd/scripts/ \
- --suspend=/usr/share/wicd/scripts/ \
- --verbose \
- --python=/usr/bin/python2 \
- --lib=/usr/lib \
- --sbin=/usr/bin \
- --systemd=/usr/lib/systemd/system
+ python2 setup.py configure \
+ --no-install-init \
+ --resume=/usr/share/wicd/scripts/ \
+ --suspend=/usr/share/wicd/scripts/ \
+ --verbose \
+ --python=/usr/bin/python2 \
+ --lib=/usr/lib \
+ --sbin=/usr/bin \
+ --no-install-gnome-shell-extensions \
+ --systemd=/usr/lib/systemd/system
+ python2 setup.py build
python2 setup.py compile_translations
#HACK for https://bugs.launchpad.net/wicd/+bug/928589
@@ -73,7 +63,7 @@
install=wicd.install
cd $pkgbase-$pkgver
- python2 setup.py install --optimize=1 --root="$pkgdir"
+ python2 setup.py install --skip-build --optimize=1 --root="$pkgdir"
cd build/lib/wicd
for i in *.py; do
@@ -86,7 +76,7 @@
rm -rf "$pkgdir"/etc/xdg
rm -f "$pkgdir"/usr/bin/{wicd-client,wicd-gtk}
rm -rf "$pkgdir"/usr/share/{applications,icons,pixmaps}
- rm -rf "$pkgdir"/usr/share/wicd/gtk
+ rm -rf "$pkgdir"/usr/share/wicd/{gtk,icons}
}
package_wicd-gtk() {
@@ -98,7 +88,7 @@
install=wicd-gtk.install
cd $pkgbase-$pkgver
- python2 setup.py install --optimize=1 --root="$pkgdir"
+ python2 setup.py install --skip-build --optimize=1 --root="$pkgdir"
install -Dm644 "$srcdir/wicd.desktop" "$pkgdir/usr/share/applications/wicd.desktop"
Deleted: wicd-1.7.2.4-urwid-1.3.0.patch
===================================================================
--- wicd-1.7.2.4-urwid-1.3.0.patch 2015-01-27 21:58:33 UTC (rev 230154)
+++ wicd-1.7.2.4-urwid-1.3.0.patch 2015-01-28 04:39:55 UTC (rev 230155)
@@ -1,17 +0,0 @@
-diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py
-index 641aa52..603609b 100755
---- a/curses/wicd-curses.py
-+++ b/curses/wicd-curses.py
-@@ -927,9 +927,10 @@ class appGUI():
- 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 )
Added: wicd-1.7.3-urwid-1.3.0.patch
===================================================================
--- wicd-1.7.3-urwid-1.3.0.patch (rev 0)
+++ wicd-1.7.3-urwid-1.3.0.patch 2015-01-28 04:39:55 UTC (rev 230155)
@@ -0,0 +1,15 @@
+--- curses/wicd-curses.py 2015-01-27 22:35:25.414781192 -0300
++++ cursesb/wicd-curses.py 2015-01-28 01:13:48.078904587 -0300
+@@ -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)
Modified: wicd.install
===================================================================
--- wicd.install 2015-01-27 21:58:33 UTC (rev 230154)
+++ wicd.install 2015-01-28 04:39:55 UTC (rev 230155)
@@ -12,7 +12,7 @@
echo
echo "==> You need to restart the dbus service after "
echo "==> upgrading wicd."
- echo "==> Disable networkmanager,dhcdbd or other networking "
+ echo "==> Disable networkmanager, dhcpcd or other networking "
echo "==> utility and add 'wicd' to your systemd configuration."
echo
echo "==> To run: wicd-cli or wicd-curses"
More information about the arch-commits
mailing list