From patchwork Tue Jul 12 21:59:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 40636 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 AE92B27BBEA; Tue, 12 Jul 2022 23:35:20 +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_INVALID, DKIM_SIGNED,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 5AD4827BBE9 for ; Tue, 12 Jul 2022 23:35:20 +0100 (BST) Received: from localhost ([::1]:39100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oBOTP-0000bh-Fd for patchwork@mira.cbaines.net; Tue, 12 Jul 2022 18:35:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBNvH-0003Ma-RO for guix-patches@gnu.org; Tue, 12 Jul 2022 18:00:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49920) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oBNvH-0005Lb-Io for guix-patches@gnu.org; Tue, 12 Jul 2022 18:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oBNvH-0008PO-GS for guix-patches@gnu.org; Tue, 12 Jul 2022 18:00:03 -0400 Subject: bug#56354: [PATCH] gnu: engineering: Add candle. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Tue, 12 Jul 2022 22:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 56354 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "Artyom V. Poptsov" Cc: Jean Pierre De Jesus DIAZ , "56354@debbugs.gnu.org" <56354-done@debbugs.gnu.org> Mail-Followup-To: 56354@debbugs.gnu.org, ludo@gnu.org, poptsov.artyom@gmail.com Received: via spool by 56354-done@debbugs.gnu.org id=D56354.165766320132277 (code D ref 56354); Tue, 12 Jul 2022 22:00:03 +0000 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: Ludovic =?utf-8?q?Court=C3=A8s?= 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 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 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’s “version 3 only”. I tweaked the description as per . Thank you, and thanks Jean-Pierre for reviewing! Ludo’. 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+))))