fix build

2025-04-24 15:37:23 +00:00 · 2014-07-15 21:23:03 +04:00 · 2014-07-15 21:23:03 +04:00 · 81ff9340cc
commit 81ff9340cc
parent 3d040e9bab
10 changed files with 42 additions and 29 deletions
--- a/4
+++ b/4
@ -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}"
--- a/README.md
+++ b/README.md
@ -64,8 +64,6 @@ Additional information
 TODO (wish list)
 ----------------

-* man pages
-
 Links
 -----

--- 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
--- 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}")
--- 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"));
--- 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)
--- a/sources/resources/resources-plasmoid.qrc
+++ b/sources/resources/resources-plasmoid.qrc
@ -0,0 +1,7 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+<!--     icons -->
+    <file>icon.png</file>
+    <file>wifi.png</file>
+</qresource>
+</RCC>
--- a/sources/resources/translations/en.ts
+++ b/sources/resources/translations/en.ts
@ -972,7 +972,7 @@
    </message>
    <message>
        <source>read configuration from file %1</source>
-        <translation>read configuration from file %1</translation>
+        <translation type="vanished">read configuration from file %1</translation>
    </message>
    <message>
        <source>Version</source>
@ -986,6 +986,10 @@
        <source>License</source>
        <translation>License</translation>
    </message>
+    <message>
+        <source>read configuration from this file</source>
+        <translation>read configuration from this file</translation>
+    </message>
 </context>
 <context>
    <name>MobileWidget</name>
--- a/sources/resources/translations/netctl-gui.ts
+++ b/sources/resources/translations/netctl-gui.ts
@ -1069,72 +1069,72 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../gui/src/main.cpp" line="195"/>
-        <source>read configuration from file %1</source>
+        <location filename="../../gui/src/main.cpp" line="196"/>
+        <source>read configuration from this file</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../gui/src/main.cpp" line="198"/>
+        <location filename="../../gui/src/main.cpp" line="199"/>
        <source>print debug information</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../gui/src/main.cpp" line="201"/>
+        <location filename="../../gui/src/main.cpp" line="202"/>
        <source>start with default settings</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../gui/src/main.cpp" line="205"/>
+        <location filename="../../gui/src/main.cpp" line="206"/>
        <source>set options for this run, comma separated</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../gui/src/main.cpp" line="208"/>
+        <location filename="../../gui/src/main.cpp" line="209"/>
        <source>open a tab with number %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../gui/src/main.cpp" line="210"/>
+        <location filename="../../gui/src/main.cpp" line="211"/>
        <source>Show messages:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../gui/src/main.cpp" line="212"/>
+        <location filename="../../gui/src/main.cpp" line="213"/>
        <source>show version and exit</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../gui/src/main.cpp" line="214"/>
+        <location filename="../../gui/src/main.cpp" line="215"/>
        <source>show build information and exit</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../gui/src/main.cpp" line="216"/>
+        <location filename="../../gui/src/main.cpp" line="217"/>
        <source>show this help and exit</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../gui/src/main.cpp" line="219"/>
+        <location filename="../../gui/src/main.cpp" line="220"/>
        <source>Build date: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../gui/src/main.cpp" line="221"/>
+        <location filename="../../gui/src/main.cpp" line="222"/>
        <source>cmake flags:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../gui/src/main.cpp" line="234"/>
+        <location filename="../../gui/src/main.cpp" line="235"/>
        <source>Version</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../gui/src/main.cpp" line="237"/>
+        <location filename="../../gui/src/main.cpp" line="238"/>
        <source>Author</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../gui/src/main.cpp" line="240"/>
+        <location filename="../../gui/src/main.cpp" line="241"/>
        <source>License</source>
        <translation type="unfinished"></translation>
    </message>
--- a/sources/resources/translations/ru.ts
+++ b/sources/resources/translations/ru.ts
@ -971,7 +971,7 @@
    </message>
    <message>
        <source>read configuration from file %1</source>
-        <translation>прочитать настройки из файла %1</translation>
+        <translation type="vanished">прочитать настройки из файла %1</translation>
    </message>
    <message>
        <source>Version</source>
@ -985,6 +985,10 @@
        <source>License</source>
        <translation>Лицензия</translation>
    </message>
+    <message>
+        <source>read configuration from this file</source>
+        <translation>read configuration from this file</translation>
+    </message>
 </context>
 <context>
    <name>MobileWidget</name>