[arch-commits] Commit in wicd/repos/extra-any (11 files)

Antonio Rojas arojas at archlinux.org
Thu Jul 11 12:26:41 UTC 2019


    Date: Thursday, July 11, 2019 @ 12:26:40
  Author: arojas
Revision: 357750

archrelease: copy trunk to extra-any

Added:
  wicd/repos/extra-any/PKGBUILD
    (from rev 357749, wicd/trunk/PKGBUILD)
  wicd/repos/extra-any/dbus_string_fix.patch
    (from rev 357749, wicd/trunk/dbus_string_fix.patch)
  wicd/repos/extra-any/wicd-1.7.3-urwid-1.3.0.patch
    (from rev 357749, wicd/trunk/wicd-1.7.3-urwid-1.3.0.patch)
  wicd/repos/extra-any/wicd.desktop
    (from rev 357749, wicd/trunk/wicd.desktop)
  wicd/repos/extra-any/wicd.install
    (from rev 357749, wicd/trunk/wicd.install)
Deleted:
  wicd/repos/extra-any/PKGBUILD
  wicd/repos/extra-any/dbus_string_fix.patch
  wicd/repos/extra-any/wicd-1.7.3-urwid-1.3.0.patch
  wicd/repos/extra-any/wicd-gtk.install
  wicd/repos/extra-any/wicd.desktop
  wicd/repos/extra-any/wicd.install

------------------------------+
 PKGBUILD                     |  218 ++++++++++++++++++++---------------------
 dbus_string_fix.patch        |   32 +++---
 wicd-1.7.3-urwid-1.3.0.patch |   30 ++---
 wicd-gtk.install             |   11 --
 wicd.desktop                 |   22 ++--
 wicd.install                 |   38 +++----
 6 files changed, 169 insertions(+), 182 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-11 12:26:15 UTC (rev 357749)
+++ PKGBUILD	2019-07-11 12:26:40 UTC (rev 357750)
@@ -1,110 +0,0 @@
-# Maintainer: Angel Velasquez <angvp at archlinux.org> 
-# Contributor: Daniel Isenmann <daniel at archlinux.org>
-# Contributor: Rashif "Don Ray" Rahman <rayrashif at gmail.com>
-
-pkgbase=wicd
-pkgname=('wicd' 'wicd-gtk')
-pkgver=1.7.4
-pkgrel=3
-arch=(any)
-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
-        wicd-1.7.3-urwid-1.3.0.patch)
-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'
-             'hicolor-icon-theme')
-options=('emptydirs')
-sha512sums=('1e99a45daa858eba634e60e50c22aa2fab3fc4d643979a6741b6164bf500bd6db285d11c12ccd164ab6cf0792284e319e3c3447804088e74b4fc67bb6f431959'
-            '48ea8e732eb661888288fd7bd9aacddea71cb8bdeea5dbc9a4c31cdddb38e7e1e5bc64ce98b9b6f248f6b416582fc64d173da64d79d0a109ca610e08635013fa'
-            '48183d805b096c4a1857990d1d9a709544406ee93607f96d4eaf46e4f7729a73e0178251f1168aa516c38bba727821c70a9104de84ca5b4288f91219dfeed2e9')
-
-prepare() {
-  cd $pkgbase-$pkgver
-
-  find . -type f -exec sed -i 's@#!/usr.*python@#!/usr/bin/python2@' {} \;
-  sed -i 's/pybabel/pybabel2/g' setup.py 
-  export PYTHON=python2
-  
-  sed -i 's|/usr/sbin/|/usr/bin/|' other/wicd.service
-  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 \
-      --no-install-gnome-shell-extensions \
-      --dbus=/usr/share/dbus-1/system.d \
-      --systemd=/usr/lib/systemd/system
-  python2 setup.py build
-  python2 setup.py compile_translations
-  
-  #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
-}
-
-package_wicd() {
-  pkgdesc="Wired and wireless network manager for Linux"
-  depends=('python2' 'python2-dbus' 'dhcpcd' 'wpa_supplicant' 'wireless_tools'
-           'inetutils' 'net-tools' 'ethtool' 'shared-mime-info' 'python2-urwid' 'python2-gobject2' 'dbus-glib' 'rfkill')
-  optdepends=('wicd-gtk: needed if you want the GTK interface')
-  backup=('etc/wicd/encryption/templates/active')
-  install=wicd.install  
-
-  cd $pkgbase-$pkgver
-  python2 setup.py install --skip-build --optimize=1 --root="$pkgdir"
-
-  cd build/lib/wicd
-  for i in *.py; do
-    install -Dm 755 $i "$pkgdir/usr/lib/wicd/$i"
-  done
-  
-  rm -rf "$pkgdir"/usr/share/autostart
-
-  #deleting the GTK stuff
-  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,icons}  
-}
-
-package_wicd-gtk() {
-  pkgdesc="Wired and wireless network manager for Linux - GTK client"
-  depends=('wicd' 'pygtk' 'hicolor-icon-theme')
-  optdepends=('gksu: needed to access some preferences in gtk interface'
-              'notification-daemon: needed if you want notifications'
-              'python2-notify:	needed if you want notifications')
-  install=wicd-gtk.install 
-
-  cd $pkgbase-$pkgver
-  python2 setup.py install --skip-build --optimize=1 --root="$pkgdir"
-
-  install -Dm644 "$srcdir/wicd.desktop" "$pkgdir/usr/share/applications/wicd.desktop"
-
-  cd build/lib/wicd
-  for i in *.py; do
-    install -Dm 755 $i "$pkgdir"/usr/lib/wicd/$i
-  done
-  
-  #deleting the core dirs which exists in wicd
-  rm -rf "$pkgdir"/etc/{wicd,rc.d,logrotate.d}
-  rm -rf "$pkgdir"/usr/lib
-  rm -rf "$pkgdir"/usr/share/{man,doc,locale,wicd/curses,wicd/daemon,wicd/backends,wicd/scripts,wicd/cli}
-  rm -rf "$pkgdir"/var
-  rm -f "$pkgdir"/usr/bin/{wicd,wicd-curses,wicd-cli}
-
-  rm -rf "$pkgdir"/usr/share/autostart
-  rm -rf "$pkgdir"/usr/share/dbus-1
-}

