Release version of lxqt-connman-applet with latest patches, no debug symbols and CPU optimized.

5 files changed, 255 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..a6633bfbcd1f
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,29 @@
+pkgbase = lxqt-connman-applet
+	pkgdesc = LXQt system-tray applet for connman
+	pkgver = 201805
+	pkgrel = 1
+	epoch = 1
+	url = https://github.com/lxqt/lxqt-connman-applet
+	arch = i686
+	arch = x86_64
+	license = LGPL
+	makedepends = git
+	makedepends = cmake
+	makedepends = qt5-tools
+	makedepends = lxqt-build-tools
+	depends = liblxqt
+	depends = qt5-svg
+	depends = connman
+	provides = lxqt-connman-applet.git
+	conflicts = lxqt-connman-applet.git
+	source = git+https://github.com/lxqt/lxqt-connman-applet.git#commit=940493ce509bb2784738d547cc27df677b4835a2
+	source = use_app_font.patch
+	source = fix_build_qt511.patch
+	source = russian_translation.patch
+	sha256sums = SKIP
+	sha256sums = dbe35db41680798814cd83bee84fedcc550caa4465f9553522109a7b47823ce6
+	sha256sums = abd9cac3a8ff2a61cecac945066a2565c06b7cea6df8e8c812e60f7b6bc94e90
+	sha256sums = c953bb93ddbac8203d5f50797d1d1280c8451e4b644726e5fa0b86200afa300b
+
+pkgname = lxqt-connman-applet
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..249c3679b389
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: Enihcam <gmail n a n e r i c w a n g>
+
+_commit=940493ce509bb2784738d547cc27df677b4835a2 # master
+pkgname="lxqt-connman-applet"
+pkgver=201805
+pkgrel=1
+pkgdesc='LXQt system-tray applet for connman'
+epoch=1
+arch=('i686' 'x86_64')
+url='https://github.com/lxqt/lxqt-connman-applet'
+license=('LGPL')
+depends=('liblxqt' 'qt5-svg' 'connman')
+makedepends=('git' 'cmake' 'qt5-tools' 'lxqt-build-tools')
+provides=("$pkgname.git")
+conflicts=("$pkgname.git")
+source=("git+$url.git#commit=$_commit"
+        "use_app_font.patch"
+        "fix_build_qt511.patch"
+        "russian_translation.patch")
+sha256sums=("SKIP"
+            "dbe35db41680798814cd83bee84fedcc550caa4465f9553522109a7b47823ce6"
+            "abd9cac3a8ff2a61cecac945066a2565c06b7cea6df8e8c812e60f7b6bc94e90"
+            "c953bb93ddbac8203d5f50797d1d1280c8451e4b644726e5fa0b86200afa300b")
+
+prepare() {
+  cd $pkgname
+  patch -p1 -i "${srcdir}/use_app_font.patch"
+  patch -p1 -i "${srcdir}/fix_build_qt511.patch"
+  patch -p1 -i "${srcdir}/russian_translation.patch"
+}
+
+build() {
+  cd $pkgname
+  cmake "$srcdir/$pkgname" \
+    -DCMAKE_BUILD_TYPE:STRING="Release" \
+    -DCMAKE_C_FLAGS:STRING="$CFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$CXXFLAGS" \
+    -DCMAKE_EXE_LINKER_FLAGS:STRING="$LDFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+
+  install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
+  install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/"
+}
diff --git a/fix_build_qt511.patch b/fix_build_qt511.patch
new file mode 100644
index 000000000000..d6b5dbc1ca18
--- /dev/null
+++ b/fix_build_qt511.patch
@@ -0,0 +1,49 @@
+From 63520399217f902076e4a65c89cd97aff1cdd269 Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Sun, 6 May 2018 11:37:20 +0000
+Subject: [PATCH] CMakeLists.txt: Fix build with Qt 5.11_beta3 (dropping
+ qt5_use_modules)
+
+| CMake Error at .../CMakeLists.txt (qt5_use_modules):
+|   Unknown CMake command "qt5_use_modules".
+
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ CMakeLists.txt            | 4 +---
+ iconviewer/CMakeLists.txt | 4 +---
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e06d783..6aad304 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,11 +66,9 @@ add_executable(${PROJECT_NAME}
+    ${QM_LOADER}
+ )
+ 
+-qt5_use_modules(lxqt-connman-applet Core Widgets DBus)
+-
+-
+ target_link_libraries(${PROJECT_NAME} 
+                       lxqt
++                      Qt5::Core
+                       Qt5::Widgets 
+                       Qt5::DBus 
+                       Qt5::Svg)
+diff --git a/iconviewer/CMakeLists.txt b/iconviewer/CMakeLists.txt
+index 4115996..6e31e83 100644
+--- a/iconviewer/CMakeLists.txt
++++ b/iconviewer/CMakeLists.txt
+@@ -36,11 +36,9 @@ add_executable(${PROJECT_NAME}
+    ${QRCS_GENERATED}
+ )
+ 
+-qt5_use_modules(icon-viewer Core Widgets)
+-
+-
+ target_link_libraries(${PROJECT_NAME} 
+                       lxqt
++                      Qt5::Core
+                       Qt5::Widgets 
+                       Qt5::Svg)
+ 
diff --git a/russian_translation.patch b/russian_translation.patch
new file mode 100644
index 000000000000..36e8fc15e4cb
--- /dev/null
+++ b/russian_translation.patch
@@ -0,0 +1,97 @@
+From 12e97928d95cf8ac2e13fa152fe5f4f177d685db Mon Sep 17 00:00:00 2001
+From: ZwerG_MaX <beyze.mr@yandex.ru>
+Date: Mon, 23 Apr 2018 13:06:28 +0700
+Subject: [PATCH] add Russian translation
+
+---
+ translations/lxqt-connman-applet_ru.ts | 81 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 81 insertions(+)
+ create mode 100644 translations/lxqt-connman-applet_ru.ts
+
+diff --git a/translations/lxqt-connman-applet_ru.ts b/translations/lxqt-connman-applet_ru.ts
+new file mode 100644
+index 0000000..3ce28b3
+--- /dev/null
++++ b/translations/lxqt-connman-applet_ru.ts
+@@ -0,0 +1,81 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!DOCTYPE TS>
++<TS version="2.1" language="ru_RU">
++<context>
++    <name>Dialog</name>
++    <message>
++        <location filename="../dialog.ui" line="14"/>
++        <source>LXQt ConnMan applet</source>
++        <translation>LXQt ConnMan апплет</translation>
++    </message>
++    <message>
++        <location filename="../dialog.ui" line="25"/>
++        <source>Connect to %1</source>
++        <translation>Подключение к %1</translation>
++    </message>
++</context>
++<context>
++    <name>QObject</name>
++    <message>
++        <location filename="../ui_strings.cpp" line="36"/>
++        <source>name</source>
++        <comment>network name</comment>
++        <translatorcomment>имя сети</translatorcomment>
++        <translation>имя</translation>
++    </message>
++    <message>
++        <location filename="../ui_strings.cpp" line="37"/>
++        <location filename="../ui_strings.cpp" line="38"/>
++        <source>Username</source>
++        <translation>Имя пользователя</translation>
++    </message>
++    <message>
++        <location filename="../ui_strings.cpp" line="39"/>
++        <source>Passphrase</source>
++        <translation>Кодовая фраза</translation>
++    </message>
++    <message>
++        <location filename="../ui_strings.cpp" line="40"/>
++        <source>Previous passphrase</source>
++        <translation>Предыдущая кодовая фраза</translation>
++    </message>
++    <message>
++        <location filename="../ui_strings.cpp" line="42"/>
++        <source>Wired</source>
++        <translation>Проводная сеть</translation>
++    </message>
++    <message>
++        <location filename="../ui_strings.cpp" line="43"/>
++        <source>Wireless</source>
++        <translation>Беспроводная сеть</translation>
++    </message>
++    <message>
++        <location filename="../ui_strings.cpp" line="44"/>
++        <source>Peer-to-peer</source>
++        <translation>p2p сеть</translation>
++    </message>
++    <message>
++        <location filename="../ui_strings.cpp" line="45"/>
++        <source>Bluetooth</source>
++        <translation>Блютуз сеть</translation>
++    </message>
++</context>
++<context>
++    <name>SystemTray</name>
++    <message>
++        <location filename="../systemtray.cpp" line="43"/>
++        <source>Quit</source>
++        <translation>Выйти</translation>
++    </message>
++    <message>
++        <location filename="../systemtray.cpp" line="78"/>
++        <source>Technologies:</source>
++        <translation>Технологии:</translation>
++    </message>
++    <message>
++        <location filename="../systemtray.cpp" line="88"/>
++        <source>Services: </source>
++        <translation>Сервисы: </translation>
++    </message>
++</context>
++</TS>
diff --git a/use_app_font.patch b/use_app_font.patch
new file mode 100644
index 000000000000..315752d64886
--- /dev/null
+++ b/use_app_font.patch
@@ -0,0 +1,31 @@
+From e70fec1663e4a8947fac518032cc7a1ebb6cd424 Mon Sep 17 00:00:00 2001
+From: Gabriel Retana <gabrielretana@about.me>
+Date: Sat, 19 May 2018 22:20:43 -0600
+Subject: [PATCH] Use application font instead of create new one
+
+---
+ itemcontroller.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/itemcontroller.cpp b/itemcontroller.cpp
+index 0b35a9d..068cec8 100644
+--- a/itemcontroller.cpp
++++ b/itemcontroller.cpp
+@@ -1,4 +1,5 @@
+ #include <QDBusPendingCall>
++#include <QApplication>
+ #include "iconproducer.h"
+ #include "appletstrings.h"
+ #include "itemcontroller.h"
+@@ -44,7 +45,10 @@ void ServiceItemController::update()
+     int strength = connmanObject->properties["Strength"].toInt();
+ 
+     item->setData(state == "online" ? name + ' ' + QChar(0x2713) : name, Qt::DisplayRole);
+-    item->setData(state == "ready" || state == "online" ? QFont("", -1, QFont::Bold) : QVariant(), Qt::FontRole);
++    //item->setData(state == "ready" || state == "online" ? QFont("", -1, QFont::Bold) : QVariant(), Qt::FontRole);
++    QFont font = qApp->font();
++    font.setBold(true);
++    item->setData(state == "ready" || state == "online" ? font : QVariant(), Qt::FontRole);
+ 
+     if (type == "wifi") {
+         item->setData(IconProducer::instance().wireless(strength), Qt::DecorationRole);