From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id sP6/J5xd7l+HEAAA0tVLHw (envelope-from ) for ; Thu, 31 Dec 2020 23:24:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 0ChhI5xd7l86LgAA1q6Kng (envelope-from ) for ; Thu, 31 Dec 2020 23:24:12 +0000 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 63B539402D6 for ; Thu, 31 Dec 2020 23:24:11 +0000 (UTC) Received: from localhost ([::1]:59456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kv7Ig-0005aI-6e for larch@yhetil.org; Thu, 31 Dec 2020 18:24:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kv7IY-0005Z4-IH for guix-patches@gnu.org; Thu, 31 Dec 2020 18:24:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58542) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kv7IY-0000yS-BY for guix-patches@gnu.org; Thu, 31 Dec 2020 18:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kv7IY-0003PM-7W for guix-patches@gnu.org; Thu, 31 Dec 2020 18:24:02 -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 23:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45573 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Received: via spool by 45573-submit@debbugs.gnu.org id=B45573.160945703213068 (code B ref 45573); Thu, 31 Dec 2020 23:24:02 +0000 Received: (at 45573) by debbugs.gnu.org; 31 Dec 2020 23:23:52 +0000 Received: from localhost ([127.0.0.1]:41853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv7IN-0003Oh-Om for submit@debbugs.gnu.org; Thu, 31 Dec 2020 18:23:52 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:24831) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv7IJ-0003OS-SH for 45573@debbugs.gnu.org; Thu, 31 Dec 2020 18:23:50 -0500 Date: Thu, 31 Dec 2020 23:23:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=protonmail2; t=1609457020; bh=gY4UwR4K/ZcGn/p21yaxmdYj6JxrgsD2J8Yjm+oeUuI=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=NlOYMaJK+YmKDLzMtNSrgMGaEZF/43b0qUAnSkJeGyBFdfvw9lFekts0xpRoDjgQX wnc6ixaveYZzbxJn6ZZtIE98KsIVvBvyUvOjATUGG5b/0AXlACZj6AKmXdTNOj/UlW FxGQCwMUr5uIdvQwDvNqFLCU/R1TR+WwcgBOlN1ylqhJYghAMphPR1HiXywmLypkIe aHPtBRKbxiJSBl4eRCHnMRsfuRK0+e6RWiSCEvE89rmQNZGcU+iczXWiSV4q4S8Tiw 6DHTl63Kxo/FiAuYMFd8YtoTCZshwLj2XNgu7W2Bj9BBdX+930jiuQ31oDlv0IuxXP +u8FqSYDtazQQ== From: Ekaitz Zarraga Message-ID: <6b2IbqX7a-q86Pjb_nOtz_XcCOrATSHf2T7vfIU5qrXWhYtQFsoex3XlfmDVhLt8UXjnOonMiLCS-1oKUzxXpp8x3HSUjNkzUjhUsKGc3Iw=@elenq.tech> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 Cc: "45573@debbugs.gnu.org" <45573@debbugs.gnu.org> Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.23 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=elenq.tech header.s=protonmail2 header.b=NlOYMaJK; dmarc=fail reason="SPF not aligned (relaxed)" header.from=elenq.tech (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 63B539402D6 X-Spam-Score: -1.23 X-Migadu-Scanner: scn1.migadu.com X-TUID: TWixIA9qqt5Z Hi, =E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90 Original Me= ssage =E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90 On Thursday, December 31, 2020 11:36 PM, Leo Famulari w= rote: > On Thu, Dec 31, 2020 at 06:47:59PM +0000, Ekaitz Zarraga wrote: > > > 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 pi= vy was not added as a dependency. > > For context, see this message: > > https://lists.gnu.org/archive/html/guix-devel/2020-12/msg00123.html > > Thanks! > > Here is my feedback: > > > Subject: [PATCH 1/4] gnu: Add coin3D-4. > > > > * gnu/packages/graphics.scm (coin3D-4): New variable. > > > > > - (snippet > > > > > > - '(begin > > > > > > - (for-each delete-file > > > > > > - '("cfg/csubst.exe" > > > > > > - "cfg/wrapmsvc.exe")) > > > > > > Please add a brief code comment like "Delete binaries". > > > - (substitute* "CMakeLists.txt" > > > > > > - ((".*cpack.d.*") "")) > > > > > > - #t)))) > > > > > > What does this do? Please add an explanatory comment. It removes an unnecessary library. I'll add a comment. > > Subject: [PATCH 3/4] gnu: Add python-pivy. > > > > * gnu/packages/python-xyz.scm (python-pivy): New variable. > > > > > - (snippet > > > > > > - '(begin > > > > > > - (substitute* "CMakeLists.txt" > > > > > > - (("\\\\$\\\\{SoQt_INCLUDE_DIRS}") > > > > > > - "${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}= ")) > > > > > > - #t)))) > > > > > > Origin snippets affect what is returned by`guix build --source python-piv= y`, and are used for correcting very serious bugs in the > source code or for fixing so-called "freedom issues", such as removing > pre-compiled binaries. > > We prefer to make other types of changes in custom build phases in a > package's arguments. I'm not sure exactly what this substitution does = =E2=80=94 > please add a comment =E2=80=94 but perhaps it would be more appropriate i= n a > custom build phase? This substitution corrects the repository. By default the repository doesn't find Coin3D, so we need to insert its sea= rch path by hand. What's the best way to add this? > > - (arguments > > - `(#:tests? #f)) > > > > > > Why are the tests disabled? We aim to make Guix packages pass upstream > test suites, so there should be a reason for skipping them. If there is > no test suite, just add a comment saying so. Same question about the > soqt package. > > > Subject: [PATCH 4/4] gnu: freecad correct runtime errors > > > > * gnu/packages/engineering.scm (freecad): Update package > > [inputs]: Move python-pyside-2-tools to native-inputs > > [inputs]: Add pivy > > [inputs]: Add qtxmlpatterns > > [inputs]: Add qtwebkit > > > > Are all of these changes necessary to fix the errors? If not, we prefer > to split the changes up into separate commits. For example, one commit > to update the package, one commit to fix the errors, one commit to > enable some optional feature (e.g. requiring qtwebkit). Ok, I'll separate the qtwebkit as it's not necessary for this fix. > If all the changes must be made together, that's fine too. > > The commit message should be rewritten, but exactly how depends on > answers to my previous questions. It could be written like this: > > -------------------------------------------------------------------------= ---------------------------------------------------------------------------= ---------------------------------------------------------------------------= ---------------------------------------------------------------------------= ---------------------------------------------------------------------------= ---------------------------------------------------------------------------= ------------- > > gnu: FreeCad: Update to 0.18.5-1.7616153. > > Fixes description of bug. > > - gnu/packages/engineering.scm (freecad): Update to 0.18.5-1.7616153. > [inputs]: Add python-pivy, qtxmlpatterns, and qtwebkit. Remove > python-pyside-2-tools. > [native-inputs]: Add python-pyside-2-tools. I'll change that. > Can you send a revised patch series? Of course. I'll write a follow up soon. Happy new year. Ekaitz