Copied: wicd/repos/extra-any/PKGBUILD (from rev 357749, wicd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-07-11 12:26:40 UTC (rev 357750)
@@ -0,0 +1,108 @@
+# Maintainer: Angel Velasquez <angvp at archlinux.org> 
+# Contributor: Daniel Isenmann <daniel at archlinux.org>
+# Contributor: Rashif "Don Ray" Rahman <rayrashif at gmail.com>
+
+pkgbase=wicd
+pkgname=('wicd' 'wicd-gtk')
+pkgver=1.7.4
+pkgrel=4
+arch=(any)
+url="https://launchpad.net/wicd/"
+license=('GPL2')
+conflicts=('wicd-svn')
+install=wicd.install
+source=(https://launchpad.net/wicd/1.7/$pkgver/+download/wicd-$pkgver.tar.gz
+        wicd.desktop
+        wicd-1.7.3-urwid-1.3.0.patch)
+makedepends=('python2' 'python2-babel' 'python2-setuptools' 'gettext' 'dbus-glib' 'dhcpcd' 
+             'ethtool' 'inetutils' 'net-tools' 'pygtk' 'python2-dbus' 'python2-gobject2' 
+             'python2-urwid' 'shared-mime-info' 'wireless_tools' 'wpa_supplicant'
+             'hicolor-icon-theme')
+options=('emptydirs')
+sha512sums=('1e99a45daa858eba634e60e50c22aa2fab3fc4d643979a6741b6164bf500bd6db285d11c12ccd164ab6cf0792284e319e3c3447804088e74b4fc67bb6f431959'
+            '48ea8e732eb661888288fd7bd9aacddea71cb8bdeea5dbc9a4c31cdddb38e7e1e5bc64ce98b9b6f248f6b416582fc64d173da64d79d0a109ca610e08635013fa'
+            '48183d805b096c4a1857990d1d9a709544406ee93607f96d4eaf46e4f7729a73e0178251f1168aa516c38bba727821c70a9104de84ca5b4288f91219dfeed2e9')
+
+prepare() {
+  cd $pkgbase-$pkgver
+
+  find . -type f -exec sed -i 's@#!/usr.*python@#!/usr/bin/python2@' {} \;
+  sed -i 's/pybabel/pybabel2/g' setup.py 
+  export PYTHON=python2
+  
+  sed -i 's|/usr/sbin/|/usr/bin/|' other/wicd.service
+  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 \
+      --no-install-gnome-shell-extensions \
+      --dbus=/usr/share/dbus-1/system.d \
+      --systemd=/usr/lib/systemd/system
+  python2 setup.py build
+  python2 setup.py compile_translations
+  
+  #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
+}
+
+package_wicd() {
+  pkgdesc="Wired and wireless network manager for Linux"
+  depends=('python2' 'python2-dbus' 'dhcpcd' 'wpa_supplicant' 'wireless_tools'
+           'inetutils' 'net-tools' 'ethtool' 'shared-mime-info' 'python2-urwid' 'python2-gobject2' 'dbus-glib' 'rfkill')
+  optdepends=('wicd-gtk: needed if you want the GTK interface')
+  backup=('etc/wicd/encryption/templates/active')
+  install=wicd.install  
+
+  cd $pkgbase-$pkgver
+  python2 setup.py install --skip-build --optimize=1 --root="$pkgdir"
+
+  cd build/lib/wicd
+  for i in *.py; do
+    install -Dm 755 $i "$pkgdir/usr/lib/wicd/$i"
+  done
+  
+  rm -rf "$pkgdir"/usr/share/autostart
+
+  #deleting the GTK stuff
+  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,icons}  
+}
+
+package_wicd-gtk() {
+  pkgdesc="Wired and wireless network manager for Linux - GTK client"
+  depends=('wicd' 'pygtk' 'hicolor-icon-theme')
+  optdepends=('notification-daemon: needed if you want notifications'
+              'python2-notify:	needed if you want notifications')
+
+  cd $pkgbase-$pkgver
+  python2 setup.py install --skip-build --optimize=1 --root="$pkgdir"
+
+  install -Dm644 "$srcdir/wicd.desktop" "$pkgdir/usr/share/applications/wicd.desktop"
+
+  cd build/lib/wicd
+  for i in *.py; do
+    install -Dm 755 $i "$pkgdir"/usr/lib/wicd/$i
+  done
+  
+  #deleting the core dirs which exists in wicd
+  rm -rf "$pkgdir"/etc/{wicd,rc.d,logrotate.d}
+  rm -rf "$pkgdir"/usr/lib
+  rm -rf "$pkgdir"/usr/share/{man,doc,locale,wicd/curses,wicd/daemon,wicd/backends,wicd/scripts,wicd/cli}
+  rm -rf "$pkgdir"/var
+  rm -f "$pkgdir"/usr/bin/{wicd,wicd-curses,wicd-cli}
+
+  rm -rf "$pkgdir"/usr/share/autostart
+  rm -rf "$pkgdir"/usr/share/dbus-1
+}

