arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-04-24 15:37:23 +00:00
Code Issues Projects Releases Wiki Activity

update submodules, add clang build, fix bug in wpasup

Browse Source
This commit is contained in:
arcan1s 2015-04-23 17:51:52 +03:00
parent 03dbfce482
commit 3695914226
6 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@ -1,3 +1,9 @@
Ver.1.4.3
---------
* all
- fix clang build (#41)
- fix WPA_DRIVERS (#40)
Ver.1.4.2
---------
* gui

7
arch/PKGBUILD
View File

@ -4,21 +4,18 @@ pkgbase=netctl-gui
pkgname=('libnetctlgui' 'netctlgui-helper' 'netctl-gui'
'plasma5-applet-netctl-gui')
pkgver=1.4.2
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=('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=('3715129cf7d787b67576de9cc290eafa')
md5sums=('49f89f8568e910ac9b5cbf8bd0e97105')
prepare() {
rm -rf "${srcdir}/build-"{plasmoid,qt5}
mkdir "${srcdir}/build-"{plasmoid,qt5}
# https://github.com/arcan1s/netctl-gui/issues/40
sed 's/nl80211,wext/"nl80211,wext"/g' -i "${pkgbase}/helper/netctl-gui.conf"
}

7
arch/PKGBUILD-qt4
View File

@ -5,22 +5,19 @@ _pkgbase=netctl-gui
pkgname=('libnetctlgui-qt4' 'netctlgui-helper-qt4' 'netctl-gui-qt4'
'kdeplasma-applets-netctl-gui')
pkgver=1.4.2
pkgrel=2
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")
md5sums=('3715129cf7d787b67576de9cc290eafa')
md5sums=('49f89f8568e910ac9b5cbf8bd0e97105')
prepare() {
rm -rf "${srcdir}/build-"{plasmoid,qt4}
mkdir "${srcdir}/build-"{plasmoid,qt4}
# https://github.com/arcan1s/netctl-gui/issues/40
sed 's/nl80211,wext/"nl80211,wext"/g' -i "${_pkgbase}/helper/netctl-gui.conf"
}

2
sources/3rdparty/pdebug vendored

@ -1 +1 @@
Subproject commit 9c63e102b05e11ead690489ca470c8482b6335b1
Subproject commit 9be4fe36819cc48a574b5f649ddb210b432e2097

10
sources/CMakeLists.txt
View File

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

2
sources/netctlgui/src/wpasupinteract.cpp
View File

@ -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);