From patchwork Wed Sep 27 18:46:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: pinoaffe X-Patchwork-Id: 54368 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 6CD1227BBEA; Wed, 27 Sep 2023 19:47:04 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 780C027BBE2 for ; Wed, 27 Sep 2023 19:47:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlZYk-0003Zs-57; Wed, 27 Sep 2023 14:46:54 -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 1qlZYf-0003Ya-H5 for guix-patches@gnu.org; Wed, 27 Sep 2023 14:46:50 -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 1qlZYf-0005hH-18 for guix-patches@gnu.org; Wed, 27 Sep 2023 14:46:49 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qlZYs-0002LP-BA for guix-patches@gnu.org; Wed, 27 Sep 2023 14:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66199] [PATCH v4 1/2] gnu: Add fontobene-qt5. References: <3e28337e7ead18b49e5e2e99d0e3d1d22e3f9d47.1695673614.git.pinoaffe@gmail.com> In-Reply-To: <3e28337e7ead18b49e5e2e99d0e3d1d22e3f9d47.1695673614.git.pinoaffe@gmail.com> Resent-From: pinoaffe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Sep 2023 18:47: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: 66199@debbugs.gnu.org Cc: pinoaffe Received: via spool by 66199-submit@debbugs.gnu.org id=B66199.16958404008970 (code B ref 66199); Wed, 27 Sep 2023 18:47:02 +0000 Received: (at 66199) by debbugs.gnu.org; 27 Sep 2023 18:46:40 +0000 Received: from localhost ([127.0.0.1]:52517 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlZYW-0002KW-5N for submit@debbugs.gnu.org; Wed, 27 Sep 2023 14:46:40 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]:49529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlZYS-0002KG-Vr for 66199@debbugs.gnu.org; Wed, 27 Sep 2023 14:46:38 -0400 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-9b2b53e17feso233965066b.3 for <66199@debbugs.gnu.org>; Wed, 27 Sep 2023 11:46:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695840377; x=1696445177; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=R5zP5rAqZdKTdOhtIuTq9ra6t0xdRE1fJOixwG/x/rY=; b=R6vc1lMQoGGMNs1XTfm1HsQiNPgp3Sxz2yetbOMs5vu1TqdlDTp9ZHLuyzjOhrKQ03 GhvihYLPPEcGee8X6lqIjjAr5nHeokv8aAu9bIaPq6yJsglg+UF8uJWVU15bFm/e5w2O 1DAU3Q9llqD6p7mTlLSu0bx7m2yV5RCnvVFBG3m+tECu+W4mQ4Bw3X5eJ/UFQrI0VQWd X4OhI8pZ+tCbMPBqDpVgjBX4C1+aBnolNB4HrxrPBDWudOEFQVtk8K7qgSxj5xp9tYWI 7gcTxQaov6mr/WrByiQbwktXjFOiaQQbF728Z6+ZVsLV0J1ZVOjfDDiC7Y7sKVT/awHX nGrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695840377; x=1696445177; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=R5zP5rAqZdKTdOhtIuTq9ra6t0xdRE1fJOixwG/x/rY=; b=AdMKHDh2PgkPTClf4qfwRG1o4PcM1wcULAPKRaqb7e1Xm8YvSyC6EiKOepXx6CZfYZ BxvYb970/QeTfs9bPiy093VRDc87S+evBbpHsOkJOXgngmpSbo6RDpBUALRqKShlfHe/ iabgTxTx8xc5r3+lkk3gaISw6vOsykVAVuAmcPMmORfI6WDvfEpDjNiOS8qglXs6Ujgk sWLavLCyZwQ6i4ARk7qM/yxKPmssRaQ8x8036p9L9vbc1T8NExn0ax4JBhrdZ9Ob9343 QVT3yNv240Zj4gLmzU+OxtG9Vjv6QZpmfVorCmWjIlM5T/OQVp8sGc1eu4fwxEgYy+w3 ua0Q== X-Gm-Message-State: AOJu0YyzVoZfzaILdtxYg+OQFsuX5B0dkRPNkvm/wpiy+V1xGvTrJRke XmkjLlMLnT31DMBs34CH+XSr+DRjObA= X-Google-Smtp-Source: AGHT+IE0aV3qVerzj15oC/CS8s8Zi6XmT5a3/sAqzmgXYD54Cvt7PCO3DoYFtnzwBwHcKru2tT9dAw== X-Received: by 2002:a17:906:748c:b0:9a5:cade:8047 with SMTP id e12-20020a170906748c00b009a5cade8047mr2636961ejl.71.1695840377115; Wed, 27 Sep 2023 11:46:17 -0700 (PDT) Received: from localhost (h120217.upc-h.chello.nl. [62.194.120.217]) by smtp.gmail.com with ESMTPSA id sa21-20020a170906edb500b009add084a00csm9623725ejb.36.2023.09.27.11.46.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 11:46:16 -0700 (PDT) From: pinoaffe Date: Wed, 27 Sep 2023 20:46:10 +0200 Message-ID: <01b109c3d00cb4ab5d81d48d22b6bc4cfe0b943a.1695840289.git.pinoaffe@gmail.com> X-Mailer: git-send-email 2.41.0 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/packages/fontutils.scm (fontobene-qt5): New variable. --- gnu/packages/fontutils.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) base-commit: ce0cc6137df81919389f61671096a6ce701c0889 diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 18697cd821..603f442e0a 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2023 gemmaro ;;; Copyright © 2023 John Kehayias ;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023 pinoaffe ;;; ;;; This file is part of GNU Guix. ;;; @@ -65,6 +66,7 @@ (define-module (gnu packages fontutils) #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) #:use-module (gnu packages sqlite) #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) @@ -951,6 +953,34 @@ (define-public python-ufonormalizer @end itemize") (license license:bsd-3))) +(define-public fontobene-qt5 + (package + (name "fontobene-qt5") + (version "0.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fontobene/fontobene-qt5") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gy3sfraf23k7dm4ha8nqpd6madzk0zmxkcb204micyn5b5l8ljg")))) + (inputs (list qtbase-5)) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./tests/fontobene-qt5-tests"))))))) + (home-page "https://github.com/fontobene/fontobene-qt5") + (synopsis "Parser for FontoBene stroke fonts") + (description "FontoBene-Qt5 is a header-only library to parse FontoBene +stroke fonts with C++11/Qt5.") + (license license:expat))) + (define-public ttfautohint (package (name "ttfautohint") From patchwork Wed Sep 27 18:46:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: pinoaffe X-Patchwork-Id: 54369 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 41E5527BBE9; Wed, 27 Sep 2023 19:47:21 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,T_PDS_PRO_TLD,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 BF64E27BBE2 for ; Wed, 27 Sep 2023 19:47:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlZYh-0003ZI-U0; Wed, 27 Sep 2023 14:46:51 -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 1qlZYf-0003Yb-Gr for guix-patches@gnu.org; Wed, 27 Sep 2023 14:46:49 -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 1qlZYf-0005hO-3H for guix-patches@gnu.org; Wed, 27 Sep 2023 14:46:49 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qlZYs-0002LW-PH for guix-patches@gnu.org; Wed, 27 Sep 2023 14:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66199] [PATCH v4 2/2] gnu: librepcb: Update to 1.0.0. Resent-From: pinoaffe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Sep 2023 18:47: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: 66199@debbugs.gnu.org Cc: pinoaffe Received: via spool by 66199-submit@debbugs.gnu.org id=B66199.16958404058981 (code B ref 66199); Wed, 27 Sep 2023 18:47:02 +0000 Received: (at 66199) by debbugs.gnu.org; 27 Sep 2023 18:46:45 +0000 Received: from localhost ([127.0.0.1]:52519 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlZYa-0002Km-NQ for submit@debbugs.gnu.org; Wed, 27 Sep 2023 14:46:45 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]:55649) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlZYU-0002KI-UK for 66199@debbugs.gnu.org; Wed, 27 Sep 2023 14:46:40 -0400 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-99de884ad25so1510576366b.3 for <66199@debbugs.gnu.org>; Wed, 27 Sep 2023 11:46:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695840379; x=1696445179; darn=debbugs.gnu.org; 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=rok2ZkzEOZRggcukIw3l6e/QfatmNUVl26jNx1mb5uo=; b=PveEHCp7a3H2hXPMrZselZp3FaKrNliVEIG6uB58I+3IWHNFcxqEbi9fa/Uu8IJI76 zhmkHtU6/qLGQb5oSW1y00OqJSVq3TFAg1GZ6wkfcRe+H8AHPiyUDuecqSeDJtbw+Bsc jKGyHh99UUQhImZm2pAqP0taRYIjqQYNPPi9YkR+PwpWYyHd6dDbEOTzPpmSh+nxEwbs KII+L0c1AsPFc8SplzsSv1Xg2OW22Ky3+JG1r0x9wCOyhFQqpD/j/lr0WlanK0hTnKPc d+Chk4OsB7aMgiyhHI0wKQclsT/CQ5xJbBFJyyh0mwzJptZtw88+XQC49D/ziScThJ/u t6vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695840379; x=1696445179; 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=rok2ZkzEOZRggcukIw3l6e/QfatmNUVl26jNx1mb5uo=; b=hJyQqztl/6clM8BmqnYCAUBqX99ZrUHBZPfrpcEw97HvpYUhF7n5BPag3iytODZGuM EAgU7yDSfTJ7Gouj3XJmHL+XkLffGW5M1PoHN1p2j7p8twMGH33d1hWuT5Oer5t8Qv3Q MMz48w88INQZqRbayZ2iwj5SuaHUBRpU8Btbtt4WjsWPa/Z3/U7OTG7rUxfY+3jSrPs1 8EoZP91dQuDVXUG/JbT0YXh1GpAl90GbqXRnipuVGqcXIR34Mq4uSj1l9lsQ2SJNSzJh 5ZnEA2wil2agkBLqv3uqzvrJ4G/3VjoQYynpLNiVfMngmI/cnb4hTVUTHqCOKOj6VrdM jd+A== X-Gm-Message-State: AOJu0YzChYplJwmpxGhqYpD/lL5DeWrvvngjxtew4L0+SvpTIqpNdYP6 sLUxwK+XIdtcXq2adF+1xgaaVGjIIas= X-Google-Smtp-Source: AGHT+IFlyugd0YGdNrqyVL037PbjRq49+wzf92gtjDX7XIau5e1IO3G7wnwq7Fpl8EqJZ+Hlml9lbA== X-Received: by 2002:a17:907:7889:b0:9b2:b269:d563 with SMTP id ku9-20020a170907788900b009b2b269d563mr2528015ejc.63.1695840379382; Wed, 27 Sep 2023 11:46:19 -0700 (PDT) Received: from localhost (h120217.upc-h.chello.nl. [62.194.120.217]) by smtp.gmail.com with ESMTPSA id qk8-20020a170906d9c800b009ad89697c86sm9776816ejb.144.2023.09.27.11.46.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 11:46:19 -0700 (PDT) From: pinoaffe Date: Wed, 27 Sep 2023 20:46:11 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <01b109c3d00cb4ab5d81d48d22b6bc4cfe0b943a.1695840289.git.pinoaffe@gmail.com> References: <01b109c3d00cb4ab5d81d48d22b6bc4cfe0b943a.1695840289.git.pinoaffe@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/packages/engineering.scm (librepcb): Update to 1.0.0. [inputs]: Add various dependencies (both new ones and old ones that are now debundled). [arguments]: Remove overriding of configure phase. Replace test phase. Debundle various dependencies. [build-system]: Use cmake-build-system. [native-inputs]: Add googletest. --- 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 + 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"))))) + #:configure-flags (list + "-DUNBUNDLE_FONTOBENE_QT5=ON" + "-DUNBUNDLE_GTEST=ON" + "-DUNBUNDLE_HOEDOWN=ON" + "-DUNBUNDLE_MUPARSER=ON" + "-DUNBUNDLE_POLYCLIPPING=ON" + "-DUNBUNDLE_QUAZIP=ON"))) (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