From 98c1710689a16611f4b276b402c2aeee9fdde78d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 6 May 2020 00:11:15 +0300
Subject: [PATCH] wicd: fix package - configure to use dhclient and kdesu by
 default   (the default dhcpcd does not work) - use included .desktop files
 instead of providing extra - allow users in network group to control daemon
 via dbus

---
 srcpkgs/wicd/INSTALL.msg                 |  2 +-
 srcpkgs/wicd/files/manager-settings.conf |  9 +++++++++
 srcpkgs/wicd/files/wicd.desktop          | 11 -----------
 srcpkgs/wicd/template                    | 21 +++++++++++++--------
 4 files changed, 23 insertions(+), 20 deletions(-)
 create mode 100755 srcpkgs/wicd/files/manager-settings.conf
 delete mode 100644 srcpkgs/wicd/files/wicd.desktop

diff --git a/srcpkgs/wicd/INSTALL.msg b/srcpkgs/wicd/INSTALL.msg
index 223db8a8d11..9f89e152150 100644
--- a/srcpkgs/wicd/INSTALL.msg
+++ b/srcpkgs/wicd/INSTALL.msg
@@ -5,4 +5,4 @@ boot, please disable them before using wicd. You can do that with:
 	# rm -f /var/service/{dhcpcd,wpa_supplicant}
 
 ATTENTION: to make wicd work for your user, it must be a member
-of the 'users' group.
+of the 'network' group.
diff --git a/srcpkgs/wicd/files/manager-settings.conf b/srcpkgs/wicd/files/manager-settings.conf
new file mode 100755
index 00000000000..8133dea5e8d
--- /dev/null
+++ b/srcpkgs/wicd/files/manager-settings.conf
@@ -0,0 +1,9 @@
+[Settings]
+always_show_wired_interface = True
+auto_reconnect = True
+wired_connect_mode = 0
+dhcp_client = 1
+sudo_app = 2
+prefer_wired = True
+show_never_connect = True
+
diff --git a/srcpkgs/wicd/files/wicd.desktop b/srcpkgs/wicd/files/wicd.desktop
deleted file mode 100644
index 2c8f6de1f31..00000000000
--- a/srcpkgs/wicd/files/wicd.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Categories=Application;Network;Internet;
-Encoding=UTF-8
-Exec=/usr/bin/wicd-client -n
-GenericName=Network Manager
-Icon=wicd-gtk.png
-Comment=Manage Wired/Wireless Networks
-Name=Wicd
-Terminal=false
-Type=Application
-Version=1.0
diff --git a/srcpkgs/wicd/template b/srcpkgs/wicd/template
index 151c326c721..e4980993367 100644
--- a/srcpkgs/wicd/template
+++ b/srcpkgs/wicd/template
@@ -1,22 +1,21 @@
 # Template file for 'wicd'
 pkgname=wicd
 version=1.7.4
-revision=4
+revision=5
 archs=noarch
-pycompile_module="wicd"
-pycompile_dirs="usr/lib/wicd usr/share/wicd"
 hostmakedepends="python python-setuptools python-Babel"
-depends="dbus-glib dhcpcd ethtool net-tools python-dbus python-gobject2 python-urwid
+depends="dbus-glib dhclient ethtool net-tools python-dbus python-gobject2 python-urwid
  util-linux wireless_tools wpa_supplicant"
 conf_files="
 	/etc/dbus-1/system.d/wicd.conf
 	/etc/wicd/encryption/templates/active"
 short_desc="Open source wired and wireless network manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://wicd.sourceforge.net"
 distfiles="http://launchpad.net/wicd/1.7/${version}/+download/wicd-${version}.tar.gz"
 checksum=67989614004773db349791c37675efb914d084bdb221356a05e4369c35e7eb62
+python_version=2
 
 do_build() {
 	python2 setup.py configure --verbose --no-install-init \
@@ -24,12 +23,18 @@ do_build() {
 		--suspend=/usr/share/wicd/scripts \
 		--python=/usr/bin/python2 --lib=/usr/lib \
 		--sbin=/usr/bin --distro=arch \
-		--no-install-gnome-shell-extensions
+		--no-install-gnome-shell-extensions \
+		--wicdgroup=network
 }
 do_install() {
 	python2 setup.py install --root=${DESTDIR}
 
-	vinstall ${FILESDIR}/wicd.desktop 644 usr/share/applications
+	vinstall other/wicd.desktop 644 usr/share/applications
+	vinstall other/wicd-tray.desktop 644 usr/share/applications
+
+	# Copy configuration to force use of dhclient.
+	vinstall ${FILESDIR}/manager-settings.conf 755 etc/wicd
+
 	vmkdir usr/lib/wicd
 	vcopy "build/lib/wicd/*.py" usr/lib/wicd
 	chmod 755 ${DESTDIR}/usr/lib/wicd/*.py
@@ -43,7 +48,7 @@ do_install() {
 
 wicd-gtk_package() {
 	archs=noarch
-	depends="wicd>=${version} pygtk python-notify shared-mime-info desktop-file-utils hicolor-icon-theme"
+	depends="wicd>=${version} pygtk python-notify shared-mime-info desktop-file-utils hicolor-icon-theme kdesu"
 	short_desc+=" - GTK UI"
 	pycompile_dirs="usr/share/wicd/gtk"
 	pkg_install() {