From patchwork Mon Jul 4 03:36:21 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: 40498 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 2DE3627BBEA; Mon, 4 Jul 2022 04:37:14 +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 1150D27BBE9 for ; Mon, 4 Jul 2022 04:37:13 +0100 (BST) Received: from localhost ([::1]:33694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o8Ctc-0000py-8W for patchwork@mira.cbaines.net; Sun, 03 Jul 2022 23:37:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8CtS-0000pZ-4V for guix-patches@gnu.org; Sun, 03 Jul 2022 23:37:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51872) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o8CtR-0004ZO-QD for guix-patches@gnu.org; Sun, 03 Jul 2022 23:37:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o8CtR-0002EK-Mn for guix-patches@gnu.org; Sun, 03 Jul 2022 23:37: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: Mon, 04 Jul 2022 03:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 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.16569058068551 (code B ref -1); Mon, 04 Jul 2022 03:37:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Jul 2022 03:36:46 +0000 Received: from localhost ([127.0.0.1]:45769 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o8CtA-0002Do-W8 for submit@debbugs.gnu.org; Sun, 03 Jul 2022 23:36:46 -0400 Received: from lists.gnu.org ([209.51.188.17]:59688) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o8Csx-0002DT-Kb for submit@debbugs.gnu.org; Sun, 03 Jul 2022 23:36:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8Csx-0000nU-CK for guix-patches@gnu.org; Sun, 03 Jul 2022 23:36:31 -0400 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]:46064) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o8Csu-0004QB-ST for guix-patches@gnu.org; Sun, 03 Jul 2022 23:36:31 -0400 Received: by mail-lf1-x131.google.com with SMTP id z21so13572537lfb.12 for ; Sun, 03 Jul 2022 20:36:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version; bh=cw7GQ0tPmVNUhg0oMO0H/QcZkXpS1FCUycr+8Eo0o5M=; b=Grex2IeCXNcO+aZpn/39PBTWXGTbOqcWGxeljfdaSjZrQOeCcPZqnqmtL8yMmEQRyl 48anMWjEC9XKIQDFf5uj/U2sRJCCGoYR7c9bALaERPE+QNNB7XmOCwUgQlcUz76gM07c 2pt3WpUbiPTxp7ysQR45E+UnYfwYFZQhXUQn6Bzt3gjz+0eiL/gFkhs81Y1MXdampA1L +0ewpngXla1enrIJHxYItrspKnfI9VKEGd0ANz0ukBS8eye5+oKslP//sYQxf2nkvrZg Goy3VkD2XEtt51+gEokCR+8qIX0Dw4Kiiko6suquz8V2psEI5F7zeubpmkihQVQYQc6p GPRw== 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:references:date:in-reply-to :message-id:user-agent:mime-version; bh=cw7GQ0tPmVNUhg0oMO0H/QcZkXpS1FCUycr+8Eo0o5M=; b=XtSiKLaToDMX06mvJ6uvtmBgOifqwsSiV75FjfMAyeSWYuMLQqgII3Tut2MzY6WEDu IX28u47/PwbGSsIURCyBbIiVa6oJCes+MH36uGnDtmyu+j+nZXJY6BSzmd/oxzZHIP4o /WaZmFfIZ4Em2cz9zCrRivGc+p/TagvbtwmmZc+az8/6P1jVrKX5KE3aRdKary0RndlO nUVh393KX49SsS90STidT3wsbaDd1Z/uoz30JoMOMuXhLX3c8OTkhwI30rsEl2IZSC33 es+ShwBpzhmUmmcP5fyl4m5Y4Q555zQqwTV4h0/VBQopc76eys1018HqOARBsVq7IdrK Hsgg== X-Gm-Message-State: AJIora/6IOOQU0kr0CssfTvp91ftaeaugLIIZ3J7QkVV53MFJzRFlo9o ch6Ft/xl20H7fUxVSFsiG93RAfi+zees2w== X-Google-Smtp-Source: AGRyM1uzQw4KBQbbDbXlJrvoKItvVJspitmECAmCWmU4hSlXp20MZnDId/iJuglRjYWffasXGbPxBQ== X-Received: by 2002:a05:6512:3f07:b0:481:31e4:1c54 with SMTP id y7-20020a0565123f0700b0048131e41c54mr16472478lfa.607.1656905786214; Sun, 03 Jul 2022 20:36:26 -0700 (PDT) Received: from elephant ([5.164.222.47]) by smtp.gmail.com with ESMTPSA id a6-20020a2eb546000000b0025a9dccbae5sm4782824ljn.112.2022.07.03.20.36.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 20:36:25 -0700 (PDT) From: "Artyom V. Poptsov" References: <87o7y74zic.fsf@gmail.com> Date: Mon, 04 Jul 2022 06:36:21 +0300 In-Reply-To: <87o7y74zic.fsf@gmail.com> (Artyom V. Poptsov's message of "Sat, 02 Jul 2022 12:47:39 +0300") Message-ID: <87fsjhft1m.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::131; envelope-from=poptsov.artyom@gmail.com; helo=mail-lf1-x131.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, I found out that the patch I've sent was broken in two ways: firstly, it contains only part of my changes; secondly, Candle fails to store its settings as it tries to store it in the same directory where the binary stored. Here's the updated patch. Thanks - Artyom From e4530e457e465243dae5b58eb8b7fa2e3951757d Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Thu, 23 Jun 2022 23:02:40 +0300 Subject: [PATCH] gnu: engineering: Add candle. * gnu/packages/engineering.scm (candle): New variable. --- gnu/packages/engineering.scm | 62 ++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index fe8ab13298..b4f0b5e020 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3688,3 +3688,65 @@ (define-public xschem netlists from the drawn schematic, allowing the simulation of the circuit.") (home-page "https://xschem.sourceforge.io/stefan/index.html") (license license:gpl2+)))) + +(define-public candle + (package + (name "candle") + (version "1.2b") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Denvi/Candle") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rinblzqg8xbi4zcyx6v3k7g2kdrgmwm7xwb6fryb8s0bd21jppv")))) + (build-system gnu-build-system) + (native-inputs (list qttools)) + (inputs (list qtbase-5 qtserialport)) + (arguments + `(#:tests? #f ; no tests. + #: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")))) + (add-after 'fix-sources 'fix-application-settings-path + (lambda _ + (substitute* "src/frmmain.cpp" + (("qApp->applicationDirPath\\(\\) \\+ \"\\/settings\\.ini\"") + "QDir::homePath() + \"/.config/candle.ini\"")))) + (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 + "GRBL controller application with G-Code visualizer written in Qt. + +Supported functions: + +@itemize +@item Controlling GRBL-based cnc-machine via console commands, buttons on +form, numpad. +@item Monitoring CNC-machine state. +@item Loading, editing, saving and sending of G-code files to CNC-machine. +@item Visualizing G-code files. +@end itemize") + (license license:gpl3))) + -- 2.34.1