From patchwork Tue Apr 18 20:19:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 49296 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 7C10E17A38; Tue, 18 Apr 2023 21:21:19 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_PDS_PRO_TLD,URIBL_BLOCKED autolearn=ham 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 8F70817A31 for ; Tue, 18 Apr 2023 21:21:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1porp3-0002oI-Fj; Tue, 18 Apr 2023 16:21:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1porp1-0002nt-SE for guix-patches@gnu.org; Tue, 18 Apr 2023 16:21:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1porp1-0007wV-K7 for guix-patches@gnu.org; Tue, 18 Apr 2023 16:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1porp1-0006XP-8v for guix-patches@gnu.org; Tue, 18 Apr 2023 16:21:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62941] [PATCH 2/3] gnu: fritzing: Improve package style. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Apr 2023 20:21:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62941 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62941@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 62941-submit@debbugs.gnu.org id=B62941.168184922025033 (code B ref 62941); Tue, 18 Apr 2023 20:21:03 +0000 Received: (at 62941) by debbugs.gnu.org; 18 Apr 2023 20:20:20 +0000 Received: from localhost ([127.0.0.1]:60497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poroK-0006Vh-5O for submit@debbugs.gnu.org; Tue, 18 Apr 2023 16:20:20 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:61931) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poro9-0006Up-Nr for 62941@debbugs.gnu.org; Tue, 18 Apr 2023 16:20:18 -0400 Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-3f0a0c4e1ebso28233475e9.3 for <62941@debbugs.gnu.org>; Tue, 18 Apr 2023 13:20:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681849204; x=1684441204; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tZrVRRaDW6OJR8hnsKobWQiSFR10uTOY65fV35KbKZE=; b=Ymbo5YU+RtacYjpV33m7RZqjcuFlngS3kuzPJBe63NDyw5tbL58fovD+HFBB+Ii3+T vJlCZMzxSQUk6ysZjyhw5upF9Ti+TODe5JKUvQhHrLLBr7CDh5TbQaBEkauFpsG0ITID tssZwEfTAaF88J+nVa9EQEjLBFsH0ZLVLKBkyWn30gCB4eQIv151/5UHpFNkzU6c4fJl 8FoxXEY5sPP4duu0RN41+bcqoIbYrZR2O4q/wpR6QSnfTEjrlR4SQIC4ifLgUSHb90GJ TDQDDPToWbdqeAklRfTHrhRt4QDs4yH/s4L9mdUNsT3FLb6Wqr9z6U3Cr/hzhiNBAS5R jnmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681849204; x=1684441204; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tZrVRRaDW6OJR8hnsKobWQiSFR10uTOY65fV35KbKZE=; b=ejnQdbgt1zyZVAP5IwcxexpcYtV567JGg5G+J8jIcdFR1Q+sS74BKVRzdFqz/DD+Dv QMq9XBxasd8L1aLvrywiniarDhHzBOHHFm8sVsuMIsaf4ycP5IY2IbW+RkWOy7g7rXkU QaQgdEUwvKdNf7PPBJDl0kzaWsXC/JamL5nYq6rIakj2g1MHnR4iGD9mvk4Sjode6dlB irDnWW5ChSBdjTygVmKp54MuoVk6iZOc1T41evbHWwGmXHo9fNBWfWPXoTJYuLrAgdtK BfKjy/3D8HHfCYHS+XpbEhCHkJIiJiFRrE+jjuMMHRtAr3dQQI0gQZrBrygzHsYnoxRd wNCg== X-Gm-Message-State: AAQBX9cXcLYdpBK2iE/F1V9Ro7Fwl70CcGr2KnLb+FaTZivPsE53YSOo ll3t/MRm0wg7Kaa/fEu8kLkBtXULG9g= X-Google-Smtp-Source: AKy350bM2/Gi1JpZuT/gz77bervdM0yvob/YLOxxnlEQwVLnfe6QeFy4Dx2Wi8cH/90InPPGdOVldA== X-Received: by 2002:a5d:4490:0:b0:2f8:a17c:dedc with SMTP id j16-20020a5d4490000000b002f8a17cdedcmr2753967wrq.42.1681849204002; Tue, 18 Apr 2023 13:20:04 -0700 (PDT) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id i15-20020a5d630f000000b002f27dd92643sm13721202wru.99.2023.04.18.13.20.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 13:20:03 -0700 (PDT) From: Sharlatan Hellseher Date: Tue, 18 Apr 2023 21:19:59 +0100 Message-Id: <20230418202000.11729-2-sharlatanus@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230418202000.11729-1-sharlatanus@gmail.com> References: <20230418202000.11729-1-sharlatanus@gmail.com> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/package/engineering.scm (fritzing): Improve package style. Use Gexp. [inputs]: Remove labels. Sort alphabetically. [native-inputs]: Introduce it, use fritzing-parts instead local source. --- gnu/packages/engineering.scm | 95 +++++++++++++++++------------------- 1 file changed, 46 insertions(+), 49 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index dd8a711566..67e72b58a3 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -711,58 +711,55 @@ (define-public fritzing (package (name "fritzing") (version "0.9.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/fritzing/fritzing-app") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fritzing/fritzing-app") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (copy-recursively (assoc-ref inputs "fritzing-parts-db") - "parts") - ;; Use system libgit2 and boost. - (substitute* "phoenix.pro" - (("^LIBGIT_STATIC.*") - (string-append "LIBGIT2INCLUDE=" (assoc-ref inputs "libgit2") "/include\n" - "LIBGIT2LIB=" (assoc-ref inputs "libgit2") "/lib\n" - "INCLUDEPATH += $$LIBGIT2INCLUDE\n" - "LIBS += -L$$LIBGIT2LIB -lgit2\n")) - (("^.*pri/libgit2detect.pri.") "")) - ;; Trick the internal mechanism to load the parts - (substitute* "src/version/partschecker.cpp" - ((".*git_libgit2_init.*") - "return \"083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs\";")) - - (let ((out (assoc-ref outputs "out"))) - (invoke "qmake" - (string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath," out "/lib") - (string-append "PREFIX=" out) - "phoenix.pro"))))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + ;; Integrate parts library + (copy-recursively + (string-append #$(this-package-native-input "fritzing-parts") + "/share/library") + "parts") + ;; Use system libgit2 and boost. + (substitute* "phoenix.pro" + (("^LIBGIT_STATIC.*") + (string-append + "LIBGIT2INCLUDE=" #$(this-package-input "libgit2") "/include\n" + "LIBGIT2LIB=" #$(this-package-input "libgit2") "/lib\n" + "INCLUDEPATH += $$LIBGIT2INCLUDE\n" + "LIBS += -L$$LIBGIT2LIB -lgit2\n")) + (("^.*pri/libgit2detect.pri.") "")) + ;; Trick the internal mechanism to load the parts + (substitute* "src/version/partschecker.cpp" + ((".*git_libgit2_init.*") + "return \"083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs\";")) + (invoke "qmake" + (string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath," #$output "/lib") + (string-append "PREFIX=" #$output) + "phoenix.pro")))))) + (native-inputs + (list fritzing-parts)) (inputs - `(("qtbase" ,qtbase-5) - ("qtserialport" ,qtserialport) - ("qtsvg-5" ,qtsvg-5) - ("libgit2" ,libgit2) - ("boost" ,boost) - ("zlib" ,zlib) - ("fritzing-parts-db" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/fritzing/fritzing-parts") - (commit (string-append "release_" version)))) - (file-name (git-file-name "fritzing-parts" version)) - (sha256 - (base32 - "0wsvn57v6n0ygnhk2my94rrfzb962z1cj4d1xmp1farwck3811h6")))))) + (list boost + libgit2 + qtbase-5 + ;; TODO: Needs to be renamed to qtserialport-5. when version 6 is + ;; packed. + qtserialport + qtsvg-5 + zlib)) (home-page "https://fritzing.org") (synopsis "Electronic circuit design") (description