bump version

* fix work with helper from GUI

CHANGELOG

@@ -1,3 +1,18 @@
+Ver.1.4.3
+---------
+* all
+    - fix clang build (#41)
+    - fix WPA_DRIVERS (#40)
+* library
+    - fix bug in WpaSup class with invalid returning value
+
+***
+
+Ver.1.4.2
+---------
+* gui
+    * remove Update call to the helper
+
 Ver.1.4.1
 ---------
 * all

arch/PKGBUILD

@@ -3,7 +3,7 @@
 pkgbase=netctl-gui
 pkgname=('libnetctlgui' 'netctlgui-helper' 'netctl-gui'
          'plasma5-applet-netctl-gui')
-pkgver=1.4.1
+pkgver=1.4.3
 pkgrel=1
 pkgdesc="Qt4/Qt5 GUI for netctl. Also provides a widget for KDE"
 arch=('i686' 'x86_64')
@@ -11,8 +11,7 @@ url="http://arcanis.name/projects/netctl-gui"
 license=('GPL3')
 makedepends=('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=('f93be4d72fa63007f39d3b5516ccd3e4')
+md5sums=('65a62753c03e2996a05d930c0ec2d460')
-
 
 prepare() {
   rm -rf "${srcdir}/build-"{plasmoid,qt5}

arch/PKGBUILD-qt4

@@ -1,17 +1,18 @@
 # Maintainer: Evgeniy "arcanis" Alexeev <arcanis.arch at gmail dot com>
 
 pkgbase=netctl-gui-qt4
+_pkgbase=netctl-gui
 pkgname=('libnetctlgui-qt4' 'netctlgui-helper-qt4' 'netctl-gui-qt4'
          'kdeplasma-applets-netctl-gui')
-pkgver=1.4.1
+pkgver=1.4.3
 pkgrel=1
 pkgdesc="Qt4 GUI for netctl. Also provides a widget for KDE4"
 arch=('i686' 'x86_64')
 url="http://arcanis.name/projects/netctl-gui"
 license=('GPL3')
 makedepends=('automoc4' 'cmake' 'kdelibs')
-source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz")
+source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${_pkgbase}-${pkgver}-src.tar.xz")
-md5sums=('f93be4d72fa63007f39d3b5516ccd3e4')
+md5sums=('65a62753c03e2996a05d930c0ec2d460')
 
 
 prepare() {
@@ -28,7 +29,7 @@ build() {
         -DBUILD_LIBRARY:BOOL=0 \
         -DBUILD_HELPER:BOOL=0 \
         -DBUILD_KDE4:BOOL=1 \
-        "../${pkgbase}"
+        "../${_pkgbase}"
   make
 
   cd "${srcdir}/build-qt4"
@@ -38,7 +39,7 @@ build() {
         -DBUILD_PLASMOID:BOOL=0 \
         -DUSE_CAPABILITIES:BOOL=0 \
         -DUSE_QT5:BOOL=0 \
-        "../${pkgbase}"
+        "../${_pkgbase}"
   make
 }
 

create_archive.sh

@@ -8,7 +8,7 @@ VERSION="${MAJOR}.${MINOR}.${PATCH}"
 
 ARCHIVE="netctl-gui"
 FILES="AUTHORS CHANGELOG COPYING README.md"
-IGNORELIST="build *.qm *.cppcheck .git* .kdev4 sources.kdev4"
+IGNORELIST="build *.qm *.cppcheck .git* *.kdev4"
 # update submodules
 git submodule update --init --recursive
 # create archive
@@ -16,7 +16,7 @@ git submodule update --init --recursive
 [[ -d ${ARCHIVE} ]] && rm -rf "${ARCHIVE}"
 cp -r "${SRCDIR}" "${ARCHIVE}"
 for FILE in ${FILES[*]}; do cp -r "$FILE" "${ARCHIVE}"; done
-for FILE in ${IGNORELIST[*]}; do find "${ARCHIVE}" -name "${FILE}" -exec rm -rf {} \;; done
+for FILE in ${IGNORELIST[*]}; do find "${ARCHIVE}" -name "${FILE}" -delete; done
 tar cJf "${ARCHIVE}-${VERSION}-src.tar.xz" "${ARCHIVE}"
 ln -sf "../${ARCHIVE}-${VERSION}-src.tar.xz" arch
 rm -rf "${ARCHIVE}"
@@ -26,5 +26,5 @@ MD5SUMS=$(md5sum ${ARCHIVE}-${VERSION}-src.tar.xz | awk '{print $1}')
 sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" arch/PKGBUILD{,-qt4}
 sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" arch/PKGBUILD{,-qt4}
 # clear
-find . -type f -name '*src.tar.xz' -not -name "*${VERSION}-src.tar.xz" -exec rm -rf {} \;
+find . -type f -name '*src.tar.xz' -not -name "*${VERSION}-src.tar.xz" -delete
-find arch -type l -xtype l -exec rm -rf {} \;
+find arch -type l -xtype l -delete

sources/.kdev4/sources.kdev4

@@ -8,7 +8,7 @@ ProjectRootRelative=./
 
 [CMake][CMake Build Directory 0]
 Build Directory Path=file:///home/arcanis/Documents/github/netctl-gui/build
-Build Type=Debug
+Build Type=Release
 CMake Binary=file:///usr/bin/cmake
 Environment Profile=
 Extra Arguments=

sources/CMakeLists.txt

@@ -11,7 +11,7 @@ set (PROJECT_CONTACT "esalexeev@gmail.com")
 set (PROJECT_LICENSE "GPLv3")
 set (PROJECT_VERSION_MAJOR 1)
 set (PROJECT_VERSION_MINOR 4)
-set (PROJECT_VERSION_PATCH 1)
+set (PROJECT_VERSION_PATCH 3)
 set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC)
 string (TIMESTAMP CURRENT_YEAR "%Y")
@@ -51,12 +51,20 @@ set (DBUS_SYSTEMCONF_PATH "/etc/dbus-1/system.d/" CACHE STRING "Path to dbus sys
 set (SYSTEMD_SERVICE_PATH "lib/systemd/system" CACHE STRING "Path to systemd services")
 
 # flags
-if (CMAKE_COMPILER_IS_GNUCXX)
+if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
   set (CMAKE_CXX_FLAGS "-Wall -std=c++11")
   set (CMAKE_CXX_FLAGS_DEBUG "-g -O0")
   set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
   # avoid newer gcc warnings
   add_definitions (-D_DEFAULT_SOURCE)
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  set (CMAKE_CXX_FLAGS "-Wall -std=c++11 -stdlib=libc++")
+  set (CMAKE_CXX_FLAGS_DEBUG "-g -O0")
+  set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+  # linker flags
+  set (CMAKE_EXE_LINKER_FLAGS "-lc++abi")
+  set (CMAKE_MODULE_LINKER_FLAGS "-lc++abi")
+  set (CMAKE_SHARED_LINKER_FLAGS "-lc++abi")
 else ()
   message (STATUS "Unknown compiler")
 endif ()

sources/gui/src/mainwindow.cpp

@@ -106,7 +106,7 @@ MainWindow::~MainWindow()
 {
     if (debug) qDebug() << PDEBUG;
 
-    if ((useHelper) && (configuration[QString("CLOSE_HELPER")] == QString("true")))
+    if (configuration[QString("CLOSE_HELPER")] == QString("true"))
         forceStopHelper();
     deleteObjects();
     delete ui;
@@ -383,13 +383,8 @@ void MainWindow::updateConfiguration(const QMap<QString, QVariant> args)
     QMap<QString, QString> optionsDict = parseOptions(args[QString("options")].toString());
     for (int i=0; i<optionsDict.keys().count(); i++)
         configuration[optionsDict.keys()[i]] = optionsDict[optionsDict.keys()[i]];
-    if ((configuration[QString("USE_HELPER")] == QString("true")) &&
+    useHelper = ((configuration[QString("USE_HELPER")] == QString("true")) &&
-        (checkExternalApps(QString("helper"), configuration, debug)))
+                 (checkExternalApps(QString("helper"), configuration, debug)));
-        useHelper = true;
-    else {
-        useHelper = false;
-        configuration[QString("USE_HELPER")] = QString("false");
-    }
 
     // update translation
     qApp->removeTranslator(translator);
@@ -462,9 +457,8 @@ bool MainWindow::checkHelperStatus()
     if (debug) qDebug() << PDEBUG;
 
     if (useHelper) useHelper = isHelperActive();
-    if (useHelper)
+    if (!useHelper) {
-        sendRequestToCtrl(QString("Update"), debug);
+        configuration[QString("CLOSE_HELPER")] = QString("false");
-    else {
         configuration[QString("FORCE_SUDO")] = QString("true");
         configuration[QString("USE_HELPER")] = QString("false");
     }

sources/helper/netctl-gui.conf

@@ -60,7 +60,7 @@ WPACLI_PATH=/usr/bin/wpa_cli
 # $i is interface
 PID_FILE=/run/wpa_supplicant_$i.pid
 # wpa_supplicant drivers for wireless interface comma separated
-WPA_DRIVERS=nl80211,wext
+WPA_DRIVERS="nl80211,wext"
 # path to control directory which is required by wpa_supplicant
 CTRL_DIR=/run/wpa_supplicant
 # group which is owner of CTRL_DIR

sources/netctlgui/src/wpasupinteract.cpp

@@ -508,7 +508,7 @@ QString WpaSup::getWpaCliOutput(const QString commandLine)
     QStringList interfaces = netctlCommand->getWirelessInterfaceList();
     if (interfaces.isEmpty()) {
         if (debug) qDebug() << PDEBUG << ":" << "Could not find interfaces";
-        return false;
+        return QString();
     }
 
     QString cmd = QString("%1 -i %2 -p %3 %4").arg(wpaCliPath).arg(interfaces[0]).arg(ctrlDir).arg(commandLine);