From: Hugo Villeneuve <hugo@hugovil.com>
Date: Sun, 15 Mar 2015 15:51:07 +0000 (-0400)
Subject: Add Wicd
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=47f2031ebd11633c79f3fb0fd173658b2d2ef3d4;p=hvlinux.git

Add Wicd
---

diff --git a/config/packages-list b/config/packages-list
index 3709766..b345e16 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -56,6 +56,7 @@ CVS="cvs-1.11.23"
 
 DBUS="dbus-1.8.12"
 DBUS_GLIB="dbus-glib-0.102"
+DBUS_PYTHON="dbus-python-1.2.0"
 DDCLIENT="ddclient-3.6.7"
 DEJAGNU="dejagnu-1.4.4"
 DEJAVUFONTS="dejavu-fonts-ttf-2.33"
@@ -433,6 +434,7 @@ VTE="vte-0.28.2"
 
 WEBKIT="webkit-1.8.3"
 WGET="wget-1.16.1"
+WICD="wicd-1.7.3"
 WHICH="which-2.20"
 WINDOWMAKER="WindowMaker-0.95.6"
 WINDOWMAKER_EXTRA="WindowMaker-extra-0.1"
diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 5317017..57e8668 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -74,6 +74,9 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${LIBSOUP} "--disable-static --without-gnome"
 
     ipkg ${XSCREENSAVER} "--libexecdir=/usr/lib"
+
+    ipkg -m noac ${DBUS_PYTHON}
+    ipkg -m acnb ${WICD}
 fi
 
 ipkg ${GPARTED} "--disable-doc"
diff --git a/stage5/packages-update b/stage5/packages-update
index 12f208a..2206f5c 100755
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -246,4 +246,8 @@ fpkg -e "tar.gz" -m hv ${CELESTIA}
 fpkg ${I2C_TOOLS} "http://dl.lm-sensors.org/i2c-tools/releases"
 fpkg -m sf ${HDPARM}
 
+fpkg -e "tar.gz" ${DBUS_PYTHON} \
+    "http://dbus.freedesktop.org/releases/dbus-python"
+fpkg -e "tar.gz" ${WICD} "https://launchpad.net/wicd/$(get_pkg_ver2 ${WICD})/$(get_pkg_ver ${WICD})/+download"
+
 exit $?
diff --git a/stage5/pkg/dbus-python b/stage5/pkg/dbus-python
new file mode 100644
index 0000000..491430a
--- /dev/null
+++ b/stage5/pkg/dbus-python
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+hvbuild()
+{
+    cd ${SRC_DIR}
+    mkdir python2
+    pushd python2
+    PYTHON=/usr/bin/python \
+        ../configure \
+        --prefix=/usr
+    make
+    popd
+    make -C python2 install
+}
diff --git a/stage5/pkg/wicd b/stage5/pkg/wicd
new file mode 100644
index 0000000..e261990
--- /dev/null
+++ b/stage5/pkg/wicd
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+hvconfig()
+{
+    cd ${SRC_DIR}
+
+    # The first command in this sed prevents installation of logrotate and
+    # systemd configuration files.
+    # The second command in this sed fixes buildng with BLFS “distro”.
+    sed -e "/wpath.logrotate\|wpath.systemd/d" \
+        -e "/detection failed/ a\                self.init=\'init\/default\/wicd\'" \
+        -i setup.py
+
+    rm po/*.po
+
+    python setup.py configure \
+        --no-install-kde     \
+        --no-install-acpi    \
+        --no-install-pmutils \
+        --no-install-init    \
+        --no-install-gnome-shell-extensions
+}
+
+hvbuild()
+{
+    LANG=C python setup.py install
+}