jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wicd: switch to python3 fork

Browse source 
* remove -gtk subpackage, it still uses python2 libraries
This commit is contained in:
Michal Vasilek 2021-11-07 19:57:57 +01:00 committed by Echo
parent 96a99cf36d
commit e967c9fea3
5 changed files with 78 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
srcpkgs/removed-packages/template
View file

@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1
revision=61
revision=62
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@ -369,6 +369,7 @@ replaces="
vte290<=0.36.5_5
vte<=0.28.2_16
w_scan<=20170107_1
wicd-gtk<=1.7.4_6
wireguard-go<=0.0.20181222_2
wireshark-gtk<=3.0.7_1
xlennart<=1.1.1_1

1
srcpkgs/wicd-gtk
View file

@ -1 +0,0 @@
wicd

9
srcpkgs/wicd/INSTALL.msg
View file

@ -1,9 +0,0 @@
Please note that wicd does not require to have dhcpcd and/or
wpa_supplicant services running at boot. If you are using them at
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 'network' group. You may need 'kdesu' for privilege
elevation.

51
srcpkgs/wicd/patches/03-import-wpath.patch Normal file
View file

@ -0,0 +1,51 @@
Description: Fix import path for wpath in setup.py
Author: Axel Beckert <abe@debian.org>
Forwarded: no
Index: wicd/setup.py
===================================================================
--- wicd.orig/setup.py 2019-09-29 04:13:32.874964424 +0200
+++ wicd/setup.py 2019-09-29 04:13:51.127519471 +0200
@@ -60,10 +60,10 @@
def run(self):
try:
- import wpath
- except ImportError:
+ from wicd import wpath
+ except (ImportError, ModuleNotFoundError):
self.run_command('configure')
- import wpath
+ from wicd import wpath
#raise Exception, 'Please run "./setup.py configure" first.'
_build.run(self)
@@ -423,10 +423,10 @@
class install(_install):
def run(self):
try:
- import wpath
- except ImportError:
+ from wicd import wpath
+ except (ImportError, ModuleNotFoundError):
self.run_command('build')
- import wpath
+ from wicd import wpath
print("Using init file",(wpath.init, wpath.initfile))
data.extend([
@@ -610,11 +610,11 @@
def run(self):
try:
- import wpath
- except ImportError:
+ from wicd import wpath
+ except (ImportError, ModuleNotFoundError):
# if there's no wpath.py, then run configure+build
self.run_command('build')
- import wpath
+ from wicd import wpath
if not wpath.no_install_i18n:
if os.path.exists('translations'):

67
srcpkgs/wicd/template
View file

@ -1,64 +1,47 @@
# Template file for 'wicd'
pkgname=wicd
version=1.7.4
revision=6
hostmakedepends="python python-setuptools python-Babel"
depends="dbus-glib dhclient ethtool net-tools python-dbus python-gobject2 python-urwid
util-linux wireless_tools wpa_supplicant"
revision=7
_ver=$version+tb2+2019.09.18git2e0ba579-1
wrksrc="$pkgname-debian-$_ver"
build_style="python3-module"
hostmakedepends="python3-setuptools python3-Babel"
depends="dbus-glib dhclient ethtool net-tools python3-dbus python3-gobject
python3-urwid wireless_tools wpa_supplicant"
checkdepends="$depends"
conf_files="
/etc/dbus-1/system.d/wicd.conf
/etc/wicd/encryption/templates/active"
/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.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
distfiles="https://salsa.debian.org/debian/wicd/-/archive/debian/$_ver/wicd-debian-$_ver.tar.gz"
checksum=bbcba281ad78421567625057d7b1a3aac6e9f32c817ce8bf1179945f2737e777
do_build() {
python2 setup.py configure --verbose --no-install-init \
python3 setup.py configure --verbose --no-install-init \
--resume=/usr/share/wicd/scripts \
--suspend=/usr/share/wicd/scripts \
--python=/usr/bin/python2 --lib=/usr/lib \
--python=/usr/bin/python3 --lib=/usr/lib \
--sbin=/usr/bin --distro=arch \
--no-install-gnome-shell-extensions \
--wicdgroup=network
}
do_install() {
python2 setup.py install --root=${DESTDIR}
vinstall other/wicd.desktop 644 usr/share/applications
vinstall other/wicd-tray.desktop 644 usr/share/applications
post_install() {
# 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
rm -r ${DESTDIR}/etc/xdg
rm ${DESTDIR}/usr/bin/wicd-{client,gtk}
rm -r ${DESTDIR}/usr/share/{applications,pixmaps,icons}
rm -r ${DESTDIR}/usr/share/wicd/{icons,gtk}
rm -r ${DESTDIR}/usr/share/doc/wicd/{AUTHORS,CHANGES,INSTALL,LICENSE}
rm ${DESTDIR}/usr/share/man/man1/wicd-client.1
rm ${DESTDIR}/usr/share/man/nl/man1/wicd-client.1
rm -r ${DESTDIR}/usr/lib/pm-utils
rm -r ${DESTDIR}/lib
vsv wicd
rm -rf ${DESTDIR}/lib
rm -rf ${DESTDIR}/usr/share/doc
rm -rf ${DESTDIR}/etc/logrotate.d
rm -rf ${DESTDIR}/usr/lib/pm-utils
}
wicd-gtk_package() {
depends="wicd>=${version} pygtk python-notify shared-mime-info desktop-file-utils hicolor-icon-theme"
short_desc+=" - GTK UI"
pycompile_dirs="usr/share/wicd/gtk"
pkg_install() {
vmove etc/xdg
vmove usr/bin/wicd-client
vmove usr/bin/wicd-gtk
vmove usr/share/applications
vmove usr/share/pixmaps
vmove usr/share/icons
vmove usr/share/wicd/icons
vmove usr/share/wicd/gtk
vmove usr/share/man/man1/wicd-client.1
vmove usr/share/man/nl/man1/wicd-client.1
}
}