diff --git a/netctl-gui/PKGBUILD b/netctl-gui/PKGBUILD index 4ea4091..7cdb640 100644 --- a/netctl-gui/PKGBUILD +++ b/netctl-gui/PKGBUILD @@ -1,21 +1,18 @@ # Maintainer: Evgeniy "arcanis" Alexeev pkgbase=netctl-gui -pkgname=('libnetctlgui' 'netctl-gui' 'netctl-gui-qt4' 'kdeplasma-applets-netctl-gui') -pkgver=1.2.0 +pkgname=('libnetctlgui' 'netctlgui-helper' 'netctl-gui' + 'libnetctlgui-qt4' 'netctlgui-helper-qt4' 'netctl-gui-qt4' + 'kdeplasma-applets-netctl-gui') +pkgver=1.3.0 pkgrel=1 pkgdesc="Qt4/Qt5 GUI for netctl. Also provides a widget for KDE" arch=('i686' 'x86_64') url="http://arcanis.name/projects/netctl-gui" license=('GPL3') makedepends=('automoc4' 'cmake' 'kdelibs' 'qt5-base' 'qt5-tools') -optdepends=('kdebase-runtime: sudo support' - 'kdeplasma-applets-netctl-gui: KDE widget' - 'sudo: sudo support' - 'wpa_supplicant: wifi support') source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz") -install="${pkgbase}.install" -md5sums=('9e9a55bb085179af17e93a2dff4bc75b') +md5sums=('9b56b04258855258ed30549f1039b8f8') prepare() { @@ -28,16 +25,15 @@ build() { cd "${srcdir}/build-plasmoid" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_DOCS:BOOL=0 \ -DBUILD_GUI:BOOL=0 \ -DBUILD_LIBRARY:BOOL=0 \ + -DBUILD_HELPER:BOOL=0 \ "../${pkgbase}" make cd "${srcdir}/build-qt4" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_DOCS:BOOL=0 \ -DBUILD_DATAENGINE:BOOL=0 \ -DBUILD_PLASMOID:BOOL=0 \ -DUSE_QT5:BOOL=0 \ @@ -47,7 +43,6 @@ build() { cd "${srcdir}/build-qt5" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_DOCS:BOOL=0 \ -DBUILD_DATAENGINE:BOOL=0 \ -DBUILD_PLASMOID:BOOL=0 \ "../${pkgbase}" @@ -55,48 +50,99 @@ build() { } -package_libnetctlgui() { - pkgdesc="Qt5 library which interacts with netctl. A part of netctl-gui" - depends=('netctl' 'qt5-base') - - cd "${srcdir}/build-qt5/netctlgui" - make DESTDIR="${pkgdir}" install -} - - package_kdeplasma-applets-netctl-gui() { pkgdesc="A plasmoid, which interacts with netctl. A part of netctl-gui" depends=('netctl' 'kdebase-workspace') - optdepends=('kdebase-runtime: sudo support' + optdepends=('netctlgui-helper: DBus helper daemon' + 'netctlgui-helper-qt4: DBus helper daemon' 'netctl-gui: graphical front-end' 'netctl-gui-qt4: graphical front-end' 'sudo: sudo support') - install="${pkgbase}.install" + install="kdeplasma-applets-netctl-gui.install" cd "${srcdir}/build-plasmoid" make DESTDIR="${pkgdir}" install } +package_libnetctlgui() { + pkgdesc="Qt5 library which interacts with netctl. A part of netctl-gui" + depends=('netctl' 'qt5-base') + optdepends=('netctlgui-helper: DBus helper daemon' + 'sudo: sudo support' + 'wpa_supplicant: wifi support') + provides=('libnetctlgui-qt4') + conflicts=('libnetctlgui-qt4') + + cd "${srcdir}/build-qt5/netctlgui" + make DESTDIR="${pkgdir}" install +} + + +package_netctlgui-helper() { + pkgdesc="Helper daemon for netctl-gui. A part of netctl-gui" + depends=('libnetctlgui') + provides=('netctlgui-helper-qt4') + conflicts=('netctlgui-helper-qt4') + backup=('etc/netctlgui-helper.conf') + install="netctlgui-helper.install" + + cd "${srcdir}/build-qt5/helper" + make DESTDIR="${pkgdir}" install +} + + package_netctl-gui() { pkgdesc="Qt5 graphical front-end for netctl. A part of netctl-gui" - depends=('libnetctlgui') + depends=('libnetctlgui' 'xdg-utils') + optdepends=('kdeplasma-applets-netctl-gui: KDE widget' + 'netctlgui-helper: DBus helper daemon') provides=('netctl-gui-qt4') conflicts=('netctl-gui-qt4') - install="${pkgbase}.install" + install="netctl-gui.install" cd "${srcdir}/build-qt5/gui" make DESTDIR="${pkgdir}" install } -package_netctl-gui-qt4() { - pkgdesc="Qt4 graphical front-end for netctl. A part of netctl-gui" +package_libnetctlgui-qt4() { + pkgdesc="Qt4 library which interacts with netctl. A part of netctl-gui" depends=('netctl' 'qt4') - provides=('libnetctlgui' 'netctl-gui') - conflicts=('libnetctlgui' 'netctl-gui') - install="${pkgbase}.install" + optdepends=('netctlgui-helper-qt4: DBus helper daemon' + 'sudo: sudo support' + 'wpa_supplicant: wifi support') + provides=('libnetctlgui') + conflicts=('libnetctlgui') + install="" - cd "${srcdir}/build-qt4" + cd "${srcdir}/build-qt4/netctlgui" + make DESTDIR="${pkgdir}" install +} + + +package_netctlgui-helper-qt4() { + pkgdesc="Helper daemon for netctl-gui. A part of netctl-gui" + depends=('libnetctlgui-qt4') + provides=('netctlgui-helper') + conflicts=('netctlgui-helper') + backup=('etc/netctlgui-helper.conf') + install="netctlgui-helper.install" + + cd "${srcdir}/build-qt4/helper" + make DESTDIR="${pkgdir}" install +} + + +package_netctl-gui-qt4() { + pkgdesc="Qt4 graphical front-end for netctl. A part of netctl-gui" + depends=('libnetctlgui-qt4') + optdepends=('kdeplasma-applets-netctl-gui: KDE widget' + 'netctlgui-helper-qt4: DBus helper daemon') + provides=('netctl-gui') + conflicts=('netctl-gui') + install="netctl-gui.install" + + cd "${srcdir}/build-qt4/gui" make DESTDIR="${pkgdir}" install } diff --git a/netctl-gui/kdeplasma-applets-netctl-gui.install b/netctl-gui/kdeplasma-applets-netctl-gui.install new file mode 100644 index 0000000..58c909f --- /dev/null +++ b/netctl-gui/kdeplasma-applets-netctl-gui.install @@ -0,0 +1,14 @@ +post_install() { + cat << EOF +Update plasmoids... +EOF + kbuildsycoca4 > /dev/null 2>&1 +} + +post_upgrade() { + post_install "$1" +} + +post_remove() { + post_install "$1" +} diff --git a/netctl-gui/libnetctlgui.install b/netctl-gui/libnetctlgui.install new file mode 100644 index 0000000..1c08bca --- /dev/null +++ b/netctl-gui/libnetctlgui.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} + +post_upgrade() { + post_install "$1" +} + +post_remove() { + post_install "$1" +} diff --git a/netctl-gui/netctl-gui.install b/netctl-gui/netctl-gui.install index 029294d..9fae526 100644 --- a/netctl-gui/netctl-gui.install +++ b/netctl-gui/netctl-gui.install @@ -4,9 +4,9 @@ post_install() { } post_upgrade() { - post_install + post_install "$1" } post_remove() { - post_install + post_install "$1" } diff --git a/netctl-gui/netctlgui-helper.install b/netctl-gui/netctlgui-helper.install new file mode 100644 index 0000000..655fa6a --- /dev/null +++ b/netctl-gui/netctlgui-helper.install @@ -0,0 +1,7 @@ +post_install() { + setcap cap_setuid=ep usr/bin/netctlgui-helper 2>/dev/null || chmod +s usr/bin/ping +} + +post_upgrade() { + post_install "$1" +}