Deleted: dbus_string_fix.patch
===================================================================
--- dbus_string_fix.patch	2019-07-11 12:26:15 UTC (rev 357749)
+++ dbus_string_fix.patch	2019-07-11 12:26:40 UTC (rev 357750)
@@ -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. """
-

Copied: wicd/repos/extra-any/dbus_string_fix.patch (from rev 357749, wicd/trunk/dbus_string_fix.patch)
===================================================================
--- dbus_string_fix.patch	                        (rev 0)
+++ dbus_string_fix.patch	2019-07-11 12:26:40 UTC (rev 357750)
@@ -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. """
+

Deleted: wicd-1.7.3-urwid-1.3.0.patch
===================================================================
--- wicd-1.7.3-urwid-1.3.0.patch	2019-07-11 12:26:15 UTC (rev 357749)
+++ wicd-1.7.3-urwid-1.3.0.patch	2019-07-11 12:26:40 UTC (rev 357750)
@@ -1,15 +0,0 @@
---- 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)

Copied: wicd/repos/extra-any/wicd-1.7.3-urwid-1.3.0.patch (from rev 357749, wicd/trunk/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	2019-07-11 12:26:40 UTC (rev 357750)
@@ -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)

Deleted: wicd-gtk.install
===================================================================
--- wicd-gtk.install	2019-07-11 12:26:15 UTC (rev 357749)
+++ wicd-gtk.install	2019-07-11 12:26:40 UTC (rev 357750)
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Deleted: wicd.desktop
===================================================================
--- wicd.desktop	2019-07-11 12:26:15 UTC (rev 357749)
+++ wicd.desktop	2019-07-11 12:26:40 UTC (rev 357750)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Categories=Network;
-Encoding=UTF-8
-Exec=/usr/bin/wicd-client
-GenericName=Network Manager
-Icon=wicd-gtk
-Comment=Manage Wired/Wireless Networks
-Name=Wicd
-Terminal=false
-Type=Application
-Version=1.0

Copied: wicd/repos/extra-any/wicd.desktop (from rev 357749, wicd/trunk/wicd.desktop)
===================================================================
--- wicd.desktop	                        (rev 0)
+++ wicd.desktop	2019-07-11 12:26:40 UTC (rev 357750)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Categories=Network;
+Encoding=UTF-8
+Exec=/usr/bin/wicd-client
+GenericName=Network Manager
+Icon=wicd-gtk
+Comment=Manage Wired/Wireless Networks
+Name=Wicd
+Terminal=false
+Type=Application
+Version=1.0

Deleted: wicd.install
===================================================================
--- wicd.install	2019-07-11 12:26:15 UTC (rev 357749)
+++ wicd.install	2019-07-11 12:26:40 UTC (rev 357750)
@@ -1,19 +0,0 @@
-PKGNAME=wicd
-
-pre_remove () {
-    for pyo in $(pacman -Qql $PKGNAME  | grep \.py$ | sed 's|.py$|.pyo|g'); do
-        if [ -f "$pyo" ]; then
-            rm "$pyo"
-        fi
-    done
-}
-
-post_install() {
-  echo
-  echo "==> You need to restart the dbus service after "
-  echo "==> upgrading wicd."
-  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"    
-}

Copied: wicd/repos/extra-any/wicd.install (from rev 357749, wicd/trunk/wicd.install)
===================================================================
--- wicd.install	                        (rev 0)
+++ wicd.install	2019-07-11 12:26:40 UTC (rev 357750)
@@ -0,0 +1,19 @@
+PKGNAME=wicd
+
+pre_remove () {
+    for pyo in $(pacman -Qql $PKGNAME  | grep \.py$ | sed 's|.py$|.pyo|g'); do
+        if [ -f "$pyo" ]; then
+            rm "$pyo"
+        fi
+    done
+}
+
+post_install() {
+  echo
+  echo "==> You need to restart the dbus service after "
+  echo "==> upgrading wicd."
+  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