From patchwork Thu Jan 27 15:12:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 36848 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3339427BBEA; Thu, 27 Jan 2022 15:34:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_PDS_PRO_TLD, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1E96927BBE9 for ; Thu, 27 Jan 2022 15:34:51 +0000 (GMT) Received: from localhost ([::1]:53402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD6nS-00082f-82 for patchwork@mira.cbaines.net; Thu, 27 Jan 2022 10:34:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD6TB-0006Cq-1o for guix-patches@gnu.org; Thu, 27 Jan 2022 10:13:53 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35012) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD6SM-0002bJ-Qh for guix-patches@gnu.org; Thu, 27 Jan 2022 10:13:38 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nD6SM-0005cI-NU for guix-patches@gnu.org; Thu, 27 Jan 2022 10:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53585] [PATCH 1/4] gnu: Add qmqtt. Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Jan 2022 15:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53585 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53585@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.164329635121545 (code B ref -1); Thu, 27 Jan 2022 15:13:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Jan 2022 15:12:31 +0000 Received: from localhost ([127.0.0.1]:56148 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nD6Rh-0005bG-Th for submit@debbugs.gnu.org; Thu, 27 Jan 2022 10:12:31 -0500 Received: from lists.gnu.org ([209.51.188.17]:44414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nD6Rf-0005b6-KT for submit@debbugs.gnu.org; Thu, 27 Jan 2022 10:12:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD6Rf-0005Ep-Eo for guix-patches@gnu.org; Thu, 27 Jan 2022 10:12:19 -0500 Received: from mail-4316.protonmail.ch ([185.70.43.16]:17393) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD6Rc-0002XF-5j for guix-patches@gnu.org; Thu, 27 Jan 2022 10:12:18 -0500 Date: Thu, 27 Jan 2022 15:12:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1643296332; bh=Hu32bDqtc+rvswzPutZJvZgV7GncBTD3lTuF+FQKjGE=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc; b=PBrwZKY0KjoaPcWs+nYVg0dJlyiiP50yJqVRAAGQh0ld0fhDJViYp4qlbfnngxQ26 FPk+4cixn/rIpnJfXLee4hnAuqrPB4lSdGsQVcvDLjS4O3OjvjXOnAbQyIRsw5FDhR cBzMbzExtHpY4cLjJYkWBAPUn6gXYExWe/h5b+A/eBZSJPdTur2uaFpB/eDnbb0X93 3egJUwpy0rj6h0sGaQ5bOH4c1nDjO4AjTeWN1oOd0QFbenAPfL/PlkI+oC0l4EhOvt DTIrthavT/pokUIYsXV/agzI66ov0rtuwRRJxs+CF2dcOW2JqF7MwiyozQjP2N7KkT 7YOgasDhvLfIw== Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.16; envelope-from=phodina@protonmail.com; helo=mail-4316.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_PDS_PRO_TLD=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches Hi, these patches add Qt modules and Serial Studio which is handy for embedded development. ---- Petr From fce70a5c1fbfeed2331e00c268f6f672432d49f1 Mon Sep 17 00:00:00 2001 From: Petr Hodina 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. 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 +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 + + #include +-#include + + /** + * 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