From patchwork Sat Dec 5 23:51:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ekaitz Zarraga X-Patchwork-Id: 25591 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 3637F27BBFF; Sat, 5 Dec 2020 23:52:11 +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 716F927BC00 for ; Sat, 5 Dec 2020 23:52:10 +0000 (GMT) Received: from localhost ([::1]:49410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1klhLV-0004Ox-68 for patchwork@mira.cbaines.net; Sat, 05 Dec 2020 18:52:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klhLO-0004OZ-9P for guix-patches@gnu.org; Sat, 05 Dec 2020 18:52:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36929) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1klhLO-0001ta-26 for guix-patches@gnu.org; Sat, 05 Dec 2020 18:52:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1klhLN-0000Di-Vf for guix-patches@gnu.org; Sat, 05 Dec 2020 18:52:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45059] [PATCH] gnu: freecad: Fix compilation flags Resent-From: Ekaitz Zarraga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Dec 2020 23:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45059 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45059@debbugs.gnu.org, 43448@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" , 43448 <43448@debbugs.gnu.org> Received: via spool by submit@debbugs.gnu.org id=B.1607212308825 (code B ref -1); Sat, 05 Dec 2020 23:52:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Dec 2020 23:51:48 +0000 Received: from localhost ([127.0.0.1]:48475 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klhLA-0000DF-1q for submit@debbugs.gnu.org; Sat, 05 Dec 2020 18:51:48 -0500 Received: from lists.gnu.org ([209.51.188.17]:43554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klhL7-0000Cz-O0 for submit@debbugs.gnu.org; Sat, 05 Dec 2020 18:51:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klhL7-0004Mo-Ff for guix-patches@gnu.org; Sat, 05 Dec 2020 18:51:45 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:58037) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klhL3-0001mi-Cw for guix-patches@gnu.org; Sat, 05 Dec 2020 18:51:44 -0500 Date: Sat, 05 Dec 2020 23:51:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=protonmail2; t=1607212297; bh=tQ/8elPgMMCB/wxM/c11aYWzzrlFkdQaqj5S9vjU8+8=; h=Date:To:From:Reply-To:Subject:From; b=RYxGVkXtxn9LfV8m8pg8oODoHE9dEbj5bSNmk9lTvV0jBvTzCX0e/O/YNm13eFJAW Kd5/SdfU1MFR6xIHkdPzfEUn8yd6tUbrd0ziFoDRjQ6kIIQzF7n0pcPMklG550Bwyy 4yGBvKjG0HGzPV9OEZvetAgGX6dhaPa8d9jZgzxzocfoaf3SKTcEncXWB1igvM/b6l laFKpT5xnsnJD6dsnrC0uX9qxPgSJe2hXE2yVYo1Dw/rC7GRfR8okyeyn/EqrF8Qhu d1+GiUgaUPPxlcB0RehzCvf01CtZtSkdyBO4lnLqzzzuEoFQvYcrOe7xcD+LOnyN+U m3LzJMZqbKeeA== From: Ekaitz Zarraga Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.131; envelope-from=ekaitz@elenq.tech; helo=mail-40131.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 everyone, I managed to solve the longstanding issue with freecad's compilation (#43448). I'll submit a new change with the package update to 0.18.5 next. Thanks From d4d8a65679406b212c68d5198f239bdd71395541 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Sun, 6 Dec 2020 00:43:36 +0100 Subject: [PATCH] gnu: freecad: Fix compilation flags * gnu/packages/engineering.scm (freecad)[arguments]: Set correct search paths in compilation flags. Fixes #43448 --- gnu/packages/engineering.scm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) -- 2.28.0 diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 558541dd5a..5a8977c940 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2496,8 +2496,28 @@ full programmatic control over your models.") #:configure-flags (list "-DBUILD_QT5=ON" - (string-append "-DCMAKE_INSTALL_LIBDIR=" - (assoc-ref %outputs "out") "/lib")) + (string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib") + + (string-append "-DPYSIDE2UICBINARY=" + (assoc-ref %build-inputs "python-pyside-2-tools") + "/bin/uic") + (string-append "-DPYSIDE2RCCBINARY=" + (assoc-ref %build-inputs "python-pyside-2-tools") + "/bin/rcc") + + "-DPYSIDE_LIBRARY=PySide2::pyside2" + (string-append + "-DPYSIDE_INCLUDE_DIR=" + (assoc-ref %build-inputs "python-pyside-2") "/include;" + (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;" + (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;" + (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;" + (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;") + + "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" + (string-append "-DSHIBOKEN_INCLUDE_DIR=" + (assoc-ref %build-inputs "python-shiboken-2") + "/include/shiboken2")) #:phases (modify-phases %standard-phases (add-before 'configure 'restore-pythonpath From patchwork Sat Dec 5 23:58:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ekaitz Zarraga X-Patchwork-Id: 25592 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 2D56327BC00; Sat, 5 Dec 2020 23:59:09 +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 CC31C27BBFF for ; Sat, 5 Dec 2020 23:59:08 +0000 (GMT) Received: from localhost ([::1]:51922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1klhSG-0005oZ-1V for patchwork@mira.cbaines.net; Sat, 05 Dec 2020 18:59:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klhSA-0005oQ-1E for guix-patches@gnu.org; Sat, 05 Dec 2020 18:59:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36936) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1klhS9-0003iL-Q7 for guix-patches@gnu.org; Sat, 05 Dec 2020 18:59:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1klhS9-0000Nq-Pv for guix-patches@gnu.org; Sat, 05 Dec 2020 18:59:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45059] [PATCH 2/2] gnu: freecad: Update to 0.18.5 References: In-Reply-To: Resent-From: Ekaitz Zarraga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Dec 2020 23:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45059 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "45059@debbugs.gnu.org" <45059@debbugs.gnu.org> Received: via spool by 45059-submit@debbugs.gnu.org id=B45059.16072127011426 (code B ref 45059); Sat, 05 Dec 2020 23:59:01 +0000 Received: (at 45059) by debbugs.gnu.org; 5 Dec 2020 23:58:21 +0000 Received: from localhost ([127.0.0.1]:48482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klhRU-0000Mv-Od for submit@debbugs.gnu.org; Sat, 05 Dec 2020 18:58:20 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:51662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klhRS-0000Mj-Dp for 45059@debbugs.gnu.org; Sat, 05 Dec 2020 18:58:18 -0500 Date: Sat, 05 Dec 2020 23:58:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=protonmail2; t=1607212692; bh=xoGrtktRgAUWXBpiB/V1Ienh1ISd8QQqhB0k4Hi2gt8=; h=Date:To:From:Reply-To:Subject:From; b=C7YeFYEE3AIpTDvSAKiexQLSElZtiV6Lo2MMj5VCNZvivMEpVxlNl1impbzaGkAeF qcIE/QfIdoUTLuCMY7Bi3rpxWoDGlGIdfEQZlfM2cfKkbkGvQljuL/fa9/ca+VYXjK rX6dF3cYJcpnXiLr720iTKJi4Q3YanBisLLIxVZbZ2Ygcch4dAOM4Tc5Kj59bAFqX0 sUEecNqKykTjeiyWrdoZSP0Efu9PMC4AzSE/ofWxRm5BWh3c0x5suOWoMdVL3NEX/s 6twS6tRIEe6K458kyA2OBuioZZ0J0oc0M0A15DYRUXRHa0myTnfDKa5ns4IqejeI7c o64XX13AYV3VQ== From: Ekaitz Zarraga Message-ID: 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: , Reply-To: Ekaitz Zarraga Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From c223f97e9c00bc8904130199697e41236b8dad1d Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Sun, 6 Dec 2020 00:55:37 +0100 Subject: [PATCH 2/2] gnu: freecad: Update to 0.18.5 * gnu/packages/engineering.scm (freecad): Update to 0.18.5 --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.28.0 diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5a8977c940..e436994492 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2434,7 +2434,7 @@ full programmatic control over your models.") (define-public freecad (package (name "freecad") - (version "0.18.4") + (version "0.18.5") (source (origin (method git-fetch) @@ -2453,7 +2453,7 @@ full programmatic control over your models.") (file-name (git-file-name name version)) (sha256 (base32 - "170hk1kgrvsddrwykp24wyj0cha78zzmzbf50gn98x7ngqqs395s")))) + "0r31jzzkamf76l19fb175hhv48irk06fpi8ldxdlr31w8c1ix4aa")))) (build-system qt-build-system) (native-inputs `(("doxygen" ,doxygen)