From patchwork Fri Feb 21 09:01:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 38895 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 4415D27BBEA; Fri, 21 Feb 2025 09:26:24 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 92C0527BBE2 for ; Fri, 21 Feb 2025 09:26:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tlPIN-000105-Ii; Fri, 21 Feb 2025 04:26:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tlPIL-0000zl-TV for guix-patches@gnu.org; Fri, 21 Feb 2025 04:26:06 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tlPIL-0007Fd-Je for guix-patches@gnu.org; Fri, 21 Feb 2025 04:26:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=wNuDF7FKcJx3q7tYSxFelEqkdxvtAczd4M7OLki/Sj0=; b=vGWVwUn47W6oMO+oPG0K4cXziAx2eCG0OUHUSjY1HSZnobjN2zhBBUu1GEqDb8awgkEjKG956GqeozfTd0Q9Bek+0zlJwDx6VWTRQ/Zcc3HK1PxkkvQzZnDoZah5W4aSZsbqrjrQxmPSgPKLXk5Crr04isWSjeqBM9GHTCBfgvxtWr5fJc1tXW7tGzFpiVlawXaXJ1WIXrK8HAE0M+dS23rM11nHE5LS++39FjP5uOVYIE/Yf3N16/TYXeLvvKpSDj876IvDJzWDBhqd8/LGC7seRf5mtW5WrywKUPBCg6pDS5Oe3WUnTPMk8T7NgYaD2WuFdjp+7Ss+eAO5VrLe+w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tlPIK-0005GA-Aa for guix-patches@gnu.org; Fri, 21 Feb 2025 04:26:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74344] [PATCH v4 1/7] gnu: Add asyncplusplus. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Feb 2025 09:26:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74344 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74344@debbugs.gnu.org Cc: Sughosha Received: via spool by 74344-submit@debbugs.gnu.org id=B74344.174012995120089 (code B ref 74344); Fri, 21 Feb 2025 09:26:04 +0000 Received: (at 74344) by debbugs.gnu.org; 21 Feb 2025 09:25:51 +0000 Received: from localhost ([127.0.0.1]:53297 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tlPI6-0005Do-0F for submit@debbugs.gnu.org; Fri, 21 Feb 2025 04:25:50 -0500 Received: from layka.disroot.org ([178.21.23.139]:33068) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tlPI3-0005DF-MY for 74344@debbugs.gnu.org; Fri, 21 Feb 2025 04:25:48 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C154E25B64; Fri, 21 Feb 2025 10:25:46 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id u-1ekr3j4EHt; Fri, 21 Feb 2025 10:25:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740129942; bh=xXngsxUH6A8ek0OH1xwt8pKWB1tSqNTlj1+kHHXsvs8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HCtGws9uA/h0q3gwTfxPfoew1RZCk4bGO2dZHx3mFYB4FJME9+nR/uyKQpXzf1PrF BTV+cXoMGwtt3bECNukW687UBpfALM42YJrb1VunCBy12QWbpp6dNr0KJeOGmhVnKi vQnTDRoKvW7p8PEK7xIh4bEuyP2vT8KIDFTRSCSsEMsKD1CPhQH+S0elvFtzw5clab Ed9aF7jwE/vNHFkO0r2tMH8rF2d62Wx8H0MK1sHaB7Z9HnDUDsTBL+1YslxXRLe1wN lr0nt45/cIZ/vmyvk+cdjkEff0Eoqerk5rB0bkqnhcNE4cKzI1x6ThF2C/gw6UFYy0 YvjEI7A/SXc+g== Date: Fri, 21 Feb 2025 14:31:54 +0530 Message-ID: <207ea8d29a96d2e08dcaf1ae3b8370f743c46042.1740128520.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (asyncplusplus): New variable. Change-Id: I6ba1b983ce05a634937d0d972e670ce636df3b94 --- gnu/packages/cpp.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index c6c63d3ffc..c6d588afc0 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -195,6 +195,33 @@ (define-public asmjit development effort.") (license license:zlib)))) +(define-public asyncplusplus + (package + (name "asyncplusplus") + (version "1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Amanieu/asyncplusplus") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0iswbh7y46kn412c52af0n8bc4fplm3y94yh10n2lchispzar72j")) + (modules '((guix build utils))) + (snippet + ;; Fix install location of cmake files. + '(substitute* "CMakeLists.txt" + (("DESTINATION cmake") + "DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake"))))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f)) ;no tests + (home-page "https://github.com/Amanieu/asyncplusplus") + (synopsis "Concurrency framework for C++11") + (description "Async++ is a concurrency framework for C++11.") + (license license:expat))) + (define-public biblesync (package (name "biblesync") From patchwork Fri Feb 21 09:01:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 38898 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 EB1D527BBEC; Fri, 21 Feb 2025 09:27:33 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 20C5D27BBE2 for ; Fri, 21 Feb 2025 09:27:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tlPJK-0001Fo-Gb; Fri, 21 Feb 2025 04:27:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tlPJJ-0001EE-Sd for guix-patches@gnu.org; Fri, 21 Feb 2025 04:27:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tlPJJ-0007PQ-IF for guix-patches@gnu.org; Fri, 21 Feb 2025 04:27:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=NCdzLtZSjXd3+yVjGHQUGfzA5mkqib7JPzYc/d0tJh8=; b=VfZx2Qfiq4X4Ss//clj/sPw6BvzU1rWMwBCcXF0YgXkuIxLv8q20MIDfVsCOSUfhRgXcY/McE30+8YsYdT5EVE6E/8m8ntHcOPLiPlHMjvOLit8MHNeCmBpBF2LGrZ4RZeSYMztdGz4dkG0+hCdqiCF9NvN3LXT+80NPD/woU4w9JEw+K55E9aOwrripgRHY3IqaGCD30VRDBRlm0c0q+ZJTrmqtqILaXU7/kAxN5Xh2UWNQ6U1C+mAQRdQ/0Jm74OZq3WUkOMZ2AHgDc4OeayCq9RgoVxVwC7O3+WAE41+EprJvcaSHLv8X2ThIBnxuLVTZC/zo/wB4PG5DZoVKEg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tlPJI-0005QB-98; Fri, 21 Feb 2025 04:27:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74344] [PATCH v4 2/7] gnu: Add qcodeeditor. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, z572@z572.online, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 21 Feb 2025 09:27:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74344 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74344@debbugs.gnu.org Cc: Sughosha , Maxim Cournoyer , Zheng Junjie , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Maxim Cournoyer , Zheng Junjie , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 74344-submit@debbugs.gnu.org id=B74344.174012997920399 (code B ref 74344); Fri, 21 Feb 2025 09:27:04 +0000 Received: (at 74344) by debbugs.gnu.org; 21 Feb 2025 09:26:19 +0000 Received: from localhost ([127.0.0.1]:53316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tlPIY-0005Io-AN for submit@debbugs.gnu.org; Fri, 21 Feb 2025 04:26:19 -0500 Received: from layka.disroot.org ([178.21.23.139]:48468) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tlPIJ-0005Fs-SB for 74344@debbugs.gnu.org; Fri, 21 Feb 2025 04:26:07 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id DCD3525DCE; Fri, 21 Feb 2025 10:26:02 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id NNBUIG0fLk3e; Fri, 21 Feb 2025 10:25:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740129958; bh=KnmMl8rPcroXK1B8Hl0rfxcdwd45Tanr6ywUrykkovs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bsyk2HTWdC17drCx2CIDUwczw1t6KgqnwsFk7uU/LCTmC/ktCxXYULn2RH5+Jiks+ /KfU2LJsAgb1Ht2GGyh88GnIgJhbE3w9USwr12aKn3nqeEJxGn6uESNpU2IQtn3HVR K9xE6TUC2hn2wXiIj15hKVnjZTLhRcKuqCmNqi3f2vbZbiJubUYp7mwGRJQ/qgDi4u ciMm7ZLXYIbCwpaOId1eM9zkAs4lU/mh+I8VKj5posFajeLTG+2tBWhvFGZSIqYFEy owJ6FgL07YvuEl5GOVCDDvhZwiwWcKM+yzvYHDCZHIZp1vHwKSJN+9m5qYh2vzB/tb UP8ZItV8wFxHQ== Date: Fri, 21 Feb 2025 14:31:55 +0530 Message-ID: <833ab8e6d66ef5e6d7dff0142d64bd7611e3a24c.1740128520.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/qt.scm (qcodeeditor): New variable. * gnu/packages/patches/qcodeeditor-qt6.patch: New file. * gnu/local.mk: Register it. Change-Id: I073bfc191d77f293afc7019d0cc2ebd460ffa58e --- gnu/local.mk | 1 + gnu/packages/patches/qcodeeditor-qt6.patch | 199 +++++++++++++++++++++ gnu/packages/qt.scm | 52 ++++++ 3 files changed, 252 insertions(+) create mode 100644 gnu/packages/patches/qcodeeditor-qt6.patch diff --git a/gnu/local.mk b/gnu/local.mk index 01926bb1b8..2b464668e8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2005,6 +2005,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-sphobjinv-defer-ssl-import.patch \ %D%/packages/patches/python-sphinx-prompt-docutils-0.19.patch \ %D%/packages/patches/python-wxwidgets-type-errors.patch \ + %D%/packages/patches/qcodeeditor-qt6.patch \ %D%/packages/patches/qtdeclarative-5-disable-qmlcache.patch \ %D%/packages/patches/qtdeclarative-disable-qmlcache.patch \ %D%/packages/patches/quodlibet-fix-invalid-glob.patch \ diff --git a/gnu/packages/patches/qcodeeditor-qt6.patch b/gnu/packages/patches/qcodeeditor-qt6.patch new file mode 100644 index 0000000000..d606e88549 --- /dev/null +++ b/gnu/packages/patches/qcodeeditor-qt6.patch @@ -0,0 +1,199 @@ +From 4c07c7e63727750a85f796a5b356c480f462bec2 Mon Sep 17 00:00:00 2001 +From: benyamin +Date: Wed, 14 Sep 2022 19:43:38 +0430 +Subject: [PATCH] initialized with Qt6 + +--- + CMakeLists.txt | 12 ++++++------ + example/CMakeLists.txt | 14 +++++++------- + example/src/MainWindow.cpp | 9 +++++---- + src/internal/QCodeEditor.cpp | 15 ++++++++------- + src/internal/QLanguage.cpp | 7 ++----- + src/internal/QSyntaxStyle.cpp | 19 +++++++------------ + 6 files changed, 35 insertions(+), 41 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 40d5617..7cc7496 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,9 +75,9 @@ set(CMAKE_AUTOMOC On) + set(CMAKE_AUTORCC ON) + + # Find includes in corresponding build directories +-find_package(Qt5Core CONFIG REQUIRED) +-find_package(Qt5Widgets CONFIG REQUIRED) +-find_package(Qt5Gui CONFIG REQUIRED) ++find_package(Qt6Core CONFIG REQUIRED) ++find_package(Qt6Widgets CONFIG REQUIRED) ++find_package(Qt6Gui CONFIG REQUIRED) + + add_library(QCodeEditor STATIC + ${RESOURCES_FILE} +@@ -104,7 +104,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) + endif(CMAKE_COMPILER_IS_GNUCXX) + + target_link_libraries(QCodeEditor +- Qt5::Core +- Qt5::Widgets +- Qt5::Gui ++ Qt::Core ++ Qt::Widgets ++ Qt::Gui + ) +diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt +index 0e0bf4a..d6204e4 100644 +--- a/example/CMakeLists.txt ++++ b/example/CMakeLists.txt +@@ -6,9 +6,9 @@ set(CMAKE_CXX_STANDARD 17) + set(CMAKE_AUTOMOC On) + set(CMAKE_AUTORCC ON) + +-find_package(Qt5Core CONFIG REQUIRED) +-find_package(Qt5Widgets CONFIG REQUIRED) +-find_package(Qt5Gui CONFIG REQUIRED) ++find_package(Qt6Core CONFIG REQUIRED) ++find_package(Qt6Widgets CONFIG REQUIRED) ++find_package(Qt6Gui CONFIG REQUIRED) + + add_executable(QCodeEditorExample + resources/demo_resources.qrc +@@ -22,8 +22,8 @@ target_include_directories(QCodeEditorExample PUBLIC + ) + + target_link_libraries(QCodeEditorExample +- Qt5::Core +- Qt5::Widgets +- Qt5::Gui ++ Qt::Core ++ Qt::Widgets ++ Qt::Gui + QCodeEditor +-) +\ No newline at end of file ++) +diff --git a/example/src/MainWindow.cpp b/example/src/MainWindow.cpp +index 5552835..e71a1f2 100644 +--- a/example/src/MainWindow.cpp ++++ b/example/src/MainWindow.cpp +@@ -15,13 +15,14 @@ + #include + + // Qt +-#include +-#include +-#include + #include +-#include ++#include ++#include + #include ++#include + #include ++#include ++#include + + MainWindow::MainWindow(QWidget* parent) : + QMainWindow(parent), +diff --git a/src/internal/QCodeEditor.cpp b/src/internal/QCodeEditor.cpp +index 1aa93e7..1369ff4 100644 +--- a/src/internal/QCodeEditor.cpp ++++ b/src/internal/QCodeEditor.cpp +@@ -537,16 +537,17 @@ void QCodeEditor::keyPressEvent(QKeyEvent* e) { + + // Shortcut for moving line to left + if (m_replaceTab && e->key() == Qt::Key_Backtab) { +- indentationLevel = std::min(indentationLevel, m_tabReplace.size()); ++ indentationLevel = std::min(indentationLevel, (int) m_tabReplace.size()); + +- auto cursor = textCursor(); ++ auto cursor = textCursor(); + +- cursor.movePosition(QTextCursor::MoveOperation::StartOfLine); +- cursor.movePosition(QTextCursor::MoveOperation::Right, +- QTextCursor::MoveMode::KeepAnchor, indentationLevel); ++ cursor.movePosition(QTextCursor::MoveOperation::StartOfLine); ++ cursor.movePosition(QTextCursor::MoveOperation::Right, ++ QTextCursor::MoveMode::KeepAnchor, ++ indentationLevel); + +- cursor.removeSelectedText(); +- return; ++ cursor.removeSelectedText(); ++ return; + } + + QTextEdit::keyPressEvent(e); +diff --git a/src/internal/QLanguage.cpp b/src/internal/QLanguage.cpp +index 3665df7..417c657 100644 +--- a/src/internal/QLanguage.cpp ++++ b/src/internal/QLanguage.cpp +@@ -32,8 +32,7 @@ bool QLanguage::load(QIODevice* device) + + if (type == QXmlStreamReader::TokenType::StartElement) + { +- if (reader.name() == "section") +- { ++ if (reader.name().toString() == "section") { + if (!list.empty()) + { + m_list[name] = list; +@@ -41,9 +40,7 @@ bool QLanguage::load(QIODevice* device) + } + + name = reader.attributes().value("name").toString(); +- } +- else if (reader.name() == "name") +- { ++ } else if (reader.name().toString() == "name") { + readText = true; + } + } +diff --git a/src/internal/QSyntaxStyle.cpp b/src/internal/QSyntaxStyle.cpp +index 6a9eb55..a4730de 100644 +--- a/src/internal/QSyntaxStyle.cpp ++++ b/src/internal/QSyntaxStyle.cpp +@@ -25,15 +25,12 @@ bool QSyntaxStyle::load(QString fl) + + if(token == QXmlStreamReader::StartElement) + { +- if (reader.name() == "style-scheme") +- { ++ if (reader.name().toString() == "style-scheme") { + if (reader.attributes().hasAttribute("name")) + { + m_name = reader.attributes().value("name").toString(); + } +- } +- else if (reader.name() == "style") +- { ++ } else if (reader.name().toString() == "style") { + auto attributes = reader.attributes(); + + auto name = attributes.value("name"); +@@ -50,21 +47,19 @@ bool QSyntaxStyle::load(QString fl) + format.setForeground(QColor(attributes.value("foreground").toString())); + } + +- if (attributes.hasAttribute("bold") && +- attributes.value("bold") == "true") +- { ++ if (attributes.hasAttribute("bold") ++ && attributes.value("bold").toString() == "true") { + format.setFontWeight(QFont::Weight::Bold); + } + +- if (attributes.hasAttribute("italic") && +- attributes.value("italic") == "true") +- { ++ if (attributes.hasAttribute("italic") ++ && attributes.value("italic").toString() == "true") { + format.setFontItalic(true); + } + + if (attributes.hasAttribute("underlineStyle")) + { +- auto underline = attributes.value("underlineStyle"); ++ auto underline = attributes.value("underlineStyle").toString(); + + auto s = QTextCharFormat::UnderlineStyle::NoUnderline; + diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 432282f9cf..6a59ca31ba 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -4867,6 +4867,58 @@ (define-public dotherside @end itemize\n") (license license:lgpl3))) ;version 3 only (+ exception) +(define-public qcodeeditor + (let ((commit "dc644d41b68978ab9a5591ba891a223221570e74") ;no tags + (revision "0")) + (package + (name "qcodeeditor") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Megaxela/QCodeEditor") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bpvfwbgp275w79dzrd7d9k3md1ch7n88rh59mxdfj8s911n42j8")) + (patches + (search-patches "qcodeeditor-qt6.patch")))) + (build-system qt-build-system) + (arguments + (list #:qtbase qtbase + #:tests? #f ;no tests + #:configure-flags + #~(list "-DBUILD_EXAMPLE=ON" + (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath=" + #$output "/lib")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'build-shared-library + (lambda _ + (substitute* "CMakeLists.txt" + (("STATIC") "SHARED")))) + ;; Install rule does not exist. + (replace 'install + (lambda _ + (install-file "example/QCodeEditorExample" + (string-append #$output "/bin")) + (install-file "libQCodeEditor.so" + (string-append #$output "/lib")) + (for-each + (lambda (file) + (install-file file + (string-append #$output + "/include/QCodeEditor"))) + (find-files "../source/include/internal" "\\.hpp"))))))) + (inputs + (list qtwayland)) + (home-page "https://github.com/Megaxela/QCodeEditor") + (synopsis "Qt code editor widget") + (description + "QCodeEditor is a Qt widget for editing/viewing code.") + (license license:expat)))) + (define-public qtcolorwidgets (package (name "qtcolorwidgets") From patchwork Fri Feb 21 09:01:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 38899 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 7806227BBE2; Fri, 21 Feb 2025 09:27:34 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 C22D427BBEA for ; Fri, 21 Feb 2025 09:27:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tlPJN-0001Jn-N8; Fri, 21 Feb 2025 04:27:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tlPJM-0001Iw-7P for guix-patches@gnu.org; Fri, 21 Feb 2025 04:27:08 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tlPJL-0007Pz-UD for guix-patches@gnu.org; Fri, 21 Feb 2025 04:27:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=3TQFViXjq/Lt8Cc8k0DDTiVir8FNDKzhqbnBYtqkxzQ=; b=U5vxAgB+ibXAmKWKYgxCTTubbuM6NCocl9Oy8Uu4jzw0D7m49B5I5WZXrkuif6Uw78aCJtgn9o4jm8N3S36RvHPkR7r3/KP/LlAyWU2EvRuygukaagaCiVWBiurDMmIAadL7MikPo2bkQlEY709mGlUBlx2TZlo3UJKl6rBt9A0DkytfWV1x0d8UD8U13pWiokhAJSxe2Q1HL3oCtShEyeiJhTEUgxHrgJixGdI5eCrjGEJBDCJi5QuBRFuiMGWjuYnvR0oVn3ozhyBk9lnpg9517UHrFCEOp1t5B+wfnQaL9Hismcd9ILs3iqVITg/fYDWmFynvLydvxRjrnzpfNQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tlPJH-0005Q0-Df; Fri, 21 Feb 2025 04:27:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74344] [PATCH v4 3/7] gnu: Add qt-advanced-docking-system. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, z572@z572.online, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 21 Feb 2025 09:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74344 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74344@debbugs.gnu.org Cc: Sughosha , Maxim Cournoyer , Zheng Junjie , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Maxim Cournoyer , Zheng Junjie , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 74344-submit@debbugs.gnu.org id=B74344.174012996620264 (code B ref 74344); Fri, 21 Feb 2025 09:27:03 +0000 Received: (at 74344) by debbugs.gnu.org; 21 Feb 2025 09:26:06 +0000 Received: from localhost ([127.0.0.1]:53307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tlPIK-0005GO-RK for submit@debbugs.gnu.org; Fri, 21 Feb 2025 04:26:06 -0500 Received: from layka.disroot.org ([178.21.23.139]:48460) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tlPII-0005FZ-PB for 74344@debbugs.gnu.org; Fri, 21 Feb 2025 04:26:03 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C865025B64; Fri, 21 Feb 2025 10:26:01 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id PbYm958_ORAA; Fri, 21 Feb 2025 10:26:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740129961; bh=CSlicxEAOs69DVoog8X6oR66o9uLQk/MO9+Sy4qRf2U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UldQ+TdwRASW+Vg7rU75dJ9tG0L+lF6JCUiMh9TD0fTikvaknGELzpbfzquFisMiz c80TTy8ktkIarC5JlpWGriLqU1dJVjeO5D1RuKeB5xo7m8WotYV4IfPeKoIx8dz9k4 TKOE81wjdwJJI6ckxsQDqeiFGgv6NoJJwWUF5Rtukrw+Jz1bScUoERMcrr+MUi/YHX oJ9sTPtQqyRqHQD2pYGDNTK1FDjlF7ZJfTyswRT5CCb7opMlWegJfegflT0alC6sPB B1uuLc8OUFYtK6lMDj6SoipDDnTOkyXpaHU0YFX2g24on/IZd2VR/EMH4t8hGRizct mpklM+BTvpd6A== Date: Fri, 21 Feb 2025 14:31:56 +0530 Message-ID: In-Reply-To: References: MIME-Version: 1.0 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/qt.scm (qt-advanced-docking-system): New variable. Change-Id: Id89f0474d7540870fff4b94c6709edd0baaa7d7b --- gnu/packages/qt.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 6a59ca31ba..cd3a572208 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -4919,6 +4919,35 @@ (define-public qcodeeditor "QCodeEditor is a Qt widget for editing/viewing code.") (license license:expat)))) +(define-public qt-advanced-docking-system + (package + (name "qt-advanced-docking-system") + (version "4.4.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qbvlnfpdlz22y1vrdd1gs2mfh03k95ccahb7pl6i07pgn4dgcvh")))) + (build-system qt-build-system) + (arguments + (list #:qtbase qtbase + #:tests? #f ;no tests + #:configure-flags + #~(list ;; Examples require qtdeclarative. + "-DBUILD_EXAMPLES=OFF" + (string-append "-DADS_VERSION=" #$version)))) + (home-page "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System") + (synopsis "Advanced docking system for Qt") + (description + "Qt Advanced Docking System lets you create customizable layouts using a +window docking system.") + (license license:lgpl2.1+))) + (define-public qtcolorwidgets (package (name "qtcolorwidgets") From patchwork Fri Feb 21 09:01:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 38897 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 3407627BBEB; Fri, 21 Feb 2025 09:27:28 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 F1E2727BBE2 for ; Fri, 21 Feb 2025 09:27:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tlPJK-0001EP-4K; Fri, 21 Feb 2025 04:27:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tlPJJ-0001E5-DS for guix-patches@gnu.org; Fri, 21 Feb 2025 04:27:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tlPJJ-0007PE-3p for guix-patches@gnu.org; Fri, 21 Feb 2025 04:27:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=359MMyvYF7a5uUR71uspdAkz+B2ck9Q73l0ZGMC89pM=; b=vTurOm0Eeipu7L6zy9vqMZhhmWGpOzh+DffK1pEYDbxem7PXqQGUUAijGsbO11JCQOKyLR32hVTzAMzfb6wCASVOUo/bACiyG4qsfj8Ap1aO4OJSjJ0l8xjraydxdXojofkEGc8Sf/29gX/YxrAPZAEZRpf/wLz7+DOXywf9kusZdKzW1bJTQa81ezDuP+IdA7mlckbHlRFbnVATlRVNLM92K7EszUTgMq/qSgPRrJt+5FgZLJY7lZrmhB36qhooyT3fzpY0nzyONU520lPKVkkXcS5JzdggO0Hf4fR1J6b3DdUThLZ3M6uMHPOM1mp7vgM+Np7O1IShOb+ha1ktsA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tlPJI-0005QO-SS for guix-patches@gnu.org; Fri, 21 Feb 2025 04:27:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74344] [PATCH v4 4/7] gnu: Add qtcsv. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Feb 2025 09:27:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74344 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74344@debbugs.gnu.org Cc: Sughosha Received: via spool by 74344-submit@debbugs.gnu.org id=B74344.174012997920408 (code B ref 74344); Fri, 21 Feb 2025 09:27:04 +0000 Received: (at 74344) by debbugs.gnu.org; 21 Feb 2025 09:26:19 +0000 Received: from localhost ([127.0.0.1]:53319 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tlPIZ-0005Iy-8J for submit@debbugs.gnu.org; Fri, 21 Feb 2025 04:26:19 -0500 Received: from layka.disroot.org ([178.21.23.139]:48476) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tlPIL-0005GB-0y for 74344@debbugs.gnu.org; Fri, 21 Feb 2025 04:26:08 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id F403E25EA7; Fri, 21 Feb 2025 10:26:03 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 2FzVe6LZpBOU; Fri, 21 Feb 2025 10:26:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740129963; bh=gVPhDaHNsdVpMT5taK9+FzAU/88qlNJuq6d7PfwFuKQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=av2FffqEnCVs6hDbVIW1YLe/b96b6GyUmCRnwqQc+qnzgJBqXWoJ0iP/4Al7Ge1/V VzZZJeyDalq0GwOihS3aCQRvEsgo/yHegGcM6EYq8SNvcpr39SMpIVHVLuXwRlNvHL wgSV3tSbMSeCODS+yeQRRsbutLtyiZhOlGYV6sHLQCgZnoIXBhva6dIBI/qRD6PYEo i0E4iqvyUj/gAlPTyfhIrVPrvnOXFC530F3X1hKel2T70iiqTZeeDPVTNOBznlKm0u GLPm8G8EhLwn4E4lti6t3224Dr67jsKawz3U/hkWH2CLiVduIHlCTvQrNDHfbEpb0i fv0UIGxrGNMQQ== Date: Fri, 21 Feb 2025 14:31:57 +0530 Message-ID: <271c9bbbe3ee9a93b085191e8faff0316a491de8.1740128520.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/serialization.scm (qtcsv): New variable. Change-Id: I9192e9c86914a204f1fcf940b56da33d0ba6ffbb --- gnu/packages/serialization.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index f77ae9dc16..c0f7001fa0 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -51,6 +51,7 @@ (define-module (gnu packages serialization) #:use-module (guix build-system meson) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) @@ -69,6 +70,7 @@ (define-module (gnu packages serialization) #:use-module (gnu packages python-check) #:use-module (gnu packages python-science) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) #:use-module (gnu packages time)) (define-public avro-cpp-1.9 @@ -441,6 +443,30 @@ (define-public libcsv "This package provides a C library for parsing and writing CSV data.") (license license:lgpl2.1+))) +(define-public qtcsv + (package + (name "qtcsv") + (version "1.7") + (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 + "1c9i93kr7wvpr01i4wixi9mf991nd3k2adg5fy0vxwwlvvc7dgdw")))) + (build-system qt-build-system) + (arguments + (list #:qtbase qtbase + #:test-target "tests")) + (home-page "https://github.com/iamantony/qtcsv") + (synopsis "Library for reading and writing CSV files in Qt") + (description + "@code{qtcsv} is a library for reading and writing +@acronym{CSV,comma-seperated values} files in Qt.") + (license license:expat))) + (define-public libscfg (package (name "libscfg") From patchwork Fri Feb 21 09:01:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 38896 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 8526027BBEA; Fri, 21 Feb 2025 09:27:19 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 2ED2527BBE2 for ; Fri, 21 Feb 2025 09:27:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tlPJM-0001Iu-Ex; Fri, 21 Feb 2025 04:27:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tlPJL-0001HY-95 for guix-patches@gnu.org; Fri, 21 Feb 2025 04:27:07 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tlPJK-0007Pj-WB for guix-patches@gnu.org; Fri, 21 Feb 2025 04:27:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=QU/5OfpSODNfdvUVBZuIBNzBkYOtefA0b/Uy26qGMfM=; b=eDDvscGSTccSZmjqdkn1O9U69CaDwtgxJhBpInES0lp4Ak3Qb8bOdkSAMJI8nc84C32lJE6jd2mdfuKjsBXK9fO0fc6vLqeY8dLfLetSgtC9Rlo+kO+3XBcdL0D1a6Lg9fQp7xkY+CjetH0XRkyPkiZBOPZyGr34qGOT5wPhJKoBDppOgyjaKf7APvPzw/jIjOnxQXjUy8xbGkOemsUlQoC1QtQRXzYmXHLh0mGBhBx5uTHajrrQqmO+wI5w4lmEm7+KvYHVIwR0yD9+NkexiQv1yzrYV3V0lsVBNgsJ8fGTyp2FqmmyU2DSi2Sr3Ew4F7oz4cJd3y8BhLHjeFNUjA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tlPJJ-0005Qi-UH; Fri, 21 Feb 2025 04:27:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74344] [PATCH v4 5/7] gnu: Add qtpromise. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, z572@z572.online, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 21 Feb 2025 09:27:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74344 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74344@debbugs.gnu.org Cc: Sughosha , Maxim Cournoyer , Zheng Junjie , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Maxim Cournoyer , Zheng Junjie , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 74344-submit@debbugs.gnu.org id=B74344.174012998020422 (code B ref 74344); Fri, 21 Feb 2025 09:27:05 +0000 Received: (at 74344) by debbugs.gnu.org; 21 Feb 2025 09:26:20 +0000 Received: from localhost ([127.0.0.1]:53321 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tlPIZ-0005J7-M4 for submit@debbugs.gnu.org; Fri, 21 Feb 2025 04:26:20 -0500 Received: from layka.disroot.org ([178.21.23.139]:60828) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tlPIS-0005Hj-DR for 74344@debbugs.gnu.org; Fri, 21 Feb 2025 04:26:13 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 881A625B04; Fri, 21 Feb 2025 10:26:11 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id BiGRl2AAhzeG; Fri, 21 Feb 2025 10:26:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740129967; bh=E98mKSz51kmACC4bzTpEq573V+Jjs7Gva7nFCxoyAwE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZmU/QxKgd6y61H6x4Tr88fHrC1N3Unsq0u9YMCtX4wmVMbHRDvEvFf2XZDEkDiN47 syxjonyD4aKVErAKU2vtI3rSn8TewXuJlbVpReQv9vWHC1FAGARYU04BD7l260be0d 3GtqspDJolX8GePhp8s/695OpAf3G4snVx9eHjMsVldxp+bHduzx+/TQNS1R/GYKGB hqTbwIRjTQ4CAgEwvRrgR8xU02PsTZJDzXrU8uxOKucgJl+htPmOaIR2YlXWYpuzWj 5Kbw++NOK42nL6XLBmw3ni+c04OW/LTPoUwnbin7vpLhFUz9ZQlLD44EBbOseCArOF l9e3GI61pbuAg== Date: Fri, 21 Feb 2025 14:31:58 +0530 Message-ID: <7bf8c0edf6497f2b44927a126554a7ed21cf1382.1740128520.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/qt.scm (qtpromise): New variable. Change-Id: Iaec93f91e8efe2a17eb32f7205f12eab5ed1e269 --- gnu/packages/qt.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index cd3a572208..5f52a2cc41 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -4948,6 +4948,46 @@ (define-public qt-advanced-docking-system window docking system.") (license license:lgpl2.1+))) +(define-public qtpromise + (package + (name "qtpromise") + (version "0.7.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/simonbrunel/qtpromise") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nsh6v5k4kdrrhcd6adz947n0dka4rrbx8f8rvm1175545nbi67s")))) + (build-system qt-build-system) + (arguments + (list #:test-target "tests" + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'fix-include-path + (lambda _ + (chdir "../source") + (substitute* "../source/include/QtPromise" + (("../src/") "")))) + (replace 'install + (lambda _ + (let ((include (string-append #$output "/include"))) + (with-directory-excursion "../source" + (install-file "include/QtPromise" + (string-append include)) + (copy-recursively "src/qtpromise" + (string-append include + "/qtpromise"))))))))) + (home-page "https://qtpromise.netlify.app/") + (synopsis "Promises/A+ implementation for Qt/C++") + (description + "This package provides a Qt/C++ implementation of +@url{Promises/A+,https://promisesaplus.com/} standard for the 'promises' +programming paradigm..") + (license license:expat))) + (define-public qtcolorwidgets (package (name "qtcolorwidgets")