Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] wicd: fix package
@ 2020-05-05 21:16 mobinmob
  2020-05-05 21:44 ` [PR PATCH] [Updated] " mobinmob
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: mobinmob @ 2020-05-05 21:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 705 bytes --]

There is a new pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages wicd-fix
https://github.com/void-linux/void-packages/pull/21665

wicd: fix package
- configure to use dhclient and kdesu 
  (the default dhcpcd does not work)
- use included .desktop files instead of providing extra
- allow users in network group to control daemon via dbus

@Gottox : This PR makes wicd use the same group for dbus as connman (https://github.com/void-linux/void-packages/pull/21618) and 
NetworkManager (https://github.com/void-linux/void-packages/pull/21608).

A patch file from https://github.com/void-linux/void-packages/pull/21665.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wicd-fix-21665.patch --]
[-- Type: text/x-diff, Size: 3856 bytes --]

From 27d6e2592375d10f6d7460ae897cd183694269b1 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                    | 19 ++++++++++++-------
 4 files changed, 22 insertions(+), 19 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..7e4c9a7d1a0 100644
--- a/srcpkgs/wicd/template
+++ b/srcpkgs/wicd/template
@@ -1,13 +1,11 @@
 # 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
- util-linux wireless_tools wpa_supplicant"
+depends="dbus-glib dhclient ethtool net-tools python-dbus python-gobject2 python-urwid
+ util-linux wireless_tools wpa_supplicant kdesu"
 conf_files="
 	/etc/dbus-1/system.d/wicd.conf
 	/etc/wicd/encryption/templates/active"
@@ -17,6 +15,7 @@ license="GPL-2"
 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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] wicd: fix package
  2020-05-05 21:16 [PR PATCH] wicd: fix package mobinmob
@ 2020-05-05 21:44 ` mobinmob
  2020-05-07 18:33 ` mobinmob
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: mobinmob @ 2020-05-05 21:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 710 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages wicd-fix
https://github.com/void-linux/void-packages/pull/21665

wicd: fix package
- configure to use dhclient and kdesu 
  (the default dhcpcd does not work)
- use included .desktop files instead of providing extra
- allow users in network group to control daemon via dbus

@Gottox : This PR makes wicd use the same group for dbus as connman (https://github.com/void-linux/void-packages/pull/21618) and 
NetworkManager (https://github.com/void-linux/void-packages/pull/21608).

A patch file from https://github.com/void-linux/void-packages/pull/21665.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wicd-fix-21665.patch --]
[-- Type: text/x-diff, Size: 3972 bytes --]

From d5b2ca4dc9f00e5f6db4dd5e01cc65d01c9e66bf 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..f3f17228ddc 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
- util-linux wireless_tools wpa_supplicant"
+depends="dbus-glib dhclient ethtool net-tools python-dbus python-gobject2 python-urwid
+ util-linux wireless_tools wpa_supplicant kdesu"
 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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] wicd: fix package
  2020-05-05 21:16 [PR PATCH] wicd: fix package mobinmob
  2020-05-05 21:44 ` [PR PATCH] [Updated] " mobinmob
@ 2020-05-07 18:33 ` mobinmob
  2020-05-12 10:03 ` mobinmob
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: mobinmob @ 2020-05-07 18:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 710 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages wicd-fix
https://github.com/void-linux/void-packages/pull/21665

wicd: fix package
- configure to use dhclient and kdesu 
  (the default dhcpcd does not work)
- use included .desktop files instead of providing extra
- allow users in network group to control daemon via dbus

