* [PR PATCH] paraview: update to 5.9.0.
@ 2021-03-21 9:54 sgn
2021-03-21 9:58 ` [PR PATCH] [Updated] " sgn
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: sgn @ 2021-03-21 9:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages paraview-update
https://github.com/void-linux/void-packages/pull/29648
paraview: update to 5.9.0.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29648.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-paraview-update-29648.patch --]
[-- Type: text/x-diff, Size: 6933 bytes --]
From 60105225fd93b41d8b20262c9e09737792635e67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 21 Mar 2021 14:37:24 +0700
Subject: [PATCH] paraview: update to 5.9.0.
---
srcpkgs/paraview/patches/cmake-py39.patch | 11 ------
.../patches/fix-vtksys-execinfo.patch | 12 -------
...etype-2.10.3-provide-FT_CALLBACK_DEF.patch | 19 ++++++++++
srcpkgs/paraview/template | 36 ++++++++++---------
4 files changed, 39 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/paraview/patches/cmake-py39.patch
delete mode 100644 srcpkgs/paraview/patches/fix-vtksys-execinfo.patch
create mode 100644 srcpkgs/paraview/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
diff --git a/srcpkgs/paraview/patches/cmake-py39.patch b/srcpkgs/paraview/patches/cmake-py39.patch
deleted file mode 100644
index b309d596c816..000000000000
--- a/srcpkgs/paraview/patches/cmake-py39.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- VTK/CMake/patches/99/FindPython/Support.cmake.orig 2020-10-08 00:54:51.788984364 -0400
-+++ VTK/CMake/patches/99/FindPython/Support.cmake 2020-10-08 00:54:56.640977251 -0400
-@@ -46,7 +46,7 @@
- message (FATAL_ERROR "FindPython: INTERNAL ERROR")
- endif()
- if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3)
-- set(_${_PYTHON_PREFIX}_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-+ set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
- elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2)
- set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
- else()
diff --git a/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch b/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch
deleted file mode 100644
index fc17223a066a..000000000000
--- a/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- VTK/Utilities/KWSys/vtksys/CMakeLists.txt 2020-08-30 14:24:27.200081977 +0200
-+++ VTK/Utilities/KWSys/vtksys/CMakeLists.txt 2020-08-30 14:26:38.533088752 +0200
-@@ -592,7 +592,8 @@
- # check for simple stack trace
- # usually it's in libc but on FreeBSD
- # it's in libexecinfo
-- FIND_LIBRARY(EXECINFO_LIB "execinfo")
-+ FIND_PACKAGE(PkgConfig REQUIRED)
-+ PKG_CHECK_MODULES(EXECINFO IMPORTED_TARGET libexecinfo)
- MARK_AS_ADVANCED(EXECINFO_LIB)
- IF (NOT EXECINFO_LIB)
- SET(EXECINFO_LIB "")
diff --git a/srcpkgs/paraview/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/srcpkgs/paraview/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
new file mode 100644
index 000000000000..b95015c859cf
--- /dev/null
+++ b/srcpkgs/paraview/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
@@ -0,0 +1,19 @@
+ https://gitlab.kitware.com/vtk/vtk/-/issues/18033
+--- VTK/ThirdParty/freetype/vtk_freetype.h.in.orig
++++ VTK/ThirdParty/freetype/vtk_freetype.h.in
+@@ -20,6 +20,15 @@
+
+ #ifdef VTK_USE_SYSTEM_FREETYPE
+ # include <ft2build.h>
++/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
++/* has been moved to <freetype/internal/compiler-macros.h> */
++# ifndef FT_CALLBACK_DEF
++# ifdef __cplusplus
++# define FT_CALLBACK_DEF( x ) extern "C" x
++# else
++# define FT_CALLBACK_DEF( x ) static x
++# endif
++# endif /* FT_CALLBACK_DEF */
+ #else
+ # include <vtkfreetype/include/ft2build.h>
+ #endif
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
index 20a7f5589677..b6c9298208ed 100644
--- a/srcpkgs/paraview/template
+++ b/srcpkgs/paraview/template
@@ -1,23 +1,28 @@
# Template file for 'paraview'
pkgname=paraview
-version=5.8.1
-revision=3
+version=5.9.0
+revision=1
wrksrc=ParaView-v${version}
build_style=cmake
-configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
+configure_args="
+ -DCMAKE_BUILD_TYPE=None
-DPARAVIEW_ENABLE_FFMPEG=ON
-DPARAVIEW_ENABLE_GDAL=ON
-DPARAVIEW_USE_PYTHON=ON
-DPARAVIEW_USE_MPI=ON
- -DVTK_PYTHON_FULL_THREADSAFE=ON
- -DVTK_PYTHON_VERSION=3
- -DVTK_SMP_IMPLEMENTATION_TYPE=TBB
- -DVTKm_ENABLE_MPI=ON
- -DVTKm_ENABLE_RENDERING=ON
- -DVTKm_USE_DOUBLE_PRECISION=ON"
+ -DPARAVIEW_BUILD_SHARED_LIBS=ON
+ -DPARAVIEW_BUILD_WITH_EXTERNAL=ON
+ -DVTK_MODULE_USE_EXTERNAL_ParaView_cgns=OFF
+ -DVTK_FORBID_DOWNLOADS=ON
+ -DVTK_USE_EXTERNAL=ON
+ -DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
+ -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
#make_build_args="VERBOSE=1"
-hostmakedepends="pkg-config which python3"
+hostmakedepends="pkg-config which python3 protobuf"
# TODO: find some way of making this work with system vtk
+# CMake/ParaViewOptions.cmake:/PARAVIEW_USE_EXTERNAL_VTK
makedepends="MesaLib-devel libfreeglut-devel glu-devel libXt-devel
openmpi-devel qt5-devel qt5-x11extras-devel qt5-tools-devel qt5-plugin-mysql
qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
@@ -25,15 +30,15 @@ makedepends="MesaLib-devel libfreeglut-devel glu-devel libXt-devel
expat-devel freetype-devel glew-devel hdf5-devel libjpeg-turbo-devel
jsoncpp-devel proj-devel libxml2-devel liblzma-devel liblz4-devel netcdf-devel
libogg-devel libpng-devel pugixml-devel libtheora-devel tiff-devel zlib-devel
- protobuf-devel protobuf python3-Pygments ffmpeg-devel tbb-devel boost-devel
- libgdal-devel python3-mpi4py"
+ protobuf-devel libprotoc-devel python3-Pygments ffmpeg-devel tbb-devel
+ vtk-devel boost-devel libgdal-devel python3-mpi4py gl2ps-devel proj-devel"
depends="openmpi"
short_desc="Application for interactive, scientific visualization"
maintainer="Anders Damsgaard <anders@adamsgaard.dk>"
license="BSD-3-Clause"
homepage="https://www.paraview.org"
-distfiles="https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${version:0:3}&type=source&os=Sources&downloadFile=ParaView-v${version}.tar.xz>paraview-${version}.tar.xz"
-checksum=7653950392a0d7c0287c26f1d3a25cdbaa11baa7524b0af0e6a1a0d7d487d034
+distfiles="https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${version:0:3}&type=source&os=Sources&downloadFile=ParaView-v${version}.tar.xz>ParaView-v${version}.tar.xz"
+checksum=b03258b7cddb77f0ee142e3e77b377e5b1f503bcabc02bfa578298c99a06980d
CFLAGS="-DYYERROR_VERBOSE -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DGNU_SOURCE -fcommon"
CXXFLAGS="${CFLAGS}"
@@ -43,6 +48,7 @@ export QT_SELECT="5"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
+ export LDFLAGS=-lexecinfo
configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"
fi
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -53,8 +59,6 @@ post_extract() {
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
echo "vtk_module_link(VTK::CommonDataModel PRIVATE atomic)" >> \
VTK/Common/DataModel/CMakeLists.txt
- echo "target_link_libraries(protobuf PRIVATE atomic)" >> \
- ThirdParty/protobuf/vtkprotobuf/src/CMakeLists.txt
fi
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] paraview: update to 5.9.0.
2021-03-21 9:54 [PR PATCH] paraview: update to 5.9.0 sgn
@ 2021-03-21 9:58 ` sgn
2021-04-04 11:01 ` sgn
2021-06-07 8:43 ` [PR PATCH] [Closed]: " sgn
2 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2021-03-21 9:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1593 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages paraview-update
https://github.com/void-linux/void-packages/pull/29648
paraview: update to 5.9.0.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29648.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-paraview-update-29648.patch --]
[-- Type: text/x-diff, Size: 6613 bytes --]
From aafe4805d9c74471fb4ea9313a9cff3f0fe3957e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 21 Mar 2021 14:37:24 +0700
Subject: [PATCH] paraview: update to 5.9.0.
---
srcpkgs/paraview/patches/cmake-py39.patch | 11 ------
.../patches/fix-vtksys-execinfo.patch | 12 -------
...etype-2.10.3-provide-FT_CALLBACK_DEF.patch | 19 +++++++++++
srcpkgs/paraview/template | 34 +++++++++++--------
4 files changed, 39 insertions(+), 37 deletions(-)
delete mode 100644 srcpkgs/paraview/patches/cmake-py39.patch
delete mode 100644 srcpkgs/paraview/patches/fix-vtksys-execinfo.patch
create mode 100644 srcpkgs/paraview/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
diff --git a/srcpkgs/paraview/patches/cmake-py39.patch b/srcpkgs/paraview/patches/cmake-py39.patch
deleted file mode 100644
index b309d596c816..000000000000
--- a/srcpkgs/paraview/patches/cmake-py39.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- VTK/CMake/patches/99/FindPython/Support.cmake.orig 2020-10-08 00:54:51.788984364 -0400
-+++ VTK/CMake/patches/99/FindPython/Support.cmake 2020-10-08 00:54:56.640977251 -0400
-@@ -46,7 +46,7 @@
- message (FATAL_ERROR "FindPython: INTERNAL ERROR")
- endif()
- if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3)
-- set(_${_PYTHON_PREFIX}_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-+ set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
- elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2)
- set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
- else()
diff --git a/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch b/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch
deleted file mode 100644
index fc17223a066a..000000000000
--- a/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- VTK/Utilities/KWSys/vtksys/CMakeLists.txt 2020-08-30 14:24:27.200081977 +0200
-+++ VTK/Utilities/KWSys/vtksys/CMakeLists.txt 2020-08-30 14:26:38.533088752 +0200
-@@ -592,7 +592,8 @@
- # check for simple stack trace
- # usually it's in libc but on FreeBSD
- # it's in libexecinfo
-- FIND_LIBRARY(EXECINFO_LIB "execinfo")
-+ FIND_PACKAGE(PkgConfig REQUIRED)
-+ PKG_CHECK_MODULES(EXECINFO IMPORTED_TARGET libexecinfo)
- MARK_AS_ADVANCED(EXECINFO_LIB)
- IF (NOT EXECINFO_LIB)
- SET(EXECINFO_LIB "")
diff --git a/srcpkgs/paraview/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/srcpkgs/paraview/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
new file mode 100644
index 000000000000..b95015c859cf
--- /dev/null
+++ b/srcpkgs/paraview/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
@@ -0,0 +1,19 @@
+ https://gitlab.kitware.com/vtk/vtk/-/issues/18033
+--- VTK/ThirdParty/freetype/vtk_freetype.h.in.orig
++++ VTK/ThirdParty/freetype/vtk_freetype.h.in
+@@ -20,6 +20,15 @@
+
+ #ifdef VTK_USE_SYSTEM_FREETYPE
+ # include <ft2build.h>
++/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
++/* has been moved to <freetype/internal/compiler-macros.h> */
++# ifndef FT_CALLBACK_DEF
++# ifdef __cplusplus
++# define FT_CALLBACK_DEF( x ) extern "C" x
++# else
++# define FT_CALLBACK_DEF( x ) static x
++# endif
++# endif /* FT_CALLBACK_DEF */
+ #else
+ # include <vtkfreetype/include/ft2build.h>
+ #endif
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
index 20a7f5589677..623d0cd434ed 100644
--- a/srcpkgs/paraview/template
+++ b/srcpkgs/paraview/template
@@ -1,23 +1,28 @@
# Template file for 'paraview'
pkgname=paraview
-version=5.8.1
-revision=3
+version=5.9.0
+revision=1
wrksrc=ParaView-v${version}
build_style=cmake
-configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
+configure_args="
+ -DCMAKE_BUILD_TYPE=None
-DPARAVIEW_ENABLE_FFMPEG=ON
-DPARAVIEW_ENABLE_GDAL=ON
-DPARAVIEW_USE_PYTHON=ON
-DPARAVIEW_USE_MPI=ON
- -DVTK_PYTHON_FULL_THREADSAFE=ON
- -DVTK_PYTHON_VERSION=3
- -DVTK_SMP_IMPLEMENTATION_TYPE=TBB
- -DVTKm_ENABLE_MPI=ON
- -DVTKm_ENABLE_RENDERING=ON
- -DVTKm_USE_DOUBLE_PRECISION=ON"
+ -DPARAVIEW_BUILD_SHARED_LIBS=ON
+ -DPARAVIEW_BUILD_WITH_EXTERNAL=ON
+ -DVTK_MODULE_USE_EXTERNAL_ParaView_cgns=OFF
+ -DVTK_FORBID_DOWNLOADS=ON
+ -DVTK_USE_EXTERNAL=ON
+ -DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
+ -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
#make_build_args="VERBOSE=1"
-hostmakedepends="pkg-config which python3"
+hostmakedepends="pkg-config which python3 protobuf"
# TODO: find some way of making this work with system vtk
+# CMake/ParaViewOptions.cmake:/PARAVIEW_USE_EXTERNAL_VTK
makedepends="MesaLib-devel libfreeglut-devel glu-devel libXt-devel
openmpi-devel qt5-devel qt5-x11extras-devel qt5-tools-devel qt5-plugin-mysql
qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
@@ -25,15 +30,15 @@ makedepends="MesaLib-devel libfreeglut-devel glu-devel libXt-devel
expat-devel freetype-devel glew-devel hdf5-devel libjpeg-turbo-devel
jsoncpp-devel proj-devel libxml2-devel liblzma-devel liblz4-devel netcdf-devel
libogg-devel libpng-devel pugixml-devel libtheora-devel tiff-devel zlib-devel
- protobuf-devel protobuf python3-Pygments ffmpeg-devel tbb-devel boost-devel
- libgdal-devel python3-mpi4py"
+ protobuf-devel libprotoc-devel python3-Pygments ffmpeg-devel tbb-devel
+ boost-devel libgdal-devel python3-mpi4py gl2ps-devel proj-devel"
depends="openmpi"
short_desc="Application for interactive, scientific visualization"
maintainer="Anders Damsgaard <anders@adamsgaard.dk>"
license="BSD-3-Clause"
homepage="https://www.paraview.org"
-distfiles="https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${version:0:3}&type=source&os=Sources&downloadFile=ParaView-v${version}.tar.xz>paraview-${version}.tar.xz"
-checksum=7653950392a0d7c0287c26f1d3a25cdbaa11baa7524b0af0e6a1a0d7d487d034
+distfiles="https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${version:0:3}&type=source&os=Sources&downloadFile=ParaView-v${version}.tar.xz>ParaView-v${version}.tar.xz"
+checksum=b03258b7cddb77f0ee142e3e77b377e5b1f503bcabc02bfa578298c99a06980d
CFLAGS="-DYYERROR_VERBOSE -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DGNU_SOURCE -fcommon"
CXXFLAGS="${CFLAGS}"
@@ -43,6 +48,7 @@ export QT_SELECT="5"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
+ export LDFLAGS=-lexecinfo
configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"
fi
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] paraview: update to 5.9.0.
2021-03-21 9:54 [PR PATCH] paraview: update to 5.9.0 sgn
2021-03-21 9:58 ` [PR PATCH] [Updated] " sgn
@ 2021-04-04 11:01 ` sgn
2021-06-07 8:43 ` [PR PATCH] [Closed]: " sgn
2 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2021-04-04 11:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1593 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages paraview-update
https://github.com/void-linux/void-packages/pull/29648
paraview: update to 5.9.0.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29648.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-paraview-update-29648.patch --]
[-- Type: text/x-diff, Size: 7556 bytes --]
From 0fff241eeb8d3f70a2c7c3dbe3430e7216af8a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 21 Mar 2021 14:37:24 +0700
Subject: [PATCH] paraview: update to 5.9.0.
---
srcpkgs/paraview/patches/cmake-py39.patch | 11 ------
.../patches/fix-vtksys-execinfo.patch | 12 -------
srcpkgs/paraview/patches/musl-unistd.patch | 23 +++++++++++++
...etype-2.10.3-provide-FT_CALLBACK_DEF.patch | 19 +++++++++++
srcpkgs/paraview/template | 34 +++++++++++--------
5 files changed, 62 insertions(+), 37 deletions(-)
delete mode 100644 srcpkgs/paraview/patches/cmake-py39.patch
delete mode 100644 srcpkgs/paraview/patches/fix-vtksys-execinfo.patch
create mode 100644 srcpkgs/paraview/patches/musl-unistd.patch
create mode 100644 srcpkgs/paraview/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
diff --git a/srcpkgs/paraview/patches/cmake-py39.patch b/srcpkgs/paraview/patches/cmake-py39.patch
deleted file mode 100644
index b309d596c816..000000000000
--- a/srcpkgs/paraview/patches/cmake-py39.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- VTK/CMake/patches/99/FindPython/Support.cmake.orig 2020-10-08 00:54:51.788984364 -0400
-+++ VTK/CMake/patches/99/FindPython/Support.cmake 2020-10-08 00:54:56.640977251 -0400
-@@ -46,7 +46,7 @@
- message (FATAL_ERROR "FindPython: INTERNAL ERROR")
- endif()
- if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3)
-- set(_${_PYTHON_PREFIX}_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-+ set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
- elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2)
- set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
- else()
diff --git a/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch b/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch
deleted file mode 100644
index fc17223a066a..000000000000
--- a/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- VTK/Utilities/KWSys/vtksys/CMakeLists.txt 2020-08-30 14:24:27.200081977 +0200
-+++ VTK/Utilities/KWSys/vtksys/CMakeLists.txt 2020-08-30 14:26:38.533088752 +0200
-@@ -592,7 +592,8 @@
- # check for simple stack trace
- # usually it's in libc but on FreeBSD
- # it's in libexecinfo
-- FIND_LIBRARY(EXECINFO_LIB "execinfo")
-+ FIND_PACKAGE(PkgConfig REQUIRED)
-+ PKG_CHECK_MODULES(EXECINFO IMPORTED_TARGET libexecinfo)
- MARK_AS_ADVANCED(EXECINFO_LIB)
- IF (NOT EXECINFO_LIB)
- SET(EXECINFO_LIB "")
diff --git a/srcpkgs/paraview/patches/musl-unistd.patch b/srcpkgs/paraview/patches/musl-unistd.patch
new file mode 100644
index 000000000000..dee1c232d1d9
--- /dev/null
+++ b/srcpkgs/paraview/patches/musl-unistd.patch
@@ -0,0 +1,23 @@
+Index: VTK/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+===================================================================
+--- VTK/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C.orig
++++ VTK/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+@@ -40,7 +40,7 @@
+ #include <tokenize.h>
+
+ #ifndef _MSC_VER
+-#include <sys/unistd.h>
++#include <unistd.h>
+ #else
+ #include <direct.h>
+ #include <io.h>
+@@ -61,9 +61,6 @@
+
+ #include <cstdio>
+ #include <sys/stat.h>
+-#ifndef _MSC_VER
+-#include <unistd.h>
+-#endif
+
+ namespace {
+ bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/paraview/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/srcpkgs/paraview/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
new file mode 100644
index 000000000000..b95015c859cf
--- /dev/null
+++ b/srcpkgs/paraview/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
@@ -0,0 +1,19 @@
+ https://gitlab.kitware.com/vtk/vtk/-/issues/18033
+--- VTK/ThirdParty/freetype/vtk_freetype.h.in.orig
++++ VTK/ThirdParty/freetype/vtk_freetype.h.in
+@@ -20,6 +20,15 @@
+
+ #ifdef VTK_USE_SYSTEM_FREETYPE
+ # include <ft2build.h>
++/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
++/* has been moved to <freetype/internal/compiler-macros.h> */
++# ifndef FT_CALLBACK_DEF
++# ifdef __cplusplus
++# define FT_CALLBACK_DEF( x ) extern "C" x
++# else
++# define FT_CALLBACK_DEF( x ) static x
++# endif
++# endif /* FT_CALLBACK_DEF */
+ #else
+ # include <vtkfreetype/include/ft2build.h>
+ #endif
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
index 20a7f5589677..623d0cd434ed 100644
--- a/srcpkgs/paraview/template
+++ b/srcpkgs/paraview/template
@@ -1,23 +1,28 @@
# Template file for 'paraview'
pkgname=paraview
-version=5.8.1
-revision=3
+version=5.9.0
+revision=1
wrksrc=ParaView-v${version}
build_style=cmake
-configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
+configure_args="
+ -DCMAKE_BUILD_TYPE=None
-DPARAVIEW_ENABLE_FFMPEG=ON
-DPARAVIEW_ENABLE_GDAL=ON
-DPARAVIEW_USE_PYTHON=ON
-DPARAVIEW_USE_MPI=ON
- -DVTK_PYTHON_FULL_THREADSAFE=ON
- -DVTK_PYTHON_VERSION=3
- -DVTK_SMP_IMPLEMENTATION_TYPE=TBB
- -DVTKm_ENABLE_MPI=ON
- -DVTKm_ENABLE_RENDERING=ON
- -DVTKm_USE_DOUBLE_PRECISION=ON"
+ -DPARAVIEW_BUILD_SHARED_LIBS=ON
+ -DPARAVIEW_BUILD_WITH_EXTERNAL=ON
+ -DVTK_MODULE_USE_EXTERNAL_ParaView_cgns=OFF
+ -DVTK_FORBID_DOWNLOADS=ON
+ -DVTK_USE_EXTERNAL=ON
+ -DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
+ -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
#make_build_args="VERBOSE=1"
-hostmakedepends="pkg-config which python3"
+hostmakedepends="pkg-config which python3 protobuf"
# TODO: find some way of making this work with system vtk
+# CMake/ParaViewOptions.cmake:/PARAVIEW_USE_EXTERNAL_VTK
makedepends="MesaLib-devel libfreeglut-devel glu-devel libXt-devel
openmpi-devel qt5-devel qt5-x11extras-devel qt5-tools-devel qt5-plugin-mysql
qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
@@ -25,15 +30,15 @@ makedepends="MesaLib-devel libfreeglut-devel glu-devel libXt-devel
expat-devel freetype-devel glew-devel hdf5-devel libjpeg-turbo-devel
jsoncpp-devel proj-devel libxml2-devel liblzma-devel liblz4-devel netcdf-devel
libogg-devel libpng-devel pugixml-devel libtheora-devel tiff-devel zlib-devel
- protobuf-devel protobuf python3-Pygments ffmpeg-devel tbb-devel boost-devel
- libgdal-devel python3-mpi4py"
+ protobuf-devel libprotoc-devel python3-Pygments ffmpeg-devel tbb-devel
+ boost-devel libgdal-devel python3-mpi4py gl2ps-devel proj-devel"
depends="openmpi"
short_desc="Application for interactive, scientific visualization"
maintainer="Anders Damsgaard <anders@adamsgaard.dk>"
license="BSD-3-Clause"
homepage="https://www.paraview.org"
-distfiles="https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${version:0:3}&type=source&os=Sources&downloadFile=ParaView-v${version}.tar.xz>paraview-${version}.tar.xz"
-checksum=7653950392a0d7c0287c26f1d3a25cdbaa11baa7524b0af0e6a1a0d7d487d034
+distfiles="https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${version:0:3}&type=source&os=Sources&downloadFile=ParaView-v${version}.tar.xz>ParaView-v${version}.tar.xz"
+checksum=b03258b7cddb77f0ee142e3e77b377e5b1f503bcabc02bfa578298c99a06980d
CFLAGS="-DYYERROR_VERBOSE -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DGNU_SOURCE -fcommon"
CXXFLAGS="${CFLAGS}"
@@ -43,6 +48,7 @@ export QT_SELECT="5"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
+ export LDFLAGS=-lexecinfo
configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"
fi
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Closed]: paraview: update to 5.9.0.
2021-03-21 9:54 [PR PATCH] paraview: update to 5.9.0 sgn
2021-03-21 9:58 ` [PR PATCH] [Updated] " sgn
2021-04-04 11:01 ` sgn
@ 2021-06-07 8:43 ` sgn
2 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2021-06-07 8:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1437 bytes --]
There's a closed pull request on the void-packages repository
paraview: update to 5.9.0.
https://github.com/void-linux/void-packages/pull/29648
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-06-07 8:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-21 9:54 [PR PATCH] paraview: update to 5.9.0 sgn
2021-03-21 9:58 ` [PR PATCH] [Updated] " sgn
2021-04-04 11:01 ` sgn
2021-06-07 8:43 ` [PR PATCH] [Closed]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).