From unknown Sun Jun 22 00:54:47 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#70313] [PATCH] gnu: Add glvis. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Apr 2024 16:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70313 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70313@debbugs.gnu.org Cc: "Paul A. Patience" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17126819047024 (code B ref -1); Tue, 09 Apr 2024 16:59:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Apr 2024 16:58:24 +0000 Received: from localhost ([127.0.0.1]:51327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ruEng-0001pD-1H for submit@debbugs.gnu.org; Tue, 09 Apr 2024 12:58:24 -0400 Received: from lists.gnu.org ([2001:470:142::17]:45266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ruEnd-0001og-VJ for submit@debbugs.gnu.org; Tue, 09 Apr 2024 12:58:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ruEnP-0007Xb-OB for guix-patches@gnu.org; Tue, 09 Apr 2024 12:58:07 -0400 Received: from mail-40136.proton.ch ([185.70.40.136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ruEnM-0002Xj-9L for guix-patches@gnu.org; Tue, 09 Apr 2024 12:58:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1712681874; x=1712941074; bh=ScC3pYCTRgmXDOFqJRaMJ6EM18NQqaIPJ83YB8mTb2E=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=pjMKB6P0ML+2aA4LnvRrYSDf0x/15bNYZ9/q33l0gG+1Mg8uUgbVBvUun+pNm8auk uT41lzslc62VrBog+6ADsZsjXtf34DNGyhtdRaAS6YRIyjoR3nTkwTMhHN2EJbr7zL Dq6bsyBp+6sN19p6e1jgcHqFrRSEuJB73z5n5OX9wRBGVYEWPd2NwsocklZY57ufqv uAdgEtZiHWWijmFw8Wlzf2gKShE8dY7a+xVYebkej/oon63NUys94fP7GOrKey2hwL yTIgPDHmQEQaKvjBmY3yV0pYTCnpSOxS0rrFP3/snv1QVdvslnZuknRWjLHpB5dPQc idSxYXN4sEc2g== Date: Tue, 09 Apr 2024 16:57:35 +0000 From: "Paul A. Patience" Message-ID: <26c2c0ab2274cc68b1fae1e257dca4b14036c8a3.1712681651.git.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: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_SBL_A=0.1 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/graphics.scm (glvis): New variable. * gnu/packages/patches/glvis-fix-cmake-install.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: Idc7d4733ba81b63d95996cfb93f288c44d35db79 --- This patch requires MFEM, added in bug#70056 [1]. The update to the copyright header takes into account some changes I made in 2023. Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.1 URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist [URIs: glvis.org] 0.6 URIBL_SBL Contains an URL's NS IP listed in the Spamhaus SBL blocklist [URIs: glvis.org] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 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: 0.7 (/) * gnu/packages/graphics.scm (glvis): New variable. * gnu/packages/patches/glvis-fix-cmake-install.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: Idc7d4733ba81b63d95996cfb93f288c44d35db79 --- This patch requires MFEM, added in bug#70056 [1]. The update to the copyright header takes into account some changes I made i= n 2023. Best regards, Paul [1]: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D70056 gnu/local.mk | 1 + gnu/packages/graphics.scm | 44 ++++++++++++++++++- .../patches/glvis-fix-cmake-install.patch | 32 ++++++++++++++ 3 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glvis-fix-cmake-install.patch diff --git a/gnu/local.mk b/gnu/local.mk index dcedef5f99..5d6b1ba744 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1356,6 +1356,7 @@ dist_patch_DATA =3D=09=09=09=09=09=09\ %D%/packages/patches/glibc-2.29-supported-locales.patch =09\ %D%/packages/patches/glibc-supported-locales.patch =09\ %D%/packages/patches/glslang-install-static-libs.patch =09\ + %D%/packages/patches/glvis-fix-cmake-install.patch =09\ %D%/packages/patches/gmp-arm-asm-nothumb.patch=09=09\ %D%/packages/patches/gmp-faulty-test.patch=09=09=09\ %D%/packages/patches/gnash-fix-giflib-version.patch=09 \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 9bc81a3a81..79dfc5f4c6 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -31,7 +31,7 @@ ;;; Copyright =C2=A9 2022, 2023 John Kehayias ;;; Copyright =C2=A9 2022 Zheng Junjie <873216071@qq.com> ;;; Copyright =C2=A9 2022 Tobias Kortkamp -;;; Copyright =C2=A9 2022 Paul A. Patience +;;; Copyright =C2=A9 2022-2024 Paul A. Patience ;;; Copyright =C2=A9 2022 dan ;;; Copyright =C2=A9 2023 Sharlatan Hellseher ;;; Copyright =C2=A9 2023 David Thompson @@ -111,6 +111,7 @@ (define-module (gnu packages graphics) #:use-module (gnu packages pulseaudio) ; libsndfile, libsamplerate #:use-module (gnu packages python) #:use-module (gnu packages python-build) + #:use-module (gnu packages python-science) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) @@ -123,6 +124,7 @@ (define-module (gnu packages graphics) #:use-module (gnu packages upnp) #:use-module (gnu packages version-control) #:use-module (gnu packages video) + #:use-module (gnu packages vim) #:use-module (gnu packages vulkan) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) @@ -2859,6 +2861,46 @@ (define-public f3d options.") (license license:bsd-3))) =20 +(define-public glvis + (package + (name "glvis") + (version "4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/GLVis/glvis") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fb50vfw5dm12lhw8dw6jnwlyk8gh5281y5xbb92w7m92309f8iy")) + (patches (search-patches "glvis-fix-cmake-install.patch")))) + (build-system cmake-build-system) + (arguments + ;; Tests require data from https://github.com/GLVis/data. + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + ;; The glvis-keygen script itself is already executable, an= d + ;; the .sh extension leaks implementation details. + (add-after 'unpack 'fix-script-reference + (lambda _ + (substitute* "glvis.cpp" + ((" bash glvis-keygen\\.sh ") " glvis-keygen ")))) + (add-after 'install 'fix-script-name + (lambda _ + (with-directory-excursion (string-append #$output "/bin= ") + (rename-file "glvis-keygen.sh" "glvis-keygen"))))))) + (native-inputs + (list xxd)) + (inputs + (list fontconfig freetype glew glm libpng mfem sdl2)) + (home-page "https://glvis.org/") + (synopsis "Finite element visualizer") + (description "GLVis is an OpenGL tool for visualizing finite element m= eshes +and functions.") + (license license:bsd-3))) + (define-public gpaint (package (name "gpaint") diff --git a/gnu/packages/patches/glvis-fix-cmake-install.patch b/gnu/packa= ges/patches/glvis-fix-cmake-install.patch new file mode 100644 index 0000000000..06f3d9acb1 --- /dev/null +++ b/gnu/packages/patches/glvis-fix-cmake-install.patch @@ -0,0 +1,32 @@ +From 3983c1988d586f79c421f657f06f4f22dd7a9eb2 Mon Sep 17 00:00:00 2001 +From: "Paul A. Patience" +Date: Tue, 9 Apr 2024 11:18:14 -0400 +Subject: [PATCH] Don't install app and code in full installation + +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b940ec0..387cdb9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -331,12 +331,14 @@ if(NOT EMSCRIPTEN) + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/share/Info.cma= ke.plist.in) + target_link_libraries(app PRIVATE glvis glvis_logo) + install(TARGETS app ++ EXCLUDE_FROM_ALL + RUNTIME DESTINATION . + BUNDLE DESTINATION .) + install(CODE [[ + include (BundleUtilities) + fixup_bundle("${CMAKE_INSTALL_PREFIX}/GLVis.app" "" "") +- ]] COMPONENT RUNTIME) ++ ]] COMPONENT RUNTIME ++ EXCLUDE_FROM_ALL) +=20 + endif(NOT EMSCRIPTEN) +=20 +--=20 +2.41.0 + base-commit: a9111c38f3124d6b4c7fb4da8bf8dbfad318f1af --=20 2.41.0