From patchwork Sat Jul 2 09:47:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 40469 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 EA1EA27BBEA; Sat, 2 Jul 2022 10:49:13 +0100 (BST) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,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 0855D27BBE9 for ; Sat, 2 Jul 2022 10:49:13 +0100 (BST) Received: from localhost ([::1]:60794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o7ZkW-0002Aa-6X for patchwork@mira.cbaines.net; Sat, 02 Jul 2022 05:49:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o7ZkM-0002AQ-8e for guix-patches@gnu.org; Sat, 02 Jul 2022 05:49:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45917) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o7ZkL-0001xp-W5 for guix-patches@gnu.org; Sat, 02 Jul 2022 05:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o7ZkL-0002bb-Qf for guix-patches@gnu.org; Sat, 02 Jul 2022 05:49:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56354] [PATCH] gnu: engineering: Add candle. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Jul 2022 09:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56354 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56354@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16567552929948 (code B ref -1); Sat, 02 Jul 2022 09:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Jul 2022 09:48:12 +0000 Received: from localhost ([127.0.0.1]:39814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o7ZjY-0002aO-3i for submit@debbugs.gnu.org; Sat, 02 Jul 2022 05:48:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:58048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o7ZjV-0002aG-RE for submit@debbugs.gnu.org; Sat, 02 Jul 2022 05:48:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o7ZjV-0001mO-KT for guix-patches@gnu.org; Sat, 02 Jul 2022 05:48:09 -0400 Received: from mail-lj1-x231.google.com ([2a00:1450:4864:20::231]:33509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o7ZjT-0001ta-QK for guix-patches@gnu.org; Sat, 02 Jul 2022 05:48:09 -0400 Received: by mail-lj1-x231.google.com with SMTP id c15so5326172ljr.0 for ; Sat, 02 Jul 2022 02:48:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:user-agent:date:message-id:mime-version; bh=A04X0QZaWq3dw1289ZjMzw+4kp9RS2Km8ZgHgecDzE8=; b=Qk3Ifm4xYDQ/qsbLiSIwWr5H7IuO5iqdI8SiIvU7wK5gYMybHgS7+qepPZCbjyHLbZ Ze22GWqpyidvtTh1hAb/JKlDDRFaeWVfoyMKW+Jgc2vpBAiftI3bhRQrVT4rbl4MKvfP Kl1ukii/R+aVDOMWIVOVz1us2TGQLU6+wPfPUQEw6HDm+IzbnqRFI7f8/AmlwhQQmvXc 1ysONNoUXDd7WESNbYrtm9lIBVsWO2eBqBr4QF32l6H1UYze5wKQ6xRtx8dPOQQWoLHq V5UKMlgZu6DZof60orXU1VPfgEG9Uy/JJ+xjWgikadPAPqRRzw+E1TtN4SXv1hCaObRm Us9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:user-agent:date:message-id :mime-version; bh=A04X0QZaWq3dw1289ZjMzw+4kp9RS2Km8ZgHgecDzE8=; b=ItDgwnFfRT9KZRjeQu7ggjeb7pCt1+WrK5gPgFQOpUvLZaCwr6pyYGz1IytxG8rUX6 v/+1twlRZmjY5KQBk8NqcXuay50Otnha219Pu9wOy3MfzujiZr2SWKlJucRo9TxOFa7z 7xbImUaFKYcZwEYr+PZ2VlH7dHuZbchlXQZlVXpqgQozCxhOvm344y3/rIoj6xXBu1cu /LOSLozQkD6B2ubw7DFt+ObVg1BPqkCgaksN7F3icWa9QYbwu9FroKlhGoXXUGLXxlzm XOjJsyRwbfTWNwDa9TLagN+A7N2IIjuLS5NSfh7CcSaL+MlW8d6MJpbls3cdmzCG7arz KRVA== X-Gm-Message-State: AJIora+/ssaTULr7BhIc81JfoekGLZtVv535QTqm4A6D13mYnF4/7ytR iIIB0AzRe9+vlOA+qretP0mUa7iaW6Hz1Q== X-Google-Smtp-Source: AGRyM1ugJYoHjOeyXRYFxD689Iz++Jz8guXbfFPQUODc2XNx5nm623I6D3JYanXU1vlcSCC2diGz9A== X-Received: by 2002:a05:651c:244:b0:255:32c8:dd42 with SMTP id x4-20020a05651c024400b0025532c8dd42mr9891708ljn.101.1656755284694; Sat, 02 Jul 2022 02:48:04 -0700 (PDT) Received: from elephant ([5.164.222.47]) by smtp.gmail.com with ESMTPSA id u12-20020a05651220cc00b0047f74cd62a9sm3994723lfr.148.2022.07.02.02.48.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Jul 2022 02:48:03 -0700 (PDT) From: "Artyom V. Poptsov" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) Date: Sat, 02 Jul 2022 12:47:39 +0300 Message-ID: <87o7y74zic.fsf@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::231; envelope-from=poptsov.artyom@gmail.com; helo=mail-lj1-x231.google.com 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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" X-getmail-retrieved-from-mailbox: Patches Hello, this patch adds Candle[1] CNC controller. Thanks, - Artyom References: 1. https://github.com/Denvi/Candle From a3c57bbd8cb9f87a92e063d02e69aa2f29f6a895 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sat, 2 Jul 2022 12:37:13 +0300 Subject: [PATCH] gnu: engineering: Add candle. * gnu/packages/engineering.scm (candle): New variable. --- gnu/packages/engineering.scm | 37 ++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 661078594e..3bae7d100e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3702,19 +3702,32 @@ (define-public candle (sha256 (base32 "1rinblzqg8xbi4zcyx6v3k7g2kdrgmwm7xwb6fryb8s0bd21jppv")))) - (build-system qt-build-system) - ;; (native-inputs - ;; ()) - ;; (inputs) + (build-system gnu-build-system) + (native-inputs (list qttools)) + (inputs (list qtbase-5 qtserialport)) (arguments - (list #:phases - #~(modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (chdir "src") - (invoke "qmake" - (string-append "PREFIX=" (assoc-ref outputs "out"))) - #t))))) + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-sources + (lambda _ + (substitute* (find-files "." ".*\\.h") + (("const char\\* what\\(\\) const override") + "const char* what() const noexcept override")))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (chdir "src") + (invoke "qmake")))) + (add-after 'configure 'fix-makefile + (lambda _ + (substitute* "Makefile" + (("-pipe -Z7") "-pipe") + (("LFLAGS.*=.*DEBUG .*OPT:REF -Wl,-O1") + "LFLAGS = -Wl,-O1")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "Candle" + (string-append out "/bin")))))))) (home-page "https://github.com/Denvi/Candle") (synopsis "GRBL controller with G-Code visualizer") (description -- 2.34.1