From patchwork Thu Dec 31 18:47:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ekaitz Zarraga X-Patchwork-Id: 26131 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 7434B27BC05; Thu, 31 Dec 2020 18:49:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B951027BC06 for ; Thu, 31 Dec 2020 18:49:12 +0000 (GMT) Received: from localhost ([::1]:48990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kv30Z-0002JZ-Qf for patchwork@mira.cbaines.net; Thu, 31 Dec 2020 13:49:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kv30Q-0002H0-1j for guix-patches@gnu.org; Thu, 31 Dec 2020 13:49:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58226) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kv30P-0006W3-Qx for guix-patches@gnu.org; Thu, 31 Dec 2020 13:49:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kv30P-0005F5-Q8 for guix-patches@gnu.org; Thu, 31 Dec 2020 13:49:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45573] [PATCH] Correct freecad runtime errors Resent-From: Ekaitz Zarraga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Dec 2020 18:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45573 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45573@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.160944050020101 (code B ref -1); Thu, 31 Dec 2020 18:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 31 Dec 2020 18:48:20 +0000 Received: from localhost ([127.0.0.1]:41539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv2zf-0005E5-K7 for submit@debbugs.gnu.org; Thu, 31 Dec 2020 13:48:20 -0500 Received: from lists.gnu.org ([209.51.188.17]:42326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv2zd-0005Dy-WF for submit@debbugs.gnu.org; Thu, 31 Dec 2020 13:48:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kv2zd-0001rJ-Ob for guix-patches@gnu.org; Thu, 31 Dec 2020 13:48:13 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:38350) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kv2zY-0006Eb-Rq for guix-patches@gnu.org; Thu, 31 Dec 2020 13:48:13 -0500 Date: Thu, 31 Dec 2020 18:47:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=protonmail2; t=1609440483; bh=Nrwrm8iQdRhn0bgrXk/AAalaVokl+29MEwLgB2uWyTE=; h=Date:To:From:Reply-To:Subject:From; b=G+AfnaOYp3V/bl6n5XIMEI6OBnUE8llB16ctv+8YW0K9BKENYXf8V1IrZZqE7xxvS jTJZnpzvpCu20IKYJHauUgxGno1SXntrdnwqpXA1mxivldafGRlk2UfhnCpzuKTe+7 B1iNGQHIOvcSQaUOAOFqWffxCRLNt4J2S4uWHkgjc+ruykWZxVW1OYFSj3FmkdFs9v HJZ9U8fH9SoSZPwMS5f9QHSkvzC8QzUA0m3bKm6AlosClwT1cbgNLbpwQ3RLOXim2S jVX0gEfqaOpkb59CwT4PkcLZ6aqofYhe0ff3v19aabQMO5eJeXQdu2tjX+e8qBSkEz NtWPxDR4H/oIw== From: Ekaitz Zarraga Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.134; envelope-from=ekaitz@elenq.tech; helo=mail-40134.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-To: Ekaitz Zarraga Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, I attach 4 patches that correct the runtime issues freecad has and also supply some packages needed as a dependency. Freecad is a very complex package that is hard to build because many of its dependencies' buildsystem is broken. The approach followed here is the same that Nix follows and appears to work correctly. The changes correct the Draft module, which wasn't available because pivy was not added as a dependency. For context, see this message: https://lists.gnu.org/archive/html/guix-devel/2020-12/msg00123.html Thanks From 3c3fde8f5aa3433de076d6bbb90f9e60333f31b0 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Thu, 31 Dec 2020 19:34:45 +0100 Subject: [PATCH 2/4] gnu: Add soqt. * gnu/packages/qt.scm (soqt): New variable. --- gnu/packages/qt.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 2e621e758c..2af7e40734 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -67,6 +67,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages gperf) + #:use-module (gnu packages graphics) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) @@ -2824,3 +2825,36 @@ being fully customizable and easy to extend.") ;; According to LICENSE, either version 2 or version 3 of the GNU GPL may ;; be used. (license (list license:gpl2 license:gpl3)))) + + +(define-public soqt + (let ((commit-ref "fb8f655632bb9c9c60e0ff9fa69a5ba22d3ff99d") + (revision "1")) + (package + (name "soqt") + (version (git-version "1.6.0" revision commit-ref)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/coin3d/soqt") + (commit commit-ref) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 "16vikb3fy8rmk10sg5g0gy2c343hi3x7zccsga90ssnkzpq6m032")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f)) + (native-inputs + `(("pkg-config" ,pkg-config) + ("cmake" ,cmake))) + (inputs + `(("qtbase" ,qtbase) + ("coin3D-4" ,coin3D-4))) + (home-page "https://github.com/coin3d/soqt") + (synopsis "Qt GUI component toolkit library for Coin") + (description "SoQt is a Qt GUI component toolkit library for Coin. It is +also compatible with SGI and TGS Open Inventor, and the API is based on the API +of the InventorXt GUI component toolkit.") + (license license:bsd-3)))) -- 2.29.2