[PATCH 1/4] gnu: Add qmqtt.

OpenSubmitted by phodina.
Details
One participant
  • phodina
Owner
unassigned
Severity
normal
P
P
phodina wrote on 27 Jan 16:12 +0100
(name . Guix Patches)(address . guix-patches@gnu.org)
mQtXYTzxs1-CYaEPpkJhktf2wc4Ssoa8eYBfB48B-TS-TDejmPK2O-xsaIYIj3ucqApbxlBNU_E7aUXc_uddILNVwzjUcQ_aznOklfvPTXA=@protonmail.com
Hi,

these patches add Qt modules and Serial Studio which is handy for embedded development.

----
Petr
Attachment: file
From 7501ca56bfa731ae0a0601f2790ad415ef186996 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 16 Jan 2022 17:59:22 +0100
Subject: [PATCH 1/4] gnu: Add qmqtt.

* gnu/packages/qt.scm (qmqtt): New variable.

Toggle diff (91 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 49d514503d..7acfca36c2 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -23,6 +23,7 @@
 ;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -56,6 +57,7 @@ (define-module (gnu packages qt)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cups)
@@ -2289,6 +2291,68 @@ (define-public python-qtpy
 (PyQt5, PyQt4 and PySide) and additional custom QWidgets.")
     (license license:expat)))
 
