update ChangeLog

update CmakeLists
update PKGBUILDs
fix GUI building

arch/PKGBUILD

@@ -2,22 +2,21 @@
 
 pkgbase=netctl-gui
 pkgname=('libnetctlgui' 'netctlgui-helper' 'netctl-gui'
-         'libnetctlgui-qt4' 'netctlgui-helper-qt4' 'netctl-gui-qt4'
-         'kdeplasma-applets-netctl-gui')
+         'plasma5-applet-netctl-gui')
 pkgver=1.4.0
-pkgrel=2
+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')
+makedepends=('automoc4' 'cmake' 'extra-cmake-modules' 'plasma-framework' 'qt5-tools')
 source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz")
-md5sums=('145998d43d4b0b346b704bc93345edfb')
+md5sums=('087d7af57318a9f9f5592aad097feeb5')
 
 
 prepare() {
-  rm -rf "${srcdir}/build-"{plasmoid,qt4,qt5}
-  mkdir "${srcdir}/build-"{plasmoid,qt4,qt5}
+  rm -rf "${srcdir}/build-"{plasmoid,qt5}
+  mkdir "${srcdir}/build-"{plasmoid,qt5}
 }
 
 
@@ -25,20 +24,10 @@ build() {
   cd "${srcdir}/build-plasmoid"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_BUILD_TYPE=Release \
+        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
         -DBUILD_GUI:BOOL=0 \
         -DBUILD_LIBRARY:BOOL=0 \
         -DBUILD_HELPER:BOOL=0 \
-        -DBUILD_KDE4:BOOL=1 \
-        "../${pkgbase}"
-  make
-
-  cd "${srcdir}/build-qt4"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DBUILD_DATAENGINE:BOOL=0 \
-        -DBUILD_PLASMOID:BOOL=0 \
-        -DUSE_CAPABILITIES:BOOL=0 \
-        -DUSE_QT5:BOOL=0 \
         "../${pkgbase}"
   make
 
@@ -53,15 +42,13 @@ build() {
 }
 
 
-package_kdeplasma-applets-netctl-gui() {
-  pkgdesc="A plasmoid, which interacts with netctl. A part of netctl-gui"
-  depends=('netctl' 'kdebase-workspace')
+package_plasma5-applet-netctl-gui() {
+  pkgdesc="A KF5 plasmoid, which interacts with netctl. A part of netctl-gui"
+  depends=('netctl' 'plasma-framework')
   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="kdeplasma-applets-netctl-gui.install"
+  install="plasma-netctl-gui.install"
 
   cd "${srcdir}/build-plasmoid"
   make DESTDIR="${pkgdir}" install
@@ -99,7 +86,7 @@ package_netctlgui-helper() {
 package_netctl-gui() {
   pkgdesc="Qt5 graphical front-end for netctl. A part of netctl-gui"
   depends=('libnetctlgui' 'xdg-utils')
-  optdepends=('kdeplasma-applets-netctl-gui: KDE widget'
+  optdepends=('plasma-netctl-gui: KF5 widget'
               'netctlgui-helper: DBus helper daemon')
   provides=('netctl-gui-qt4')
   conflicts=('netctl-gui-qt4')
@@ -110,48 +97,3 @@ package_netctl-gui() {
   cd "${srcdir}/build-qt5/resources"
   make DESTDIR="${pkgdir}" install
 }
-
-
-package_libnetctlgui-qt4() {
-  pkgdesc="Qt4 library which interacts with netctl. A part of netctl-gui"
-  depends=('netctl' 'qt4')
-  optdepends=('netctlgui-helper-qt4: DBus helper daemon'
-              'sudo: sudo support'
-              'wpa_supplicant: wifi support')
-  provides=('libnetctlgui')
-  conflicts=('libnetctlgui')
-  install=""
-
-  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/netctl-gui.conf'
-          'etc/dbus-1/system.d/org.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
-  cd "${srcdir}/build-qt4/resources"
-  make DESTDIR="${pkgdir}" install
-}