From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 2MqgOblTbGMWcAAAbAwnHQ (envelope-from ) for ; Thu, 10 Nov 2022 02:28:26 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id MN7LOblTbGNHdAEA9RJhRA (envelope-from ) for ; Thu, 10 Nov 2022 02:28:25 +0100 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 C6DEE3D360 for ; Thu, 10 Nov 2022 02:28:21 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oswMO-0006vn-C8; Wed, 09 Nov 2022 20:28:04 -0500 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 1oswMM-0006vZ-TZ for bug-guix@gnu.org; Wed, 09 Nov 2022 20:28:02 -0500 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 1oswMM-0004sd-L9 for bug-guix@gnu.org; Wed, 09 Nov 2022 20:28:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oswMM-0000eC-Fd for bug-guix@gnu.org; Wed, 09 Nov 2022 20:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#59160: Acknowledgement (Fritzing parts are missing) Resent-From: Gabriel Wicki Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 10 Nov 2022 01:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59160 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 59160@debbugs.gnu.org Received: via spool by 59160-submit@debbugs.gnu.org id=B59160.16680436512446 (code B ref 59160); Thu, 10 Nov 2022 01:28:02 +0000 Received: (at 59160) by debbugs.gnu.org; 10 Nov 2022 01:27:31 +0000 Received: from localhost ([127.0.0.1]:41446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oswLq-0000dO-F9 for submit@debbugs.gnu.org; Wed, 09 Nov 2022 20:27:30 -0500 Received: from chimborazo.ee.ethz.ch ([129.132.2.15]:48509) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oswLo-0000dB-Su for 59160@debbugs.gnu.org; Wed, 09 Nov 2022 20:27:29 -0500 Received: from silvi (unknown [85.195.207.206]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: gabriel) by chimborazo.ee.ethz.ch (Postfix) with ESMTPSA id 5743A4022D for <59160@debbugs.gnu.org>; Thu, 10 Nov 2022 02:27:22 +0100 (CET) From: Gabriel Wicki References: <871qqblitc.fsf@erlikon.ch> Date: Thu, 10 Nov 2022 02:27:21 +0100 In-Reply-To: (GNU bug Tracking System's message of "Thu, 10 Nov 2022 01:08:02 +0000") Message-ID: <87wn83k39i.fsf@erlikon.ch> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1668043701; 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:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=9oQ1nKzvbfPCgkLUK21cEzRGtNuqZ+AtWZP/wvclnqE=; b=ItmTmuMJS4LAGGuBWqKOqdBqjCsLDsb+9kX9SQ3YuZvqIqsZuF1RdthCKazBHRQj/2y9LQ b4WVDCdm8yGQaH0TJ216XYKUsHKBZlKrbsvfKBwMgOPTv7zVVPHuAFjT7d68e0FWZ1qPmv uytIw60sEDiphGjPRoelr+/aY3YYdL9yk9UF/v+ZNq31kPLV1Q0tKMgnQd+rrHnUUJeQ96 3n5FiNEpRRpvJGr4Q11WP3cSTO17ONxpEsEWwQm1n4Yx5amxPlDHCqoQOYwHt1pQIF2A8g TZPi1G9cWO0mno9cRjPBOoH5zCn6QV4zmjuWkDYtmWmnUwfgxQEKw6sXZy7E3Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1668043701; a=rsa-sha256; cv=none; b=DDdN5KTUncNDNx4NqmwZ5n/OtfUYHJK5Um9qqdSRSGN7QkQ+pXsojzatWstHkUGDFtyFwv bvFSf7W7SER/jOxK92Y6MwTG61IConjf/9cqte/FdplKZQoUaE4nh3qG0nCSKWQ1idxksR pC2npu2fLuGnSmlNoZuZX1pQOyeE1/RiJSlLJc7XLS6wlXCtRCqbsUaYHh5VGLp9DFNbGB zPRsydAXbtsSS2lPTJWahdJjg7bLQSte8jYNFE16NTgUGEyaLdesKI1JaTKRM7+ponxmzW TboIvbURB31hNqNxzP1ctOJ8rfTl/wjk2Sv/0QLxxFQqcWeHs5Q39rah6uKBoQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.53 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: C6DEE3D360 X-Spam-Score: -1.53 X-Migadu-Scanner: scn1.migadu.com X-TUID: dU7TBd61EfVS I've come up with the following patch. It is not optimal (there's still some warnings and it makes use of an ugly hack to get rid of a certain "Unable to find parts git repository" message) but with that patch Fritzing is in a usable state. >From e713d634d8358d1a24219634fa7e8ed3b5c5dff4 Mon Sep 17 00:00:00 2001 From: Gabriel Wicki Date: Thu, 10 Nov 2022 01:53:41 +0100 Subject: [PATCH] * gnu/packages/engineering.scm (fritzing): Update to 0.9.6. [source]: Update hash. [arguments]: Update libgit2 hacks. --- gnu/packages/engineering.scm | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index b6a881d03b..dd12029b3f 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -669,7 +669,7 @@ (define-public fasthenry (define-public fritzing (package (name "fritzing") - (version "0.9.3b") + (version "0.9.6") (source (origin (method git-fetch) (uri (git-reference @@ -678,7 +678,7 @@ (define-public fritzing (file-name (git-file-name name version)) (sha256 (base32 - "0hpyc550xfhr6gmnc85nq60w00rm0ljm0y744dp0z88ikl04f4s3")))) + "083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs")))) (build-system gnu-build-system) (arguments `(#:phases @@ -687,24 +687,18 @@ (define-public fritzing (lambda* (#:key inputs outputs #:allow-other-keys) (copy-recursively (assoc-ref inputs "fritzing-parts-db") "parts") - ;; Make compatible with libgit2 > 0.24 - (substitute* "src/version/partschecker.cpp" - (("error = git_remote_connect\\(remote, GIT_DIRECTION_FETCH, &callbacks\\)") - "error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL, NULL)")) - ;; Use system libgit2 and boost. (substitute* "phoenix.pro" - (("^LIBGIT2INCLUDE =.*") - (string-append "LIBGIT2INCLUDE=" - (assoc-ref inputs "libgit2") "/include\n")) - (("^ LIBGIT2LIB =.*") - (string-append " LIBGIT2LIB=" - (assoc-ref inputs "libgit2") "/lib\n"))) - ;; This file checks for old versions of Boost, insisting on - ;; having us download the boost sources and placing them in the - ;; build directory. - (substitute* "pri/utils.pri" - (("error\\(") "message(")) + (("^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" @@ -723,11 +717,11 @@ (define-public fritzing (method git-fetch) (uri (git-reference (url "https://github.com/fritzing/fritzing-parts") - (commit version))) + (commit (string-append "release_" version)))) (file-name (git-file-name "fritzing-parts" version)) (sha256 (base32 - "1d2v8k7p176j0lczx4vx9n9gbg3vw09n2c4b6w0wj5wqmifywhc1")))))) + "0wsvn57v6n0ygnhk2my94rrfzb962z1cj4d1xmp1farwck3811h6")))))) (home-page "https://fritzing.org") (synopsis "Electronic circuit design") (description -- 2.37.3