From ff3e0006881492631fc399d23f4e220f05e0663c Mon Sep 17 00:00:00 2001 From: arcan1s Date: Sat, 21 Mar 2015 00:00:47 +0300 Subject: [PATCH] release 1.4.2 * fix work with helper from GUI --- CHANGELOG | 5 +++++ arch/PKGBUILD | 4 ++-- arch/PKGBUILD-qt4 | 11 ++++++----- create_archive.sh | 8 ++++---- sources/.kdev4/sources.kdev4 | 2 +- sources/CMakeLists.txt | 2 +- sources/gui/src/mainwindow.cpp | 16 +++++----------- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 917e1f2..8d22141 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +Ver.1.4.2 +--------- +* gui + * remove Update call to the helper + Ver.1.4.1 --------- * all diff --git a/arch/PKGBUILD b/arch/PKGBUILD index c9f1a33..8f131d4 100644 --- a/arch/PKGBUILD +++ b/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.2 pkgrel=1 pkgdesc="Qt4/Qt5 GUI for netctl. Also provides a widget for KDE" arch=('i686' 'x86_64') @@ -11,7 +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=('3715129cf7d787b67576de9cc290eafa') prepare() { diff --git a/arch/PKGBUILD-qt4 b/arch/PKGBUILD-qt4 index 4bbd94d..16f3a14 100644 --- a/arch/PKGBUILD-qt4 +++ b/arch/PKGBUILD-qt4 @@ -1,17 +1,18 @@ # Maintainer: Evgeniy "arcanis" Alexeev 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.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=('f93be4d72fa63007f39d3b5516ccd3e4') +source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${_pkgbase}-${pkgver}-src.tar.xz") +md5sums=('3715129cf7d787b67576de9cc290eafa') 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 } diff --git a/create_archive.sh b/create_archive.sh index 32a88cd..619de0b 100755 --- a/create_archive.sh +++ b/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 arch -type l -xtype l -exec rm -rf {} \; +find . -type f -name '*src.tar.xz' -not -name "*${VERSION}-src.tar.xz" -delete +find arch -type l -xtype l -delete diff --git a/sources/.kdev4/sources.kdev4 b/sources/.kdev4/sources.kdev4 index 587b19d..d7d83c5 100644 --- a/sources/.kdev4/sources.kdev4 +++ b/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= diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 306e721..51c4817 100644 --- a/sources/CMakeLists.txt +++ b/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 2) 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") diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp index ce35e4d..ca5ac4a 100644 --- a/sources/gui/src/mainwindow.cpp +++ b/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 args) QMap optionsDict = parseOptions(args[QString("options")].toString()); for (int i=0; iremoveTranslator(translator); @@ -462,9 +457,8 @@ bool MainWindow::checkHelperStatus() if (debug) qDebug() << PDEBUG; if (useHelper) useHelper = isHelperActive(); - if (useHelper) - sendRequestToCtrl(QString("Update"), debug); - else { + if (!useHelper) { + configuration[QString("CLOSE_HELPER")] = QString("false"); configuration[QString("FORCE_SUDO")] = QString("true"); configuration[QString("USE_HELPER")] = QString("false"); }