+(define-public qmqtt
+  (package
+    (name "qmqtt")
+    (version "1.0.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/alex-spataru/qmqtt")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (modules '((guix build utils) (ice-9 ftw)
+                         (srfi srfi-1)))
+              (snippet `(begin
+                          (delete-file-recursively "tests/gtest/gtest")))
+              (sha256
+               (base32
+                "1l96cssa9hjmabds9k9nzisxnzr3ndi3r82m3lgwq9ip94kz05nw"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (replace 'configure
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (invoke "qmake")))
+                  (replace 'install
+                    (lambda* (#:key outputs source #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out")) (lib (string-append
+                                                                   out "/lib"))
+                             (include (string-append out "/include")))
+                        (mkdir-p lib)
+                        (mkdir-p include)
+                        (chdir "..") ;we were in dir tests
+                        (copy-recursively "lib" lib)
+                        (chdir "src/mqtt")
+                        (for-each (lambda (file)
+                                    (install-file (string-append file) include))
+                                  '("qmqtt_client.h" "qmqtt_frame.h"
+                                    "qmqtt_global.h"
+                                    "qmqtt.h"
+                                    "qmqtt_message.h"
+                                    "qmqtt_networkinterface.h"
+                                    "qmqtt_routedmessage.h"
+                                    "qmqtt_router.h"
+                                    "qmqtt_routesubscription.h"
+                                    "qmqtt_socketinterface.h"
+                                    "qmqtt_timerinterface.h"
+                                    "qmqtt_message.h")))))
+                  (replace 'check
+                    (lambda* (#:key tests? test-options parallel- +
+                              #:allow-other-keys)
+                      +
+                      (when tests?
+                        (chdir "tests")
+                        (substitute* "gtest/gtest.pro"
+                          (("gtest") ""))
+                        (invoke "qmake")))))))
+    (native-inputs (list googletest perl python))
+    (inputs (list qtbase-5 openssl qtwebsockets))
+    (home-page "https://github.com/alex-spataru/qmqtt")
+    (synopsis "MQTT Client")
+    (description "Provides an MQTT Client with SSL support and Websockets.")
+    (license license:expat)))
+
 (define-public qscintilla
   (package
     (name "qscintilla")
-- 
2.34.0
From b04500cd973a1b37d3e272cf03c6c72500261a33 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Wed, 19 Jan 2022 12:01:22 +0100
Subject: [PATCH 2/4] gnu: Add qtcsv.

* gnu/packages/qt.scm (qtcsv): New variable.

Toggle diff (65 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 7acfca36c2..9bd51db7c5 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -908,6 +908,58 @@ (define-public qtconnectivity
     (description "The Qt Connectivity modules provides modules for interacting
 with Bluetooth and NFC.")))
 
+(define-public qtcsv
+  (package
+    (name "qtcsv")
+    (version "1.6")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/iamantony/qtcsv")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "109nbspnhaczm85wp1fqazmamdj2bh9wfv3anlslvll606lrfgir"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (replace 'configure
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (invoke "qmake")))
+                  (add-after 'unpack 'fix-install
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out")))
+                        (substitute* "qtcsv.pro"
+                          (("/usr") out)
+                          (("\\$\\$PWD") out)))))
+                  (replace 'install
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out")) (lib (string-append
+                                                                   out "/lib"))
+                             (include (string-append out "/include")))
+                        (mkdir-p include)
+                        (mkdir-p lib)
+                        (chdir "..") ;we were in dir tests
+                        (copy-recursively "include" include)
+                        (for-each (lambda (file)
+                                    (install-file (string-append file) lib))
+                                  '("libqtcsv.so" "libqtcsv.so.1"
+                                    "libqtcsv.so.1.6" "libqtcsv.so.1.6.0")))))
+                  (replace 'check
+                    (lambda* (#:key tests? test-options parallel-tests?
+                              #:allow-other-keys)
+                      (when tests?
+                        (chdir "tests")
+                        (invoke "qmake")))))))
+    (native-inputs (list perl python))
+    (inputs (list qtbase-5))
+    (home-page "https://github.com/iamantony/qtcsv")
+    (synopsis "Library for reading and writing CSV files")
+    (description "This package provides library for reading and writing CSV
+files.")
+    (license license:expat)))
+
 (define-public qtwebsockets
   (package (inherit qtsvg)
     (name "qtwebsockets")
-- 
2.34.0
From f49a91c15f5393cb6e7d7e53788c37524d21f5c8 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 21 Jan 2022 06:31:23 +0100
Subject: [PATCH 3/4] gnu: qwt: Update to 6.2.0.

* gnu/packages/qt.scm (qwt): Update to 6.2.0.

Toggle diff (24 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 9bd51db7c5..d62c4572df 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2665,7 +2665,7 @@ (define-public qtsolutions
 (define-public qwt
   (package
     (name "qwt")
-    (version "6.1.5")
+    (version "6.2.0")
     (source
       (origin
         (method url-fetch)
@@ -2673,7 +2673,7 @@ (define-public qwt
          (string-append "mirror://sourceforge/qwt/qwt/"
                         version "/qwt-" version ".tar.bz2"))
         (sha256
-         (base32 "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0"))))
+         (base32 "0c0mnyqa8rvs2bx946mbmfbh2ik4a0bmhwgn01rzvl2m758zd54i"))))
   (build-system gnu-build-system)
   (inputs
    (list qtbase-5 qtsvg qttools))
-- 
2.34.0
From fce70a5c1fbfeed2331e00c268f6f672432d49f1 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 21 Jan 2022 06:30:28 +0100
Subject: [PATCH 4/4] gnu: Add serial-studio.

* gnu/packages/qt.scm (serial-studio): New variable.
* gnu/local.mk: Add patch.
* gnu/packages/patches/serial-studio-remove-qsimple-updater.patch: New file.

Toggle diff (183 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index dceaa53145..8087cc1e59 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1598,6 +1598,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-chai-drop-python2.patch		\
   %D%/packages/patches/python-random2-getrandbits-test.patch		\
   %D%/packages/patches/python-poppler-qt5-fix-build.patch	\
+  %D%/packages/patches/serial-studio-remove-qsimple-updater.patch \
   %D%/packages/patches/sdcc-disable-non-free-code.patch		\
   %D%/packages/patches/sdl-pango-api_additions.patch		\
   %D%/packages/patches/sdl-pango-blit_overflow.patch		\
diff --git a/gnu/packages/patches/serial-studio-remove-qsimple-updater.patch b/gnu/packages/patches/serial-studio-remove-qsimple-updater.patch
new file mode 100644
index 0000000000..f8f93364d6
--- /dev/null
+++ b/gnu/packages/patches/serial-studio-remove-qsimple-updater.patch
@@ -0,0 +1,80 @@
+From 22b0b5014be7911406b262aeb0864d36f1fbbab5 Mon Sep 17 00:00:00 2001
+From: Petr Hodina <phodina@protonmail.com>
+Date: Wed, 19 Jan 2022 14:52:08 +0100
+Subject: [PATCH] Remove code dependent on QSimpleUpdater. Don't include
+ qwt.pri, qtcsv.pri and qmqtt.pri.
+
+
+diff --git a/Serial-Studio.pro b/Serial-Studio.pro
+index 49cbb6e..fb6aeca 100644
+--- a/Serial-Studio.pro
++++ b/Serial-Studio.pro
+@@ -59,7 +59,7 @@ equals(QT_MAJOR_VERSION, 6) {
+     QT += core5compat
+ }
+ 
+-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050F00
++DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050F00 DISABLE_QSU
+ 
+ #-----------------------------------------------------------------------------------------
+ # Compiler options
+diff --git a/libs/Libraries.pri b/libs/Libraries.pri
+index 9a5494c..d2f6f12 100644
+--- a/libs/Libraries.pri
++++ b/libs/Libraries.pri
+@@ -36,12 +36,8 @@ INCLUDEPATH += $$PWD
+ # Include *.pri files
+ #-------------------------------------------------------------------------------
+ 
+-include($$PWD/qwt/qwt.pri)
+-include($$PWD/qtcsv/qtcsv.pri)
+-include($$PWD/qmqtt/qmqtt.pri)
+ include($$PWD/QMapControl/QMapControl.pri)
+ include($$PWD/QRealFourier/QRealFourier.pri)
+-include($$PWD/QSimpleUpdater/QSimpleUpdater.pri)
+ 
+ macx* {
+     DEFINES += KDMACTOUCHBAR_BUILD_KDMACTOUCHBAR_SRC
+diff --git a/src/Misc/ModuleManager.cpp b/src/Misc/ModuleManager.cpp
+index 50ac4c1..bd022f2 100644
+--- a/src/Misc/ModuleManager.cpp
++++ b/src/Misc/ModuleManager.cpp
+@@ -55,7 +55,6 @@
+ #include <Widgets/Terminal.h>
+ 
+ #include <QQuickWindow>
+-#include <QSimpleUpdater.h>
+ 
+ /**
+  * Configures the application font, creates a splash screen and configures
+@@ -120,11 +119,6 @@ void Misc::ModuleManager::configureUpdater()
+ {
+     if (!autoUpdaterEnabled())
+         return;
+-
+-    setSplashScreenMessage(tr("Configuring updater..."));
+-    QSimpleUpdater::getInstance()->setNotifyOnUpdate(APP_UPDATER_URL, true);
+-    QSimpleUpdater::getInstance()->setNotifyOnFinish(APP_UPDATER_URL, false);
+-    QSimpleUpdater::getInstance()->setMandatoryUpdate(APP_UPDATER_URL, false);
+ }
+ 
+ /**
+@@ -170,7 +164,6 @@ void Misc::ModuleManager::initializeQmlInterface()
+     const auto csvPlayer = CSV::Player::getInstance();
+     const auto ioManager = IO::Manager::getInstance();
+     const auto ioConsole = IO::Console::getInstance();
+-    const auto updater = QSimpleUpdater::getInstance();
+     const auto jsonEditor = JSON::Editor::getInstance();
+     const auto mqttClient = MQTT::Client::getInstance();
+     const auto uiDashboard = UI::Dashboard::getInstance();
+@@ -215,7 +208,6 @@ void Misc::ModuleManager::initializeQmlInterface()
+     c->setContextProperty("Cpp_IsWin", isWin);
+     c->setContextProperty("Cpp_IsMac", isMac);
+     c->setContextProperty("Cpp_IsNix", isNix);
+-    c->setContextProperty("Cpp_Updater", updater);
+     c->setContextProperty("Cpp_IO_Serial", ioSerial);
+     c->setContextProperty("Cpp_CSV_Export", csvExport);
+     c->setContextProperty("Cpp_CSV_Player", csvPlayer);
+-- 
+2.34.0
+
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index d62c4572df..9604e6901d 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1961,6 +1961,78 @@ (define (delete-unwanted-files child stat flag base level)
 and binaries removed, and adds modular support for using system libraries.")
     (license license:lgpl2.1+)))
 
+(define-public serial-studio
+  (package
+    (name "serial-studio")
+    (version "1.1.4")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/Serial-Studio/Serial-Studio")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (patches (search-patches
+                        "serial-studio-remove-qsimple-updater.patch"))
+              (modules '((guix build utils) (ice-9 ftw)
+                         (srfi srfi-1)))
+              (snippet '(begin
+                          (with-directory-excursion "libs"
+                                                    (for-each
+                                                     delete-file-recursively
+                                                     '("qwt" "qtcsv" "qmqtt"
+                                                       "QSimpleUpdater")))))
+              (sha256
+               (base32
+                "0qww2pmbvmq3cjx3xk8rxq0zf54y0b0j8bykn4aq3d2dii44m85y"))))
+    (build-system qt-build-system)
+    (arguments
+     `(#:tests? #f ;no test suite
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key outputs inputs #:allow-other-keys)
+             (substitute* "Serial-Studio.pro"
+               (("/usr") (assoc-ref outputs "out"))
+               (("INCLUDEPATH \\+= src") (string-append "INCLUDEPATH += src
+INCLUDEPATH += "
+                                                        (assoc-ref inputs
+                                                                   "qwt")
+                                                        "/include/qwt
+"
+                                                        "LIBS += -L"
+                                                        (assoc-ref inputs
+                                                                   "qwt")
+                                                        "/lib"
+                                                        " -lqwt
+"
+                                                        "LIBS += -L"
+                                                        (assoc-ref inputs
+                                                                   "qtcsv")
+                                                        "/lib"
+                                                        " -lqtcsv
+"
+                                                        "LIBS += -L"
+                                                        (assoc-ref inputs
+                                                                   "qmqtt")
+                                                        "/lib"
+                                                        " -lQt5Qmqtt")))
+             (invoke "qmake"))))))
+    (native-inputs (list qwt qttools pkg-config))
+    (inputs (list qtcsv
+                  qmqtt
+                  qwt
+                  qtbase-5
+                  qtserialport
+                  qtsvg
+                  qtdeclarative
+                  qtquickcontrols2))
+    (home-page "https://github.com/Serial-Studio/Serial-Studio")
+    (synopsis "Multi-purpose serial data visualization & processing program")
+    (description
+     "This package provides multi-purpose serial data visualization
+and processing GUI program.")
+    (license license:expat)))
+
 (define-public single-application-qt5
   ;; Change in function signature, nheko requires at least this commit
   (let ((commit "dc8042b5db58f36e06ba54f16f38b16c5eea9053"))
-- 
2.34.0
?