From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 02 05:48:12 2022 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" To: guix-patches@gnu.org Subject: [PATCH] gnu: engineering: Add candle. 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 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hello, this patch adds Candle[1] CNC controller. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-gnu-engineering-Add-candle.patch Content-Transfer-Encoding: quoted-printable From=20a3c57bbd8cb9f87a92e063d02e69aa2f29f6a895 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. =2D-- 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 =2D-- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3702,19 +3702,32 @@ (define-public candle (sha256 (base32 "1rinblzqg8xbi4zcyx6v3k7g2kdrgmwm7xwb6fryb8s0bd21jppv")))) =2D (build-system qt-build-system) =2D ;; (native-inputs =2D ;; ()) =2D ;; (inputs) + (build-system gnu-build-system) + (native-inputs (list qttools)) + (inputs (list qtbase-5 qtserialport)) (arguments =2D (list #:phases =2D #~(modify-phases %standard-phases =2D (replace 'configure =2D (lambda* (#:key outputs #:allow-other-keys) =2D (chdir "src") =2D (invoke "qmake" =2D (string-append "PREFIX=3D" (assoc-ref outputs= "out"))) =2D #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.*=3D.*DEBUG .*OPT:REF -Wl,-O1") + "LFLAGS =3D -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 =2D-=20 2.34.1 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Thanks, =2D Artyom References: 1. https://github.com/Denvi/Candle =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFNBAEBCgA3FiEE0MLqwTMQgi2Y3rV86cWi2QiYoC8FAmLAFE8ZHHBvcHRzb3Yu YXJ0eW9tQGdtYWlsLmNvbQAKCRDpxaLZCJigL8FVB/4wpzOIFKvAheaplj8yu5rl gIbIKBNzX8lbmB4ipIf6tctQiwAhnSeQNip5FvVwz1vLC0pMKEQAHTHABfy1Ljjj q2/KaIYOnogOqdkw1eyirPrylgNWcvbvXpdmB5I1UmsuCvQ3ut27Se115/q/Ljhw 3OCdApbr4X5cGL/2xU3rDLo8F1jQDWgf9WmuDjsairllniN4Ap4SM1ozw/72KZ0A 5qdYVgSWpWCQXe2hHN/nKBQfd1oVtzILJBsLGVqabL40M4vRP75ywrqL6Ar015rP pSI4egqbTjY8VFAviQNmGbRJfEhjDov2YsuCt44tHC3CupqggwzmbJx1ay2Vrgb3 =bSLV -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 03 23:36:46 2022 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" To: guix-patches@gnu.org Subject: Re: [PATCH] gnu: engineering: Add candle. 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 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain 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. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-gnu-engineering-Add-candle.patch Content-Transfer-Encoding: quoted-printable From=20e4530e457e465243dae5b58eb8b7fa2e3951757d 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. =2D-- 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 =2D-- 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\\(\\) \\+ \"\\/setting= s\\.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.*=3D.*DEBUG .*OPT:REF -Wl,-O1") + "LFLAGS =3D -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))) + =2D-=20 2.34.1 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Thanks =2D Artyom =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFNBAEBCgA3FiEE0MLqwTMQgi2Y3rV86cWi2QiYoC8FAmLCYDUZHHBvcHRzb3Yu YXJ0eW9tQGdtYWlsLmNvbQAKCRDpxaLZCJigL7qQB/9SRi++E7y5U+oRCqrMhnW3 WaQtBTexo2DGMoXmJ63oFFJjFxiFAel06P/bKW0JF1zN4E3aV6+iaVaZBwP9W03A WNaCNPfi47e8js8ZgfMB/P+9UZlmSZ+fXJfQn4PCl8Hm3Y4HURGARwIrEYWS2bEG S+s6bffuLSoC5JCgMzDK3YnCt++12hCyeoihC5XYy8IOgZnqkFKxcBVojrSxd3K+ 2fM2y3MBx7aEF9wwYzIE15ZyxD7sxup+eukMo4qpFzmphRQkiOXXploeEGf43HW6 cCDiWndWvnJvuDnH68cVSs1ClaF0Q6RksqvTXwDRLQXxAhq1f2ySu3LraJ1Dp4GY =DNQD -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 05 08:16:20 2022 Received: (at 56354) by debbugs.gnu.org; 5 Jul 2022 12:16:20 +0000 Received: from localhost ([127.0.0.1]:49585 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o8hTY-0000u0-1V for submit@debbugs.gnu.org; Tue, 05 Jul 2022 08:16:20 -0400 Received: from mail-4323.proton.ch ([185.70.43.23]:54465) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o8hTR-0000th-WB for 56354@debbugs.gnu.org; Tue, 05 Jul 2022 08:16:18 -0400 Date: Tue, 05 Jul 2022 12:16:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jeandudey.tech; s=protonmail3; t=1657023366; x=1657282566; bh=8QxRzMi7TiGLYftmnlkkUGoC0d+X3ttlIU666OcmBwc=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=nDlcDxxZqDLVL5HKNB6H1w7iSagH5uW6le+wPB+r6B2Tje2POl5o8oQRohvHKSTYW x95X7WaXyZkfktnb1J0n15sKlB1Lw3UanF4063DqxmkMxCsTaOGMk/O+H6uaMQZq5N G48JLdSDuwdbOtw7OwW9gR4TiME4ouZ/JpMbpijF0ckZh/geVhDOm4GUVy88ZIGu2u +NjKfRbMFbw1/F1c21vPrjbA1qFPjkBNMipb34fwp1JXjDMIRRYbueue3H6E0A1LgT 0kLcfygp8jD+qQuT418/r8R4i+h6mk1HlffIUTu3NOOcyC9bmqrwjJxPzxYJzizi3X NM7zZ7+TJCyBg== To: "56354@debbugs.gnu.org" <56354@debbugs.gnu.org> From: Jean Pierre De Jesus DIAZ Subject: Review Message-ID: Feedback-ID: 20187791:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 56354 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Jean Pierre De Jesus DIAZ Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) >+ (arguments >+ `(#:tests? #f ; no tests. >+ #:phases (modify-phases %standard-phases Can be changed to use G-Expressions: (arguments (list #:tests? #f ;; no tests. #:phases #~(modify-phases %standard-phases ...))) See, https://guix.gnu.org/manual/en/html_node/G_002dExpressions.html >+ (add-after 'fix-sources 'fix-application-settings-path Doesn't depend on 'fix-sources, so it's fine to add after 'unpack. >+ (replace 'configure >+ (lambda* (#:key outputs #:allow-other-keys) >+ (let ((out (assoc-ref outputs "out"))) >+ (chdir "src") >+ (invoke "qmake")))) It may also be a good idea to set `QMAKE_CC' variable for cross-compilation= , like: `(invoke "qmake" (string-append "QMAKE_CC=3D" #$(cc-for-target)))' And also test cross-compilation: ./pre-inst-env guix build candle \ --keep-failed \ --target=3Daarch64-linux-gnu >+ (add-after 'configure 'fix-makefile >+ (lambda _ >+ (substitute* "Makefile" >+ (("-pipe -Z7") "-pipe") >+ (("LFLAGS.*=3D.*DEBUG .*OPT:REF -Wl,-O1") >+ "LFLAGS =3D -Wl,-O1")))) Could this instead be replaced on the `candle.pro' file? =E2=80=94 Jean-Pierre De Jesus DIAZ From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 09 09:44:17 2022 Received: (at submit) by debbugs.gnu.org; 9 Jul 2022 13:44:17 +0000 Received: from localhost ([127.0.0.1]:34035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oAAkm-0008AN-2p for submit@debbugs.gnu.org; Sat, 09 Jul 2022 09:44:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:43422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oAAkf-0008AA-PN for submit@debbugs.gnu.org; Sat, 09 Jul 2022 09:44:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oAAkf-00024k-Fa for guix-patches@gnu.org; Sat, 09 Jul 2022 09:44:05 -0400 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]:44746) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oAAkd-00037r-DF for guix-patches@gnu.org; Sat, 09 Jul 2022 09:44:05 -0400 Received: by mail-lf1-x135.google.com with SMTP id a9so1934657lfk.11 for ; Sat, 09 Jul 2022 06:44:02 -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=W/JqpypBUbcK/W8WPBicQzCXxLL/jvo6crLrNVdCjkc=; b=VtyRaUGsge3/qBH85bajZdH3ar/SYv/eWc453pkRyPj2Nm38ramHCLpRTo011Oki7J jWc4UWtOwY7z76Mxh3NvoPW5tHNe26O15og8kNMiGe3T9ckRlBwMuexoHmXi4Gsh4mON ABwUtD5QFAhWeXbDYy7XVNyM+q1E8ulDwxia3W0PfkPDlsPkgJlIcyVP3o9RfY1QRMWF hWD5WwNpkxU8KzYPJ3rNKdWXBgqE7LoAhzgjDArGkClAaWswgHS+ySrfDj6JlHTjpF9J odsQkrYKhrz2IEw6UyndkF4eyMmMTiFxGVKm7vGrs+MxJSfoCNzYkHA7InLZ4w9wvrIz d0zQ== 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=W/JqpypBUbcK/W8WPBicQzCXxLL/jvo6crLrNVdCjkc=; b=A7xnRJogihRJBISFyeUVdUUVNQXNk0XzUSpdB1zrhC+IJZpZZCHusyu3Z5+ZdSt+bk PYOY5eHcFxbkc+uU6i3QFJpDDnSOqvbNSxzVGz5Tl6JrrVk2PLGu2+yiP1ghtjo8T785 6jSGGeC95YPBzxUXuARNp3szuQqzun+tWcAk/9J4FWkE4zCjMt42dnqcCYUxNlXSINqp 4mr1Unj4p4yP+Ezz+baeAQuJODZGGuKoWSAN7jF+a8lHy5aPurJMyiyHO/qQgSHKeujw ZEL6gaGz0LQUZ3QSMa+2q/FMznkx4kiYIx5L7RRZ/58x7vIxFpqhfmSHj4U5HjT/3NLy pskQ== X-Gm-Message-State: AJIora+mkzombjTXoISFBBAH0b+FL6YH4ur/gAIeoRIchQKHm0VJieBl 7va5mnc3kzUTmiGM1OCZfP4b5bCObR1LhQ== X-Google-Smtp-Source: AGRyM1t1is62jCoPdDBzbH1GSOPLZCMQn/4rmuS+0vI3isZsT6YC2R6EQ41yo8PutZOL5fo/j3awiw== X-Received: by 2002:a05:6512:3b20:b0:47f:8ca1:bd7 with SMTP id f32-20020a0565123b2000b0047f8ca10bd7mr5370314lfv.105.1657374240761; Sat, 09 Jul 2022 06:44:00 -0700 (PDT) Received: from elephant ([5.164.222.47]) by smtp.gmail.com with ESMTPSA id q6-20020a056512210600b00477c0365b20sm394056lfr.188.2022.07.09.06.43.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Jul 2022 06:44:00 -0700 (PDT) From: "Artyom V. Poptsov" To: guix-patches@gnu.org Subject: Re: [PATCH] gnu: engineering: Add candle. References: <87o7y74zic.fsf@gmail.com> <87fsjhft1m.fsf@gmail.com> Date: Sat, 09 Jul 2022 16:43:56 +0300 In-Reply-To: <87fsjhft1m.fsf@gmail.com> (Artyom V. Poptsov's message of "Mon, 04 Jul 2022 06:36:21 +0300") Message-ID: <877d4mqu3n.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a00:1450:4864:20::135; envelope-from=poptsov.artyom@gmail.com; helo=mail-lf1-x135.google.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 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, URIBL_CSS_A=0.1 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hello Jean Pierre De Jesus DIAZ, I almost overlooked your message from debbugs as it wasn't delivered to my mailbox. Thanks for the patch review! > Can be changed to use G-Expressions: Done. > >+ (add-after 'fix-sources 'fix-application-settings-path > Doesn't depend on 'fix-sources, so it's fine to add after 'unpack. Done. > It may also be a good idea to set `QMAKE_CC' variable for cross-compilation, > like: > > `(invoke "qmake" (string-append "QMAKE_CC=" #$(cc-for-target)))' Done. But I wasn't able to run cross-compilation with the command you provided: --8<---------------cut here---------------start------------->8--- $ ./pre-inst-env guix build --keep-failed --target=aarch64-linux-gnu candle guix build: error: gnu/packages/freedesktop.scm:1921:2: perl-file-mimeinfo@0.29: build system `perl' does not support cross builds --8<---------------cut here---------------end--------------->8--- It seems to me from the message that the issue is not in the candle package itself. > >+ (add-after 'configure 'fix-makefile > >+ (lambda _ > >+ (substitute* "Makefile" > >+ (("-pipe -Z7") "-pipe") > >+ (("LFLAGS.*=.*DEBUG .*OPT:REF -Wl,-O1") > >+ "LFLAGS = -Wl,-O1")))) > > Could this instead be replaced on the `candle.pro' file? I fixed it by using the latest commit from the 'master' branch instead of 1.2b tag. Please find the updated patch attached. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-gnu-engineering-Add-candle.patch Content-Transfer-Encoding: quoted-printable From=203830792f316287de22fa62b2adff6aeb2b94a160 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. =2D-- gnu/packages/engineering.scm | 63 ++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index fe8ab13298..a3445343fc 100644 =2D-- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3688,3 +3688,66 @@ (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 + ;; The latest tagged version 1.2b fails on the build stage due to + ;; non-supported g++ flags so we need to use the latest commit from the + ;; 'master' branch in the repository. + (let ((commit "3f763bcde1195e23ba119a5b3c70d7c889881019") + (revision "1")) + (package + (name "candle") + (version (git-version "1.2b" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Denvi/Candle") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08rqhl6a5a8s67a8yl16944zgcsnnb08xfv4klzyqwlvaqgfp783"))= )) + (build-system gnu-build-system) + (native-inputs (list qttools)) + (inputs (list qtbase-5 qtserialport)) + (arguments + (list #: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 overri= de")))) + (add-after 'unpack '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" + (string-append "QMAKE_CC=3D" + #$(cc-for-target)))= ))) + (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)))) + =2D-=20 2.34.1 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Thanks, =2D Artyom =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFNBAEBCgA3FiEE0MLqwTMQgi2Y3rV86cWi2QiYoC8FAmLJhhwZHHBvcHRzb3Yu YXJ0eW9tQGdtYWlsLmNvbQAKCRDpxaLZCJigL63UB/9678kZsV95pulYrSF9tAXK gS9Cn0TxEXhsA0gT4ykvwbwhXRY+iq8b4wY5l5MS7POfmsW3J2e6dUIxlGf7SAfq os0GxnbUs+935OUeT7aw69GIcUSIj6uQIBMZ9sX1fBxt3UMN9pspU9R+kTyXsWld w9RDyFoKyXqCN3BDXbM6hblrD+/yg9Zx/LZcAC6Tz+0Uvjxayq19JEZ87wsVULLD fFofAP4gvQH4C7aDQ3GiaVZamNQ2IMmVWgiUczW5WhYn1VLF46bOrbU1223VfXAI /KAPfxGc52qpoHGcQwkkeqthrs1r+dPRcx4p88ulT9gcU/GNzJlp6XNUPHfPD8cs =dfNJ -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 11 07:56:09 2022 Received: (at 56354) by debbugs.gnu.org; 11 Jul 2022 11:56:09 +0000 Received: from localhost ([127.0.0.1]:38672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oAs1I-00010O-Th for submit@debbugs.gnu.org; Mon, 11 Jul 2022 07:56:09 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:26688) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oAs1F-0000zo-Ii for 56354@debbugs.gnu.org; Mon, 11 Jul 2022 07:56:07 -0400 Date: Mon, 11 Jul 2022 11:55:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jeandudey.tech; s=protonmail3; t=1657540558; x=1657799758; bh=LWtBARzfSytymUpWjqvVGSCzWeqtQt7RqMePdrnfm4Q=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=HyRnHWHahvLBffyko/v36LwCQYGzwcU10ONmSub5S/qRTe/FeyfXleMwBc5smEf18 4MIg/VSBX71qt8X6RPmBKopx14bXUYkTBrgn2JIXCwf6ToquXipkCxcEkfnQB1Nsi4 VDgti3QGGV79OA5OQXXv1FwCYFhRnBThY1e1/omItOCWA0T+7X0dxek/z7cjdcpnYR /AKr2BR32EvO+LPKhvYzR5BC1ZewHtqyqmcF0pLnYE+Wbgkb1ve8/hI+A2NVSw5W/4 puktGoBx2qGKgUyikCs+sP7UgPVIyOsXkiWahQy8vT4CqdQIeCanQ0Zpj5LYcYFFHV 6r5LL2K2aetUA== To: "56354@debbugs.gnu.org" <56354@debbugs.gnu.org>, "poptsov.artyom@gmail.com" From: Jean Pierre De Jesus DIAZ Subject: [PATCH] gnu: engineering: Add candle. Message-ID: Feedback-ID: 20187791:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 56354 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Jean Pierre De Jesus DIAZ Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Artyom, >It seems to me from the message that the issue is not in the candle >package itself. Probably one of the dependencies can't (currently) be cross-compiled, anyway, thanks for setting the QMAKE_CC variable in the qmake invocation, once perl build system gains cross-compilation (if possible) then it would be easier to cross-compile later without modifications to the package. >+ (lambda* (#:key outputs #:allow-other-keys) >+ (let ((out (assoc-ref outputs "out"))) >+ (chdir "src") >+ (invoke "qmake" >+ (string-append "QMAKE_CC=3D" >+ #$(cc-for-target))= )))) The `out' variable is not used, so the let can be safely removed and the la= mbda simplified, also instead of `chdir', `with-directory-excursion' could be us= ed, but's a matter of preference (don't know if one or other style is preferred inside GNU Guix). For example: (lambda _ (with-directory-excursion "src" (invoke "qmake" (string-append "QMAKE_CC=3D" #$(cc-for-target))))) >+ (replace 'install >+ (lambda* (#:key outputs #:allow-other-keys) >+ (let ((out (assoc-ref outputs "out"))) >+ (install-file "Candle" >+ (string-append out "/bin"))= )))))) The `out' binding can be also replaced by `#$output', e.g.: (lambda* _ (install-file "Candle" (string-append #$output "/bin"))) Other than that the package definition looks good to me, and did a quick pa= ss over the Candle source code to check that it doesn't contain any malware. Only a bundled font is present (src/fonts/Ubuntu-Regular.tff), but that one= is not provided by GNU Guix (don't know the specific reasons, but got added th= en removed) so no need to replace it with provided ones. =E2=80=94 Jean-Pierre De Jesus DIAZ From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 11 14:39:24 2022 Received: (at 56354) by debbugs.gnu.org; 11 Jul 2022 18:39:24 +0000 Received: from localhost ([127.0.0.1]:40992 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oAyJY-0005Az-8H for submit@debbugs.gnu.org; Mon, 11 Jul 2022 14:39:24 -0400 Received: from mail-lj1-f177.google.com ([209.85.208.177]:44938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oAyJT-0005Ah-O2 for 56354@debbugs.gnu.org; Mon, 11 Jul 2022 14:39:23 -0400 Received: by mail-lj1-f177.google.com with SMTP id a39so7240523ljq.11 for <56354@debbugs.gnu.org>; Mon, 11 Jul 2022 11:39:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=oArJq+7fm40tNjYFwxUfnM04xeo8JNSYcJa4etoLD7o=; b=pm/4Cbhc6II7KRGr7XmSUM3ERPSYK38qB8XC62xZXwAHoYnL3UuAen6JiITNwfRahb uAs0HV5hxUcnYEM8Uqkdf6lPh0yS9O1PaIZKI+7MlPAh5a/iJJeBtRod/JLQFTz9JY9E pCzsA+e/12U4ag/nowaYQH8nerwgAfYqWh7dRpHgqXela8klCkPl1d/KJcyfKDLNJJOb FXym1Dg0dEwIYq1AeA9oL4hqcySeunUKnvSZdGm145AWwxIGkxOrmu0LU0YCCjnJvAkj lAi8jhpoCbOembJvGjC+WN9IQ4c2kGBoCwkRw4z0+26QJBbVrCle1BHIsCu8ySyrzyFm Ty/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=oArJq+7fm40tNjYFwxUfnM04xeo8JNSYcJa4etoLD7o=; b=6PDik59WHRkrAKxrgwrfmfIjt/lkYk8yns55WHI/6/d4A+XjXSiHa9l8FlFzvNfK0+ VbxUHH3z8CE4a5/Apq8SsqcLPRpG3jh27/w3l/IzsDgOrl7wD30IdtUBJZPzKb/XADox bm8LaG4yL1bQF3s/KM8sE6DQr36x1d4yX+RT3/EVI5q+b1z3uie6hracyu7CJyu0OxXW V8fP9ztyZoWL/xx3VxfAZtFHx3UpEPrrG7P6NFBxqBJHedzZNpycnOGIAcVXxrxQ03wS JTLSbXEdxD6d9MtLVXp1dFxQuX+A8e5Q93pZGd0so1Eka0uHAUkvub7dGUrsnK1qo1XE ItDQ== X-Gm-Message-State: AJIora+geZuamIdZJIk8u6TUKTDiWcJjVpkXvJ8bREssrsHJC8IY6OlT zH9lvoxUwDs1oocIAYlGMSWuyTi1NCD94Q== X-Google-Smtp-Source: AGRyM1sNnaKEtOa2xyGK48oJmt7gxIRJtddChz7a9IkEzh7yJF6OKFDOmN55i7LP6SYbZqW1evXDSA== X-Received: by 2002:a2e:a588:0:b0:25b:cb8a:9137 with SMTP id m8-20020a2ea588000000b0025bcb8a9137mr11281217ljp.237.1657564753261; Mon, 11 Jul 2022 11:39:13 -0700 (PDT) Received: from elephant ([5.164.222.47]) by smtp.gmail.com with ESMTPSA id c19-20020ac25f73000000b004862d59d35fsm1667114lfc.154.2022.07.11.11.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jul 2022 11:39:12 -0700 (PDT) From: "Artyom V. Poptsov" To: Jean Pierre De Jesus DIAZ Subject: Re: [PATCH] gnu: engineering: Add candle. References: Date: Mon, 11 Jul 2022 21:39:03 +0300 In-Reply-To: (Jean Pierre De Jesus DIAZ's message of "Mon, 11 Jul 2022 11:55:52 +0000") Message-ID: <87a69fsddk.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 56354 Cc: "56354@debbugs.gnu.org" <56354@debbugs.gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hello Jean Pierre De Jesus DIAZ. > The `out' variable is not used, so the let can be safely removed and the lambda > simplified, also instead of `chdir', `with-directory-excursion' could be used, > but's a matter of preference (don't know if one or other style is preferred > inside GNU Guix). Done. > The `out' binding can be also replaced by `#$output', e.g.: Done. I also tried to use 'with-directory-excursion' instead of 'chdir' but Candle build fails with it, so I kept 'chdir' version. > Other than that the package definition looks good to me, and did a quick pass > over the Candle source code to check that it doesn't contain any malware. > Only a bundled font is present (src/fonts/Ubuntu-Regular.tff), but that one is > not provided by GNU Guix (don't know the specific reasons, but got added then > removed) so no need to replace it with provided ones. Thanks again for the patch review! Here's my updated patch. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-gnu-engineering-Add-candle.patch Content-Transfer-Encoding: quoted-printable From=207aac50730febeb95d0f7a4ab1cbb6e7dfb632553 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. =2D-- gnu/packages/engineering.scm | 61 ++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index fe8ab13298..e1297c0f85 100644 =2D-- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3688,3 +3688,64 @@ (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 + ;; The latest tagged version 1.2b fails on the build stage due to + ;; non-supported g++ flags so we need to use the latest commit from the + ;; 'master' branch in the repository. + (let ((commit "3f763bcde1195e23ba119a5b3c70d7c889881019") + (revision "1")) + (package + (name "candle") + (version (git-version "1.2b" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Denvi/Candle") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08rqhl6a5a8s67a8yl16944zgcsnnb08xfv4klzyqwlvaqgfp783"))= )) + (build-system gnu-build-system) + (native-inputs (list qttools)) + (inputs (list qtbase-5 qtserialport)) + (arguments + (list #: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 overri= de")))) + (add-after 'unpack 'fix-application-settings-path + (lambda _ + (substitute* "src/frmmain.cpp" + (("qApp->applicationDirPath\\(\\) \\+ \"\\= /settings\\.ini\"") + "QDir::homePath() + \"/.config/candle.ini= \"")))) + (replace 'configure + (lambda _ + (chdir "src") + (invoke "qmake" + (string-append "QMAKE_CC=3D" + #$(cc-for-target))))) + (replace 'install + (lambda _ + (install-file "Candle" + (string-append #$output "/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)))) + =2D-=20 2.34.1 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable =2D Artyom =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFNBAEBCgA3FiEE0MLqwTMQgi2Y3rV86cWi2QiYoC8FAmLMbkcZHHBvcHRzb3Yu YXJ0eW9tQGdtYWlsLmNvbQAKCRDpxaLZCJigL8IfB/9pbuo2MMbtGezEpfIkQo5Y HN4JWV9XUh7wEfrOz4pcirOPgf6ebp6B6RyRp1v9IKyCQktbjbPhDUTixcAwY32j XE1vbWnDgA3DUEd/4/PsPPEFlieVtHoFNhY24cRseGmU2/herhK3dwmoJushtH09 WxQ8/OCfypVj3nET+SH+tBCjVYACVp25/QUIRtrWx07euN7mZznhdX+UV69LtU4W RRqstRvNomFj4pZB00cnmtLHp8b94++6fVRHY/dNak2NlljGStwJdkTCSd6BIanq B1R+ytx600bNz7jpJtng0hOWSgntxrF52um3qxp7FSRMHqkv5Mfy5hmNb/QIOJnx =mxYc -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 12 18:00:01 2022 Received: (at 56354-done) by debbugs.gnu.org; 12 Jul 2022 22:00:01 +0000 Received: from localhost ([127.0.0.1]:43816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBNvE-0008OX-SJ for submit@debbugs.gnu.org; Tue, 12 Jul 2022 18:00:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBNvC-0008OH-VG for 56354-done@debbugs.gnu.org; Tue, 12 Jul 2022 17:59:59 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41008) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBNv6-0005Aj-Tc; Tue, 12 Jul 2022 17:59:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=EUZYXRwWfle68AthMjx7CD5A9dEqHbJqYlS3CnJvZOI=; b=Oa1aYULyohbvzuiSl4PY AETkRr6HGPwyg87C5eHBqHrYVzAddQ1kYtu38svC1z8qHPLBLQk9N3LVBx4tWeFfzjsjybDJulQk+ 6/O5KpmFNw+W1iDxDh2sflNHy6sn8p2fTkMUzrHGjWQLJ9c0mGAoV9z2j3vwtlqtm3Y55lyfCw1YR Hi8Rz3T4AiYqwqcfSGq46iC1LCeGDdNCUuvsMoQZvDg9ofV4//lLh3Z8caNqEDHthMcHa1G1oZlaJ wJvlDSC5jlSYMc8Brn9THj40iTgZfYmHjFi2Isq9dSmVzZn1FEvgcoLW7095Bq+W5zDuEsOJPuOG6 hshTk35sE/bijg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:56795 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBNv6-0007JR-H1; Tue, 12 Jul 2022 17:59:52 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: "Artyom V. Poptsov" Subject: Re: bug#56354: [PATCH] gnu: engineering: Add candle. References: <87a69fsddk.fsf@gmail.com> Date: Tue, 12 Jul 2022 23:59:50 +0200 In-Reply-To: <87a69fsddk.fsf@gmail.com> (Artyom V. Poptsov's message of "Mon, 11 Jul 2022 21:39:03 +0300") Message-ID: <87zgheat61.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 56354-done Cc: Jean Pierre De Jesus DIAZ , "56354@debbugs.gnu.org" <56354-done@debbugs.gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, "Artyom V. Poptsov" skribis: > From 7aac50730febeb95d0f7a4ab1cbb6e7dfb632553 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. Applied with the changes below. Note that the license is GPLv3+ because nothing says it=E2=80=99s =E2=80=9Cversion 3 only=E2=80=9D. I tweaked the = description as per . Thank you, and thanks Jean-Pierre for reviewing! Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index e1297c0f85..dd594af7f8 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3721,7 +3721,8 @@ (define-public candle (add-after 'unpack 'fix-application-settings-path (lambda _ (substitute* "src/frmmain.cpp" - (("qApp->applicationDirPath\\(\\) \\+ \"\\/settings\\.ini\"") + (("\ +qApp->applicationDirPath\\(\\) \\+ \"\\/settings\\.ini\"") "QDir::homePath() + \"/.config/candle.ini\"")))) (replace 'configure (lambda _ @@ -3736,9 +3737,10 @@ (define-public candle (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. + "Candle is a GRBL controller application with a visualizer for G-Code, +the @acronym{CNC, computer numerical control} programming language. -Supported functions: +Supported functions include: @itemize @item Controlling GRBL-based cnc-machine via console commands, buttons on @@ -3747,5 +3749,4 @@ (define-public candle @item Loading, editing, saving and sending of G-code files to CNC-machine. @item Visualizing G-code files. @end itemize") - (license license:gpl3)))) - + (license license:gpl3+)))) --=-=-=-- From unknown Mon Aug 18 04:46:50 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 10 Aug 2022 11:24:11 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator