From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id IOTIGU2DF2WAMgAA9RJhRA:P1 (envelope-from ) for ; Sat, 30 Sep 2023 04:09:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id IOTIGU2DF2WAMgAA9RJhRA (envelope-from ) for ; Sat, 30 Sep 2023 04:09:17 +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 DFD0A4B44E for ; Sat, 30 Sep 2023 04:09:16 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=NmcFqssa; 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"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1696039757; 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: content-transfer-encoding:content-transfer-encoding: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:dkim-signature; bh=50InCTn2xSuS7K0qLtS5R+Kp1KVBV/HrVf9l3wolAII=; b=kCWOPjl16GXjZ4TKbCwNATdOWMu+WFI3tRPOz24kXpX4ND7f1FS8QtREE9zVGWJak1kekB wxq+S5OOmMOePSiL7kPDxMbN3HYXEZqZqFVKP7P2JRIzO6ZEQUlYBst44nK5Rn351lxg6j JDSNfodIz4bXR4jR2eIfvDbilc3vWWaCMAVNNxpKHiLAjuZVQ9AG38VuXh+tBYXJ6kemG1 Wmy2CX5mp0G8Mnx5nJdZ9o5tps6g7ZYuqpXgo4RzIo2OuQAW5T4gSvrl4l69CE0IsbLXXv ZO/VR5bEflV2uMOlUzuxr1u3WcEOvO3YSJWbVXL9l3NNLC+pQOLCsrgAhHNZ2g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1696039757; a=rsa-sha256; cv=none; b=tUPkTrS8jl/8ZUU/L8t/uSb6Iq5wn/ulUWdsY8dmqVxT/JOggLgLP7kFwEjrWXCTdBkyXR ucm+JVvHqS5wzVVKJI3yZW24I9I5JBHP7Y4vTVTdYCtg/SSKMJgn15DgoMTBnRAyvHhuQY r3MqFSyRiofWFAIpz9lVrnIzDmbkNfrr7SAM2dnsAELFTvtwFNJnmoXrKrIzrjkPv9+PIm udH/e5bqbuQKHWZYsyJAKHoEer3OW70ZINL2sP1ghtNoQyPPPdQ0qlutJjh3brK57OaG9A CaEWqicW7dcO8SCU+ZjfQPmU4cA6/rBI4dxVoSqUkYBBoA12C/EiY2Gf49nZjw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=NmcFqssa; 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"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qmOta-0004w1-GH; Fri, 29 Sep 2023 21:35:50 -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 1qmOtY-0004vZ-28 for guix-patches@gnu.org; Fri, 29 Sep 2023 21:35:48 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qmOtX-0002lJ-Gp for guix-patches@gnu.org; Fri, 29 Sep 2023 21:35:47 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qmOtm-0000sA-AJ for guix-patches@gnu.org; Fri, 29 Sep 2023 21:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66199] [PATCH v4 2/2] gnu: librepcb: Update to 1.0.0. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Sep 2023 01:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66199 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: pinoaffe , 66199@debbugs.gnu.org Received: via spool by 66199-submit@debbugs.gnu.org id=B66199.16960377153272 (code B ref 66199); Sat, 30 Sep 2023 01:36:02 +0000 Received: (at 66199) by debbugs.gnu.org; 30 Sep 2023 01:35:15 +0000 Received: from localhost ([127.0.0.1]:57464 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmOt1-0000qg-7c for submit@debbugs.gnu.org; Fri, 29 Sep 2023 21:35:15 -0400 Received: from mout01.posteo.de ([185.67.36.65]:34393) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmOsx-0000qP-UX for 66199@debbugs.gnu.org; Fri, 29 Sep 2023 21:35:13 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id B86E9240027 for <66199@debbugs.gnu.org>; Sat, 30 Sep 2023 03:34:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696037690; bh=1bNajzMIKZ7BMMpYZZCFzalrk4huK/B/vDmXS+szogo=; h=Message-ID:Date:MIME-Version:Subject:To:From: Content-Transfer-Encoding:From; b=NmcFqssaPeOrcHTDauw9kNt0fGXASnfuxTDHuegqM9ZLWL+WKzmYOCTV3OryJizn/ sjA+mRZwtiw+WpI6VZc2NXEn3/4+OX15uuuBdD4zkbUsoNb4wkE3Zjd6r2Uz143qWU wExnXDbbiT80vsMTvhJKBP/zD2uSduOlQcnIq2eoTViPcdRNfogrAk/U75dHjmMBJR Ki4hhhKmg2mPfSM27q8eMctC97bqccvwcwnSMfhncNAdPlP7Kmu7Kqmna1Z1S/iTX6 CO4/TSeIlvoeSZ6/aTktU95ko9GHqWEmXHpGEaxL+dzqL2cEy3mtMLeJCTnXeQq7S/ AjgHlBYzFE5LQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Ry8sP08Y3z9rxD; Sat, 30 Sep 2023 03:34:48 +0200 (CEST) Message-ID: <5d81aa7e-1f82-9089-2d10-1c266c2f6272@posteo.net> Date: Sat, 30 Sep 2023 01:34:48 +0000 MIME-Version: 1.0 References: <01b109c3d00cb4ab5d81d48d22b6bc4cfe0b943a.1695840289.git.pinoaffe@gmail.com> Content-Language: en-US From: Vinicius Monego In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: 4.03 X-Migadu-Spam-Score: 4.03 X-Migadu-Scanner: mx1.migadu.com X-Migadu-Queue-Id: DFD0A4B44E X-TUID: WDk0KtN1pzxs Hi, Em 27/09/2023 15:46, pinoaffe escreveu: > * gnu/packages/engineering.scm (librepcb): Update to 1.0.0. > [inputs]: Add various dependencies (both new ones and old ones that are now > debundled). If the change is not automated, then every input should be listed, separated by commas. > [arguments]: Remove overriding of configure phase. Replace test > phase. Debundle various dependencies. Avoid words like "various", list all items whenever possible. > [build-system]: Use cmake-build-system. > [native-inputs]: Add googletest. pkg-config was also added to native-inputs. And don't worry too much about the commit message, I can change it later. > --- > gnu/packages/engineering.scm | 83 +++++++++++++++++++++++++----------- > 1 file changed, 57 insertions(+), 26 deletions(-) > > diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm > index faba76161b..fca831f44b 100644 > --- a/gnu/packages/engineering.scm > +++ b/gnu/packages/engineering.scm > @@ -38,6 +38,7 @@ > ;;; Copyright © 2022, 2023 Felix Gruber > ;;; Copyright © 2023 Theofilos Pechlivanis > ;;; Copyright © 2023 Sharlatan Hellseher > +;;; Copyright © 2023 pinoaffe > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -123,7 +124,9 @@ (define-module (gnu packages engineering) > #:use-module (gnu packages lisp) > #:use-module (gnu packages m4) > #:use-module (gnu packages man) > + #:use-module (gnu packages markup) > #:use-module (gnu packages maths) > + #:use-module (gnu packages multiprecision) > #:use-module (gnu packages mpi) > #:use-module (gnu packages multiprecision) > #:use-module (gnu packages ncurses) > @@ -2325,33 +2328,66 @@ (define-public freehdl > (define-public librepcb > (package > (name "librepcb") > - (version "0.1.5") > + (version "1.0.0") > (source > (origin > (method url-fetch) > (uri (string-append "https://download.librepcb.org/releases/" > version "/librepcb-" version "-source.zip")) > + (modules `((guix build utils))) > + (snippet > + ;; Delete libraries that we already have or don't need. > + ;; TODO: try to unbundle more (see lib/). > + `(begin > + (let ((third-parties '("fontobene-qt5" > + "googletest" > + "hoedown" > + "muparser" > + "polyclipping" > + "quazip"))) > + (with-directory-excursion "libs" > + (map (lambda (third-party) > + (delete-file-recursively third-party)) > + third-parties))) > + #t)) > (sha256 > - (base32 "0smp1p7wnrj0vh4rmz1cr2krfawc2lzx0pbzmgyay7xdp6jxympr")))) > - (build-system gnu-build-system) > + (base32 "02qfwyhdq1pklb5gkwn3rbsdhwvcgiksd21swaphz3kw6s4p9i8v")))) > + (build-system cmake-build-system) > (inputs > - (list qtbase-5 qtsvg-5 zlib)) > + (list fontconfig > + fontobene-qt5 > + glu > + hoedown > + muparser > + opencascade-occt > + clipper Nitpick: 'clipper' is out of order > + qtbase-5 > + qtdeclarative-5 > + qtquickcontrols2-5 > + qtsvg-5 > + quazip > + zlib)) > (native-inputs > - (list qttools-5 ; for lrelease > + (list googletest > + pkg-config > + qttools-5 > unzip)) > (arguments > - `(#:phases > - (modify-phases %standard-phases > - (replace 'configure > - (lambda* (#:key inputs outputs #:allow-other-keys) > - (mkdir-p "build") > - (chdir "build") > - (let ((lrelease (search-input-file inputs "/bin/lrelease")) > - (out (assoc-ref outputs "out"))) > - (invoke "qmake" > - (string-append "QMAKE_LRELEASE=" lrelease) > - (string-append "PREFIX=" out) > - "../librepcb.pro"))))))) > + `(#:phases (modify-phases %standard-phases > + (replace 'check > + (lambda* (#:key tests? #:allow-other-keys) > + (when tests? > + (setenv "QT_QPA_PLATFORM" "offscreen") > + (setenv "QT_QUICK_BACKEND" "software") > + (display "Running unittests...\n") > + (invoke "./tests/unittests/librepcb-unittests" "--help"))))) > + Why --help? I ran librepcb-unittests with no arguments and found that ~20 tests failed out of ~2100. If it's not possible to skip them manually, you could skip all tests and leave a comment reporting what happened. I didn't check the output of --help. > #:configure-flags (list > + "-DUNBUNDLE_FONTOBENE_QT5=ON" > + "-DUNBUNDLE_GTEST=ON" > + "-DUNBUNDLE_HOEDOWN=ON" > + "-DUNBUNDLE_MUPARSER=ON" > + "-DUNBUNDLE_POLYCLIPPING=ON" > + "-DUNBUNDLE_QUAZIP=ON"))) #:configure-flags is usually placed above #:phases. > (home-page "https://librepcb.org/") > (synopsis "Electronic Design Automation tool") > (description "LibrePCB is @dfn{Electronic Design Automation} (EDA) > @@ -2359,17 +2395,12 @@ (define-public librepcb > formats and complete project management with library, schematic and board > editors.") > (license (list license:gpl3+ > - license:boost1.0 ; libs/clipper, > - ; libs/optional/tests/catch.hpp, > - ; libs/sexpresso/tests/catch.hpp > + license:boost1.0 ; libs/optional/tests/catch.hpp, > license:expat ; libs/delaunay-triangulation, > ; libs/parseagle, libs/type_safe > - license:asl2.0 ; libs/fontobene, libs/googletest, > - ; libs/parseagle > - license:isc ; libs/hoedown > - license:cc0 ; libs/optional, libs/sexpresso > - license:bsd-2 ; libs/optional/tests/catch.hpp > - license:lgpl2.1+)))) ; libs/quazip > + license:asl2.0 ; libs/parseagle > + license:cc0 ; libs/optional > + license:bsd-2)))) ; libs/optional/tests/catch.hpp > > (define-public gpx > (package I think this patch is ready after fixing the test suite. Vinicius