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 2KzFCpZS7l/OJwAA0tVLHw (envelope-from ) for ; Thu, 31 Dec 2020 22:37:10 +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 UCheBpZS7l9rCgAA1q6Kng (envelope-from ) for ; Thu, 31 Dec 2020 22:37:10 +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 CFC9F9402D6 for ; Thu, 31 Dec 2020 22:37:09 +0000 (UTC) Received: from localhost ([::1]:38674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kv6ZA-000616-PW for larch@yhetil.org; Thu, 31 Dec 2020 17:37:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kv6Z4-000610-OV for guix-patches@gnu.org; Thu, 31 Dec 2020 17:37:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58514) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kv6Z4-0001z2-HG for guix-patches@gnu.org; Thu, 31 Dec 2020 17:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kv6Z4-0002Gu-DW for guix-patches@gnu.org; Thu, 31 Dec 2020 17:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45573] [PATCH] Correct freecad runtime errors Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Dec 2020 22:37: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: Ekaitz Zarraga Received: via spool by 45573-submit@debbugs.gnu.org id=B45573.16094541948693 (code B ref 45573); Thu, 31 Dec 2020 22:37:02 +0000 Received: (at 45573) by debbugs.gnu.org; 31 Dec 2020 22:36:34 +0000 Received: from localhost ([127.0.0.1]:41827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv6Yb-0002G8-NK for submit@debbugs.gnu.org; Thu, 31 Dec 2020 17:36:34 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:39519) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv6YZ-0002Ft-IS for 45573@debbugs.gnu.org; Thu, 31 Dec 2020 17:36:32 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 830FD109E; Thu, 31 Dec 2020 17:36:25 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Thu, 31 Dec 2020 17:36:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-transfer-encoding:in-reply-to; s=mesmtp; bh=7XjAU+2+o7XbfqtqKA08ZGThf7mcfDWirmvgui633EE=; b=AaiZYbRMcK2m dZl1MFmqbnQbHTnTrt+SAQm1takRRbUFFG4iYWnpn7ySE+6LxB7YOjyCQ//mrKmU E4cmqEVsqoi0Jkl1ySEf7uveBztnTKptkSqA2JIXns+VUE3iizL/DLYCK7tMDHDl rQFsSBTqHG9dEtL66/pg4KtKHtRZ3lU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=7XjAU+2+o7XbfqtqKA08ZGThf7mcfDWirmvgui633 EE=; b=JP6PU+2gg02c7NFzun+pZhbut/zjRqLmET+rVikUJrE+4SWKPpPvR/Zwq jOuZa+Py+6GFfpIcUewevx1hxVnZ2A3R3XjTnhIC2EWHkm6pA3MpiIuOtiSqC/k6 ErogpXRsQhXTod4BcTt8pLP0XCnB1TgCVe4MFPPRrYfHWV7Vgv17u//AvvMtsm3K ASChpoMHcfrGwrwHywerfXnjY4J1mfZprm6soiZYraH7i5YG1yn/TR/AsZFmFRUM iksVSGEitArDInmpTB2sybdwQNGNmrcWxzwYeQeFBfIZcogsS2/80ojEs/FidJOd ol0rm/Y0bl5ryjfS7X+CSVne+eZGw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvddvhedgudeigecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggugfgjsehtkeertddttdejnecuhfhrohhmpefnvgho ucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrg htthgvrhhnpefgudffteettdekkeduhffgfefgieefgeeuieetudejffelieduueeifffg udfgudenucffohhmrghinhepghhnuhdrohhrghenucfkphepjeefrddugedurdduvdejrd dugeeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhep lhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id A1486108005B; Thu, 31 Dec 2020 17:36:24 -0500 (EST) Date: Thu, 31 Dec 2020 17:36:22 -0500 From: Leo Famulari Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: 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: , Cc: 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.33 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=famulari.name header.s=mesmtp header.b=AaiZYbRM; dkim=fail (headers rsa verify failed) header.d=messagingengine.com header.s=fm1 header.b=JP6PU+2g; dmarc=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: CFC9F9402D6 X-Spam-Score: -1.33 X-Migadu-Scanner: scn0.migadu.com X-TUID: 3/rSyiM+1mTJ 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 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! 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. > 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-pivy`, 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 — please add a comment — but perhaps it would be more appropriate in a custom build phase? > + (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). 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. ------ Can you send a revised patch series?