[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/10: gnu: vtk: Update to 9.2.2.
From: |
guix-commits |
Subject: |
04/10: gnu: vtk: Update to 9.2.2. |
Date: |
Sat, 19 Nov 2022 16:10:05 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit b654726c4547364b035a7389ab25ee98c84b9308
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Nov 18 20:29:30 2022 +0100
gnu: vtk: Update to 9.2.2.
* gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/image-processing.scm (vtk): Update to 9.2.2.
[source](patches): Remove.
[arguments]: Remove #:phases.
---
gnu/local.mk | 1 -
gnu/packages/image-processing.scm | 14 ++--------
.../vtk-fix-freetypetools-build-failure.patch | 32 ----------------------
3 files changed, 2 insertions(+), 45 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index e51453aba9..4fc491a315 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1984,7 +1984,6 @@ dist_patch_DATA =
\
%D%/packages/patches/vsearch-unbundle-cityhash.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt1.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt2.patch \
- %D%/packages/patches/vtk-fix-freetypetools-build-failure.patch \
%D%/packages/patches/vtk-7-gcc-10-compat.patch \
%D%/packages/patches/vtk-7-hdf5-compat.patch \
%D%/packages/patches/vtk-7-python-compat.patch \
diff --git a/gnu/packages/image-processing.scm
b/gnu/packages/image-processing.scm
index 2c2cea1fac..fb45e9b141 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -316,7 +316,7 @@ many popular formats.")
(define-public vtk
(package
(name "vtk")
- (version "9.0.1")
+ (version "9.2.2")
(source (origin
(method url-fetch)
(uri (string-append "https://vtk.org/files/release/"
@@ -324,9 +324,7 @@ many popular formats.")
"/VTK-" version ".tar.gz"))
(sha256
(base32
- "1ir2lq9i45ls374lcmjzw0nrm5l5hnm1w47lg8g8d0n2j7hsaf8v"))
- (patches
- (search-patches "vtk-fix-freetypetools-build-failure.patch"))
+ "0x8h2bwxq2870067j7wqd0qym87pa3inkbri93zrdb0zwwmhlnqw"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -375,14 +373,6 @@ many popular formats.")
"-DVTK_WRAP_PYTHON=ON"
"-DVTK_PYTHON_VERSION:STRING=3"
)
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-sources
- (lambda _
- (substitute* "Common/Core/vtkFloatingPointExceptions.cxx"
- (("<fenv.h>") "<cfenv>"))
- (substitute* "Common/Core/CMakeLists.txt"
- (("fenv.h") "cfenv")))))
#:tests? #f)) ;XXX: test data not included
(inputs
(list double-conversion
diff --git a/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch
b/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch
deleted file mode 100644
index 23f651b5eb..0000000000
--- a/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This fixes a build failure in VTK when building against recent versions
-of freetype.
-
- https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7432
-
-Patch by Ben Boeckel <ben.boeckel@kitware.com>
-
-Subject: [PATCH] vtkFreeTypeTools: avoid using an internal macro
-
-This macro has been removed upstream as it was always intended to be
-private.
----
- Rendering/FreeType/vtkFreeTypeTools.cxx | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/Rendering/FreeType/vtkFreeTypeTools.cxx
b/Rendering/FreeType/vtkFreeTypeTools.cxx
-index c54289dc60..03b899c4da 100644
---- a/Rendering/FreeType/vtkFreeTypeTools.cxx
-+++ b/Rendering/FreeType/vtkFreeTypeTools.cxx
-@@ -378,8 +378,7 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMapCache()
- }
-
- //----------------------------------------------------------------------------
--FT_CALLBACK_DEF(FT_Error)
--vtkFreeTypeToolsFaceRequester(
-+static FT_Error vtkFreeTypeToolsFaceRequester(
- FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face)
- {
- #if VTK_FTFC_DEBUG_CD
---
-2.30.1
-
- branch master updated (b015b3f3a4 -> bd0ff2d39b), guix-commits, 2022/11/19
- 01/10: gnu: Remove obsolete variable., guix-commits, 2022/11/19
- 02/10: gnu: r-proj4: Build with newer proj., guix-commits, 2022/11/19
- 05/10: gnu: python-check-manifest: Use the 'fixed' git for tests., guix-commits, 2022/11/19
- 06/10: gnu: python-check-manifest: Update to 0.48.0., guix-commits, 2022/11/19
- 03/10: gnu: mia: Fix build with VTK 9.2., guix-commits, 2022/11/19
- 04/10: gnu: vtk: Update to 9.2.2.,
guix-commits <=
- 07/10: gnu: speech-dispatcher: Update to 0.11.4., guix-commits, 2022/11/19
- 08/10: gnu: make-lld-wrapper: Inherit version, license and home-page from LLD., guix-commits, 2022/11/19
- 09/10: gnu: FreeCAD: Build with coin3D@4., guix-commits, 2022/11/19
- 10/10: gnu: Remove coin3D@3., guix-commits, 2022/11/19