From 81ff9340cc289714d87b322043d32a67d4ccd99e Mon Sep 17 00:00:00 2001 From: arcan1s Date: Tue, 15 Jul 2014 21:23:03 +0400 Subject: [PATCH] fix build --- PKGBUILD | 4 +-- README.md | 2 -- create_archive.sh | 4 +-- sources/CMakeLists.txt | 3 +- sources/gui/src/main.cpp | 7 +++-- sources/plasmoid/CMakeLists.txt | 2 +- sources/resources/resources-plasmoid.qrc | 7 +++++ sources/resources/translations/en.ts | 6 +++- sources/resources/translations/netctl-gui.ts | 30 ++++++++++---------- sources/resources/translations/ru.ts | 6 +++- 10 files changed, 42 insertions(+), 29 deletions(-) create mode 100644 sources/resources/resources-plasmoid.qrc diff --git a/PKGBUILD b/PKGBUILD index 021bf0a..864ed71 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -16,7 +16,7 @@ optdepends=('kdebase-runtime: 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=('f09c15bc74ace36a59897f34220ac098') +md5sums=('0bea2c2676247c0939cca50109f2a505') prepare() { rm -rf "${srcdir}/"{build-plasmoid,build-qt4,build-qt5} @@ -46,7 +46,7 @@ build() { cd "${srcdir}/build-qt5" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_DOCS:BOOL=0 \ + -DBUILD_DOCS:BOOL=1 \ -DBUILD_DATAENGINE:BOOL=0 \ -DBUILD_PLASMOID:BOOL=0 \ "../${pkgbase}" diff --git a/README.md b/README.md index 4057ff8..33aae31 100644 --- a/README.md +++ b/README.md @@ -64,8 +64,6 @@ Additional information TODO (wish list) ---------------- -* man pages - Links ----- diff --git a/create_archive.sh b/create_archive.sh index 72a6ebe..0bf3ed5 100755 --- a/create_archive.sh +++ b/create_archive.sh @@ -3,7 +3,7 @@ ARCHIVE="netctl-gui" SRCDIR="sources" FILES="AUTHORS CHANGELOG COPYING README.md" -IGNORELIST="build gui/resources/translations/english.qm gui/resources/translations/russian.qm dataengine/dataengine.cppcheck gui/src/gui.cppcheck plasmoid/plasmoid.cppcheck" +IGNORELIST="build en.qm ru.qm netctl-gui.qm *.cppcheck" VERSION=$(grep -m1 PROJECT_VERSION_MAJOR sources/CMakeLists.txt | awk '{print $3}' | cut -c 1).\ $(grep -m1 PROJECT_VERSION_MINOR sources/CMakeLists.txt | awk '{print $3}' | cut -c 1).\ $(grep -m1 PROJECT_VERSION_PATCH sources/CMakeLists.txt | awk '{print $3}' | cut -c 1) @@ -12,7 +12,7 @@ $(grep -m1 PROJECT_VERSION_PATCH sources/CMakeLists.txt | awk '{print $3}' | cut [[ -d ${ARCHIVE} ]] && rm -rf "${ARCHIVE}" cp -r "${SRCDIR}" "${ARCHIVE}" for FILE in ${FILES[*]}; do cp -r "$FILE" "${ARCHIVE}"; done -for FILE in ${IGNORELIST[*]}; do rm -rf "${ARCHIVE}/${FILE}"; done +for FILE in ${IGNORELIST[*]}; do find "${ARCHIVE}" -name "${FILE}" -exec rm -rf {} \;; done tar cJf "${ARCHIVE}-${VERSION}-src.tar.xz" "${ARCHIVE}" rm -rf "${ARCHIVE}" # update md5sum diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 4e794f2..73d8928 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -13,8 +13,7 @@ set (PROJECT_VERSION_MAJOR 1) set (PROJECT_VERSION_MINOR 2) set (PROJECT_VERSION_PATCH 0) set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) -string (TIMESTAMP CURRENT_DATE UTC) -string (REGEX REPLACE "T|Z" " " CURRENT_DATE ${CURRENT_DATE}) +string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC) string (TIMESTAMP CURRENT_YEAR "%Y") message (STATUS "Project: ${PROJECT_NAME}") diff --git a/sources/gui/src/main.cpp b/sources/gui/src/main.cpp index 894fbfc..cb02ec8 100644 --- a/sources/gui/src/main.cpp +++ b/sources/gui/src/main.cpp @@ -190,9 +190,10 @@ int main(int argc, char *argv[]) .arg(QApplication::translate("MainWindow", "select profile %1").arg(selectProfile)); // additional functions helpMessage += QString("%1\n").arg(QApplication::translate("MainWindow", "Additional flags:")); - helpMessage += QString(" --config %1 - %2\n") - .arg(configPath) - .arg(QApplication::translate("MainWindow", "read configuration from file %1").arg(configPath)); + helpMessage += QString(" --config %1\n") + .arg(configPath, -10); + helpMessage += QString(" - %1\n") + .arg(QApplication::translate("MainWindow", "read configuration from this file")); helpMessage += QString("%1 -d --debug - %2\n") .arg(isParametrEnable(debug)) .arg(QApplication::translate("MainWindow", "print debug information")); diff --git a/sources/plasmoid/CMakeLists.txt b/sources/plasmoid/CMakeLists.txt index 1c1f081..1081035 100644 --- a/sources/plasmoid/CMakeLists.txt +++ b/sources/plasmoid/CMakeLists.txt @@ -2,7 +2,7 @@ set (SUBPROJECT plasma_applet_netctl) message (STATUS "Subproject ${SUBPROJECT}") # find resources -set (RESOURCES ${PROJECT_RESOURCE_DIR}/resources.qrc) +set (RESOURCES ${PROJECT_RESOURCE_DIR}/resources-plasmoid.qrc) # find required libaries find_package (KDE4 REQUIRED) diff --git a/sources/resources/resources-plasmoid.qrc b/sources/resources/resources-plasmoid.qrc new file mode 100644 index 0000000..841021e --- /dev/null +++ b/sources/resources/resources-plasmoid.qrc @@ -0,0 +1,7 @@ + + + + icon.png + wifi.png + + diff --git a/sources/resources/translations/en.ts b/sources/resources/translations/en.ts index 40637ef..9465f9b 100644 --- a/sources/resources/translations/en.ts +++ b/sources/resources/translations/en.ts @@ -972,7 +972,7 @@ read configuration from file %1 - read configuration from file %1 + read configuration from file %1 Version @@ -986,6 +986,10 @@ License License + + read configuration from this file + read configuration from this file + MobileWidget diff --git a/sources/resources/translations/netctl-gui.ts b/sources/resources/translations/netctl-gui.ts index 51f19ee..594289f 100644 --- a/sources/resources/translations/netctl-gui.ts +++ b/sources/resources/translations/netctl-gui.ts @@ -1069,72 +1069,72 @@ - - read configuration from file %1 + + read configuration from this file - + print debug information - + start with default settings - + set options for this run, comma separated - + open a tab with number %1 - + Show messages: - + show version and exit - + show build information and exit - + show this help and exit - + Build date: %1 - + cmake flags: - + Version - + Author - + License diff --git a/sources/resources/translations/ru.ts b/sources/resources/translations/ru.ts index 1c06653..4f264f0 100644 --- a/sources/resources/translations/ru.ts +++ b/sources/resources/translations/ru.ts @@ -971,7 +971,7 @@ read configuration from file %1 - прочитать настройки из файла %1 + прочитать настройки из файла %1 Version @@ -985,6 +985,10 @@ License Лицензия + + read configuration from this file + read configuration from this file + MobileWidget