From unknown Thu Aug 14 21:46:50 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#57550 <57550@debbugs.gnu.org> To: bug#57550 <57550@debbugs.gnu.org> Subject: Status: [PATCH] gnu: f3d: Update to 1.3.0-pre-0.46df21f. Reply-To: bug#57550 <57550@debbugs.gnu.org> Date: Fri, 15 Aug 2025 04:46:50 +0000 retitle 57550 [PATCH] gnu: f3d: Update to 1.3.0-pre-0.46df21f. reassign 57550 guix-patches submitter 57550 "Paul A. Patience" severity 57550 normal tag 57550 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 02 15:03:44 2022 Received: (at submit) by debbugs.gnu.org; 2 Sep 2022 19:03:45 +0000 Received: from localhost ([127.0.0.1]:40426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oUBx0-0001Oz-VO for submit@debbugs.gnu.org; Fri, 02 Sep 2022 15:03:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:35406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oUBwx-0001Or-O4 for submit@debbugs.gnu.org; Fri, 02 Sep 2022 15:03:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUBwx-0007tP-B0 for guix-patches@gnu.org; Fri, 02 Sep 2022 15:03:31 -0400 Received: from mail-40136.proton.ch ([185.70.40.136]:63593) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUBwt-0002lM-Bp for guix-patches@gnu.org; Fri, 02 Sep 2022 15:03:30 -0400 Date: Fri, 02 Sep 2022 19:03:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1662145397; x=1662404597; bh=BpIhDVH3wPXREdUU5x+gTsOM9a/EmawvOs8460FLaHw=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:Feedback-ID:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID; b=GQJ6lNDGEGW08MxBUIXr+WIipJLRTqEdKVWsL6XQBoNsFpR/S+JmS1FChbHmzvXhX NwdeAohNWDYpfKfSewMFpnc1sP74PBZHf16aKtLZ+e1AscQjqk/JblcAgAW8CuA1ua qqnJJo98hLKThLzMFp+NaLlJtnArr/q1AzkB2IGkSl9QpxIOnhXceKwiyR2/L4hnYY qK3MPHYaDq/DJsBHOIwx9+sKlvw2BwlR+ccv8izZp3c+V11/tRPtkL1x7+CqISHCaJ 7yLD89SbF/BduSf8/pNqidFYYOmCCf25bkiUpcIVAxmI6DHJYJfNHZAAcRcz21pQoy 9uTZcIdmYT3Vg== To: guix-patches@gnu.org From: "Paul A. Patience" Subject: [PATCH] gnu: f3d: Update to 1.3.0-pre-0.46df21f. Message-ID: <20220902190300.6498-1-paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.40.136; envelope-from=paul@apatience.com; helo=mail-40136.proton.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: "Paul A. Patience" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: "Paul A. Patience" Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/graphics.scm (f3d): Update to 1.3.0-pre-0.46df21f. [source](modules, snippet): New fields. [arguments]<#:configure-flags>: Generate manual page, install various resource files, and enable the now-optional external rendering feature. [native-inputs]: New field. [synopsis]: Add hyphen. [description]: Reword. --- gnu/packages/graphics.scm | 64 ++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index fdc72d5a8d..5908bb76c0 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -61,6 +61,7 @@ (define-module (gnu packages graphics) #:use-module (gnu packages cdrom) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages datastructures) #:use-module (gnu packages documentation) @@ -88,6 +89,7 @@ (define-module (gnu packages graphics) #:use-module (gnu packages logging) #:use-module (gnu packages llvm) #:use-module (gnu packages lua) + #:use-module (gnu packages man) #:use-module (gnu packages maths) #:use-module (gnu packages mp3) #:use-module (gnu packages multiprecision) @@ -2299,11 +2301,14 @@ (define-public f3d ;; There have been many improvements since the last tagged version (1.2.= 1, ;; released in December 2021), including support for the Alembic file ;; format. - (let ((commit "9cc79b65ed750b178f58012dbba091aa24722dab") + (let ((commit "46df21fe9409349917af5e6f7d1cb931f4c68e59") (revision "0")) (package (name "f3d") - (version (git-version "1.2.1" revision commit)) + ;; F3D has not actually been tagged as 1.3.0-pre, but upstream commi= t + ;; 401d4d27b2094568378c07f400fbad48b7af3168 updated the version stri= ng + ;; to 1.3.0. + (version (git-version "1.3.0-pre" revision commit)) (source (origin (method git-fetch) @@ -2312,29 +2317,52 @@ (define-public f3d (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "041gqi2wfny2br4j68vhifg0bd18kbl0qsaallkz7yywk47njxfi"))= )) + (base32 "0x0jw9vqf1b8pxh84xpr47hzcjynk07dp8q7r2xihh9cd00kglp1")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file "application/cxxopts.hpp") + (delete-file "application/json.hpp") + (substitute* "application/F3DOptionsParser.cxx" + (("^#include \"cxxopts\\.hpp\"") + "#include ") + (("^#include \"json\\.hpp\"") + "#include ")))))) (build-system cmake-build-system) + ;; The package cannot easily be split into out and lib outputs becau= se + ;; VTK's vtkModule.cmake complains, and also the CMake files in + ;; /lib/cmake/f3d expect the f3d executable and library to be availa= ble, + ;; as they set up targets for both of them. (arguments (list ;; Many tests require files supplied by git-lfs. ;; Also, some tests segfault (after an exception?) but the tested ;; behavior, i.e., when the program is run manually, does not (for ;; example, TestNonExistentConfigFile and TestInvalidConfigFile). - ;; Upstream is aware of occasionally flaky tests (see - ;; https://github.com/f3d-app/f3d/issues/92) but the tests run in = CI - ;; seem to be passing. + ;; Upstream is aware of occasionally flaky tests [1], but the test= s + ;; run in CI seem to be passing. ;; Anyway, the program runs and is able to open at least STL files ;; without issue. + ;; + ;; [1]: https://github.com/f3d-app/f3d/issues/92 #:tests? #f #:configure-flags - #~(list "-DBUILD_TESTING=3DOFF" + #~(list (string-append "-DCMAKE_INSTALL_DOCDIR=3D" #$output + "/share/doc/" #$name "-" #$version) + "-DBUILD_TESTING=3DOFF" + "-DF3D_GENERATE_MAN=3DON" + "-DF3D_INSTALL_DEFAULT_CONFIGURATION_FILE=3DON" + "-DF3D_INSTALL_DEFAULT_CONFIGURATION_FILE_IN_PREFIX=3DON" + "-DF3D_INSTALL_MIME_TYPES_FILE=3DON" + "-DF3D_INSTALL_THUMBNAILER_FILES=3DON" "-DF3D_MODULE_ALEMBIC=3DON" "-DF3D_MODULE_ASSIMP=3DON" - "-DF3D_MODULE_OCCT=3DON" - ;; Prefer Guix's versioned documentation directory to F3D'= s - ;; unversioned one. - (string-append "-DCMAKE_INSTALL_DOCDIR=3D" #$output - "/share/doc/" #$name "-" #$version)))) + "-DF3D_MODULE_EXTERNAL_RENDERING=3DON" + "-DF3D_MODULE_OCCT=3DON"))) + (native-inputs + (list cxxopts + help2man + json-modern-cxx)) (inputs (list alembic assimp @@ -2357,10 +2385,10 @@ (define-public f3d vtk zlib)) (home-page "https://f3d-app.github.io/f3d/") - (synopsis "VTK based 3D viewer") - (description "F3D (pronounced @samp{/f=C9=9Bd/}) is a VTK-based 3D v= iewer, it -has simple interaction mechanisms and is fully controllable using argument= s on -the command line. It supports a range of file formats (including animated -glTF, STL, STEP, PLY, OBJ, FBX), and provides numerous rendering and textu= ring -options.") + (synopsis "VTK-based 3D viewer") + (description "F3D (pronounced @samp{/f=C9=9Bd/}) is a VTK-based 3D v= iewer +with simple interaction mechanisms and which is fully controllable using +arguments on the command line. It supports a range of file formats (inclu= ding +animated glTF, STL, STEP, PLY, OBJ, FBX), and provides numerous rendering = and +texturing options.") (license license:bsd-3)))) -- 2.37.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 04 14:02:07 2022 Received: (at 57550-done) by debbugs.gnu.org; 4 Sep 2022 18:02:07 +0000 Received: from localhost ([127.0.0.1]:45660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oUtwd-0001o6-Gt for submit@debbugs.gnu.org; Sun, 04 Sep 2022 14:02:07 -0400 Received: from mira.cbaines.net ([212.71.252.8]:41410) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oUtwb-0001ny-HK for 57550-done@debbugs.gnu.org; Sun, 04 Sep 2022 14:02:06 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id EDBD427BBE9; Sun, 4 Sep 2022 19:02:04 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id e5fe3c73; Sun, 4 Sep 2022 18:02:04 +0000 (UTC) References: <20220902190300.6498-1-paul@apatience.com> User-agent: mu4e 1.6.11; emacs 28.1 From: Christopher Baines To: "Paul A. Patience" Subject: Re: [bug#57550] [PATCH] gnu: f3d: Update to 1.3.0-pre-0.46df21f. Date: Sun, 04 Sep 2022 19:01:29 +0100 In-reply-to: <20220902190300.6498-1-paul@apatience.com> Message-ID: <87fsh73tnn.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57550-done Cc: 57550-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain "Paul A. Patience" writes: > * gnu/packages/graphics.scm (f3d): Update to 1.3.0-pre-0.46df21f. > [source](modules, snippet): New fields. > [arguments]<#:configure-flags>: Generate manual page, install various > resource files, and enable the now-optional external rendering feature. > [native-inputs]: New field. > [synopsis]: Add hyphen. > [description]: Reword. > --- > gnu/packages/graphics.scm | 64 ++++++++++++++++++++++++++++----------- > 1 file changed, 46 insertions(+), 18 deletions(-) Thanks, I've pushed this to master as 75febb00a57b69d41e989af0487446105fae32a5. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmMU6BxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdBUA//ag1G2slwTvonzzyvNqf1zAOmgs9HDIoK FwfG61rk13+Ftj8k6K5/KlvpQ7Ds0lVJt2d1qlamv88su7od/ohv/D0ezOATPtWl uYtFVDOJ+t8o0uAneTRB6AK6rhF032ZQfDzse2WWuQr8tA/ogeOs1VQhgrsk0nd7 OM5tQdgN7zJkqAKLQId+jJ5ewc0b0Atd6a83Gcu9YdRnWm8kmjo6cvzG9HNpqKAy nnguNj+hloShu6oUSxga45l9A7lPyGyeJ8a4l1ZSYXej2tXtHUaeYlKf7gn4NhWp FqT9QZTW0GmjBMiHyMvTnRbnHfxwjeEZayXBYJInQrknb4fVfSIg6p3FzRjZav0+ WZ3vcyvhX/L8THR20xQx2JW8Q6DVlBgJwsTEUBVUmoXy0hvRmpT4HInRjBaAar0w 9WaN0OYj3MWSUyoRgjM7y6w6mNECXIa6NIfEVsS6b0vybePZAP+2qEBgfScCcbR0 8UBfSzHsi87R4ZxV625KPJZQ8CaE3Hqnu+o0+vLewyfxhbSTlz6/iS5PVf3T4rrA e8PG+5h5iCvj7nq0BVJoRx0xA/qVDf4HKV5pVJcm6wSL/pYfqOeWqQ30n69E4Qwe 3nhfqV8HHo67hE1W0UceWU24u0ccj/8QT1SQLpY4oaKv+a60Jzf6fAq9rEPrSljy jv7UD1ayjzU= =C3GG -----END PGP SIGNATURE----- --=-=-=-- From unknown Thu Aug 14 21:46:50 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 03 Oct 2022 11:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator