From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id Ps+oDpcUwGL/WgAAbAwnHQ (envelope-from ) for ; Sat, 02 Jul 2022 11:49:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id +FSlDZcUwGIV2QAA9RJhRA (envelope-from ) for ; Sat, 02 Jul 2022 11:49:11 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C2456DCC8 for ; Sat, 2 Jul 2022 11:49:10 +0200 (CEST) Received: from localhost ([::1]:60794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o7ZkT-0002Aa-VJ for larch@yhetil.org; Sat, 02 Jul 2022 05:49:09 -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 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-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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1656755351; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=A04X0QZaWq3dw1289ZjMzw+4kp9RS2Km8ZgHgecDzE8=; b=GOHRuUdLaiNlEQxBYim1uf94ND275iB+9LxkxYyUuOCaH3uuB4GSpPlV86GP781mHwqydn pT7QhIBwOZFbKx4hmpEzkcXpi/LgwDrCEeEeXKt8UshAhdiyNAMzt7coKTBGHJd5rlfrnU trELuXQ0uaA8PXhbVMSqBslb4MNL+s6sqk3ZhzywJFmN4eWB5/stDT8INuBzDA3Kt3AQIx R0QHdJ3TKu9drs+PPGQPpLV1tJKtxxE22slp7Cqwi/VHZFa1Kts7TKoEDrqXbsCtyVsVdn SlrNZF/sX2kcr2yJPrz/ev3XGxqrJm2SrtbZuo7PvMQkfVQfRVHX3L7BBrjK+A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1656755351; a=rsa-sha256; cv=none; b=L/vEuekriHpwB2UkVEPNbqkjQOrf0Kpxe9AsZpL5z1gm7fxQqZ/aNTSZgNoJsf9VcFIm4t 3+53oIBxvLPOG3V03Ph3YpeUC2cjjBjmZIZ3rQ2xalIbMgu6+zROuuMnvMCUOg2XBz8bPC SAe3MYwDMnfFgGYx4XfPOymcAZ3ExTh7UIv+NmQaYT+R/ppctW+y3OoNHj9UvC7c51EieY 4y96ZOQ25IZfS9SGG/3DC8qxVM4JPHlaGEvrPbAsTOXaprTXBc0oJGT/cMZ5tDOzEUejzk NmET9AjXK2eDxrU/+G1TFWJgN4vKwrPIlfK+3KQdfny9gPwDW2LfKO4fVFxmAw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Qk3Ifm4x; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 3.75 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Qk3Ifm4x; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: C2456DCC8 X-Spam-Score: 3.75 X-Migadu-Scanner: scn1.migadu.com X-TUID: uTymB22y20F/ --==-=-= 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----- --==-=-=--