@Gottox : This PR makes wicd use the same group for dbus as connman (https://github.com/void-linux/void-packages/pull/21618) and 
NetworkManager (https://github.com/void-linux/void-packages/pull/21608).

A patch file from https://github.com/void-linux/void-packages/pull/21665.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wicd-fix-21665.patch --]
[-- Type: text/x-diff, Size: 4290 bytes --]

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() {

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] wicd: fix package
  2020-05-05 21:16 [PR PATCH] wicd: fix package mobinmob
  2020-05-05 21:44 ` [PR PATCH] [Updated] " mobinmob
  2020-05-07 18:33 ` mobinmob
@ 2020-05-12 10:03 ` mobinmob
  2020-05-12 10:06 ` mobinmob
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: mobinmob @ 2020-05-12 10:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 710 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages wicd-fix
https://github.com/void-linux/void-packages/pull/21665

wicd: fix package
- configure to use dhclient and kdesu 
  (the default dhcpcd does not work)
- use included .desktop files instead of providing extra
- allow users in network group to control daemon via dbus

@Gottox : This PR makes wicd use the same group for dbus as connman (https://github.com/void-linux/void-packages/pull/21618) and 
NetworkManager (https://github.com/void-linux/void-packages/pull/21608).

A patch file from https://github.com/void-linux/void-packages/pull/21665.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wicd-fix-21665.patch --]
[-- Type: text/x-diff, Size: 3969 bytes --]

From 82d1919308bfa28ba521f1bca79255164f81580f 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                 |  3 ++-
 srcpkgs/wicd/files/manager-settings.conf |  9 +++++++++
 srcpkgs/wicd/files/wicd.desktop          | 11 -----------
 srcpkgs/wicd/template                    | 19 ++++++++++++-------
 4 files changed, 23 insertions(+), 19 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..1665d17053b 100644
--- a/srcpkgs/wicd/INSTALL.msg
+++ b/srcpkgs/wicd/INSTALL.msg
@@ -5,4 +5,5 @@ 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.You may need 'kdesu' for priviledge 
+elevation.
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..b3b5db26586 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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] wicd: fix package
  2020-05-05 21:16 [PR PATCH] wicd: fix package mobinmob
                   ` (2 preceding siblings ...)
  2020-05-12 10:03 ` mobinmob
@ 2020-05-12 10:06 ` mobinmob
  2020-05-13 18:44 ` mobinmob
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: mobinmob @ 2020-05-12 10:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 710 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages wicd-fix
https://github.com/void-linux/void-packages/pull/21665

wicd: fix package
- configure to use dhclient and kdesu 
  (the default dhcpcd does not work)
- use included .desktop files instead of providing extra
- allow users in network group to control daemon via dbus

@Gottox : This PR makes wicd use the same group for dbus as connman (https://github.com/void-linux/void-packages/pull/21618) and 
NetworkManager (https://github.com/void-linux/void-packages/pull/21608).

A patch file from https://github.com/void-linux/void-packages/pull/21665.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wicd-fix-21665.patch --]
[-- Type: text/x-diff, Size: 3968 bytes --]

From 0c1100c1bb7be7cb083e0d5ce783249f843491bc 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                 |  3 ++-
 srcpkgs/wicd/files/manager-settings.conf |  9 +++++++++
 srcpkgs/wicd/files/wicd.desktop          | 11 -----------
 srcpkgs/wicd/template                    | 19 ++++++++++++-------
 4 files changed, 23 insertions(+), 19 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..0c1561e4d36 100644
--- a/srcpkgs/wicd/INSTALL.msg
+++ b/srcpkgs/wicd/INSTALL.msg
@@ -5,4 +5,5 @@ 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.You may need 'kdesu' for privilege 
+elevation.
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..b3b5db26586 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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] wicd: fix package
  2020-05-05 21:16 [PR PATCH] wicd: fix package mobinmob
                   ` (3 preceding siblings ...)
  2020-05-12 10:06 ` mobinmob
@ 2020-05-13 18:44 ` mobinmob
  2020-10-17  0:24 ` sgn
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: mobinmob @ 2020-05-13 18:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 710 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages wicd-fix
https://github.com/void-linux/void-packages/pull/21665

wicd: fix package
- configure to use dhclient and kdesu 
  (the default dhcpcd does not work)
- use included .desktop files instead of providing extra
- allow users in network group to control daemon via dbus

@Gottox : This PR makes wicd use the same group for dbus as connman (https://github.com/void-linux/void-packages/pull/21618) and 
NetworkManager (https://github.com/void-linux/void-packages/pull/21608).

A patch file from https://github.com/void-linux/void-packages/pull/21665.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wicd-fix-21665.patch --]
[-- Type: text/x-diff, Size: 3969 bytes --]

From 8322b96623a1dd04b704021b1c7925340ac9ca0a 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                 |  3 ++-
 srcpkgs/wicd/files/manager-settings.conf |  9 +++++++++
 srcpkgs/wicd/files/wicd.desktop          | 11 -----------
 srcpkgs/wicd/template                    | 19 ++++++++++++-------
 4 files changed, 23 insertions(+), 19 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..3cc3a4773da 100644
--- a/srcpkgs/wicd/INSTALL.msg
+++ b/srcpkgs/wicd/INSTALL.msg
@@ -5,4 +5,5 @@ 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. You may need 'kdesu' for privilege 
+elevation.
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..b3b5db26586 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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: wicd: fix package
  2020-05-05 21:16 [PR PATCH] wicd: fix package mobinmob
                   ` (4 preceding siblings ...)
  2020-05-13 18:44 ` mobinmob
@ 2020-10-17  0:24 ` sgn
  2020-10-17 12:50 ` mobinmob
  2020-10-17 12:50 ` mobinmob
  7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2020-10-17  0:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 168 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/21665#issuecomment-710707710

Comment:
What is the status of this one?

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: wicd: fix package
  2020-05-05 21:16 [PR PATCH] wicd: fix package mobinmob
                   ` (5 preceding siblings ...)
  2020-10-17  0:24 ` sgn
@ 2020-10-17 12:50 ` mobinmob
  2020-10-17 12:50 ` mobinmob
  7 siblings, 0 replies; 9+ messages in thread
From: mobinmob @ 2020-10-17 12:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/21665#issuecomment-710915738

Comment:
> What is the status of this one?

Sane as five months ago. It works.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: wicd: fix package
  2020-05-05 21:16 [PR PATCH] wicd: fix package mobinmob
                   ` (6 preceding siblings ...)
  2020-10-17 12:50 ` mobinmob
@ 2020-10-17 12:50 ` mobinmob
  7 siblings, 0 replies; 9+ messages in thread
From: mobinmob @ 2020-10-17 12:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/21665#issuecomment-710915738

Comment:
> What is the status of this one?

Same as five months ago. It works.

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2020-10-17 12:50 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-05 21:16 [PR PATCH] wicd: fix package mobinmob
2020-05-05 21:44 ` [PR PATCH] [Updated] " mobinmob
2020-05-07 18:33 ` mobinmob
2020-05-12 10:03 ` mobinmob
2020-05-12 10:06 ` mobinmob
2020-05-13 18:44 ` mobinmob
2020-10-17  0:24 ` sgn
2020-10-17 12:50 ` mobinmob
2020-10-17 12:50 ` mobinmob

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git