[arch-commits] Commit in paraview/trunk (3 files)
Bruno Pagani
archange at archlinux.org
Mon Apr 9 17:46:48 UTC 2018
Date: Monday, April 9, 2018 @ 17:46:48
Author: archange
Revision: 315451
upgpkg: paraview 5.5.0-1
Both patches were integrated upstream, drop them.
The 6 removed python dependencies are not used in current vtk submodule
(somewhere between current VTK 8.1 and next 9.0 release).
Modified:
paraview/trunk/PKGBUILD
Deleted:
paraview/trunk/jsoncpp-1.8.4.patch
paraview/trunk/visit_fix_gcc7.patch
----------------------+
PKGBUILD | 25 ++++++++-----------------
jsoncpp-1.8.4.patch | 16 ----------------
visit_fix_gcc7.patch | 43 -------------------------------------------
3 files changed, 8 insertions(+), 76 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-04-09 17:21:23 UTC (rev 315450)
+++ PKGBUILD 2018-04-09 17:46:48 UTC (rev 315451)
@@ -13,8 +13,8 @@
_mpi=openmpi
pkgname=${_pkg}
#-${_mpi}
-pkgver=5.4.1
-pkgrel=2
+pkgver=5.5.0
+pkgrel=1
pkgdesc="Parallel Visualization application using VTK (${_mpi} version)"
arch=('x86_64')
url="https://www.paraview.org"
@@ -22,27 +22,18 @@
depends=('qt5-tools' 'qt5-x11extras' 'ospray' 'ffmpeg' 'openmpi'
'cgns' 'python-pygments' 'protobuf' 'pugixml'
'python-matplotlib' 'python-numpy' 'python-mpi4py'
- 'python-six' 'python-constantly' 'python-twisted'
- 'python-autobahn' 'python-zope-interface' 'python-incremental'
'boost-libs' 'glew' 'expat' 'freetype2'
- 'libjpeg' 'jsoncpp' 'libxml2' 'libtheora' 'libpng'
+ 'libjpeg' 'jsoncpp' 'libxml2' 'libpng'
'libtiff' 'zlib' 'hdf5-openmpi' 'lz4' 'netcdf')
# netcdf-cxx gl2ps libharu
# python-txaio python-hyperlink
# proj apparently not used in this VTK configuration
makedepends=('cmake' 'boost' 'mesa' 'gcc-fortran' 'ninja' 'qt5-tools' 'qt5-xmlpatterns')
-source=("${url}/files/v${pkgver:0:3}/ParaView-v${pkgver}.tar.gz"
- 'visit_fix_gcc7.patch'
- 'jsoncpp-1.8.4.patch')
-sha256sums=('390d0f5dc66bf432e202a39b1f34193af4bf8aad2355338fa5e2778ea07a80e4'
- 'd1daa5da6ec25c5a6bfcabb3cf0bf02ab97ec87a332886a2f42695072fe8568d'
- 'ed9a99d5d0fb54f7506e819f6d54bd1b6cd7dd0e91647d9d06591ae300f9ef05')
+source=("${url}/files/v${pkgver:0:3}/ParaView-v${pkgver}.tar.gz")
+sha256sums=('1b619e326ff574de808732ca9a7447e4cd14e94ae6568f55b6581896cd569dff')
prepare() {
mkdir -p build
- cd ParaView-v${pkgver}
- patch Utilities/VisItBridge/databases/readers/Vs/VsStaggeredField.C "${srcdir}"/visit_fix_gcc7.patch
- patch -p1 -i "${srcdir}"/jsoncpp-1.8.4.patch
}
build() {
@@ -49,14 +40,13 @@
cd build
# Flags to enable system libs in VTK building, as in VTK package
- # NETCDF NETCDFCPP status?
- # LIBPROJ4 UNUSED?
+ # NETCDFCPP status?
# GL2PS fails.
# libharu blocked by https://github.com/libharu/libharu/pull/157
# TXAIO HYPERLINK in a future VTK version
# LIBPROJ4 apparently not used in this VTK configuration
local VTK_USE_SYSTEM_LIB=""
- for lib in EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA TWISTED ZOPE SIX AUTOBAHN MPI4PY JSONCPP GLEW HDF5 CONSTANTLY INCREMENTAL LZ4 NETCDF
+ for lib in EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 MPI4PY JSONCPP GLEW HDF5 LZ4 NETCDF
do
VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
done
@@ -106,4 +96,5 @@
# Remove IceT man pages to avoid conflicts
rm -- "${pkgdir}"/usr/share/man/man3/icet*.3
+ rmdir "${pkgdir}"/usr/share/man/{man3/,}
}
Deleted: jsoncpp-1.8.4.patch
===================================================================
--- jsoncpp-1.8.4.patch 2018-04-09 17:21:23 UTC (rev 315450)
+++ jsoncpp-1.8.4.patch 2018-04-09 17:46:48 UTC (rev 315451)
@@ -1,16 +0,0 @@
-diff --git a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
-index b6e2b5592a..d27ad9d8f5 100644
---- a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
-+++ b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
-@@ -788,7 +788,10 @@ public:
- this->GetSettingBelowPriority(propertySettingCString, highestPriority);
- if (lowerPriorityValue.isNull())
- {
-- if (!proxyValue.removeMember(property->GetXMLName()).isNull())
-+ // Allocated as done in Json::Value removeMember(const char* key).
-+ Json::Value removedValue;
-+ if (proxyValue.removeMember(property->GetXMLName(), &removedValue) &&
-+ !removedValue.isNull())
- {
- this->Modified();
- }
Deleted: visit_fix_gcc7.patch
===================================================================
--- visit_fix_gcc7.patch 2018-04-09 17:21:23 UTC (rev 315450)
+++ visit_fix_gcc7.patch 2018-04-09 17:46:48 UTC (rev 315451)
@@ -1,43 +0,0 @@
-------------------------------------------------------------------------
-r31082 | whitlocb | 2017-06-16 00:19:15 +0200 (Fri, 16 Jun 2017) | 1 line
-
-Fix for GCC 7
-
-Index: databases/Vs/VsStaggeredField.C
-===================================================================
---- databases/Vs/VsStaggeredField.C (revision 31081)
-+++ databases/Vs/VsStaggeredField.C (revision 31082)
-@@ -26,10 +26,13 @@
- this->indexOrder = VsSchema::compMajorCKey;
- this->centering = VsSchema::nodalCenteringKey;
-
-+#if 0
-+ // There is no clear method under GCC 7. What good would it do here anyway?
- this->oriCellDims.clear();
- this->oriCellDimProd.clear();
- this->newCellDims.clear();
- this->newCellDimProd.clear();
-+#endif
- }
-
- template<class TYPE>
-@@ -136,7 +139,7 @@
- // iterate over subgrid
- for (size_t subBigIndx = 0; subBigIndx < this->numNeighbors; ++subBigIndx) {
- std::valarray<int> subCellInds = this->getSubCellIndexSet(subBigIndx);
-- std::valarray<int> newCellInds = oriCellInds*this->numNeighbors + subCellInds;
-+ std::valarray<int> newCellInds = oriCellInds*static_cast<TYPE>(this->numNeighbors) + subCellInds;
- size_t newBigIndx = this->getNewBigIndex(newCellInds);
- std::valarray<TYPE> xi = std::valarray<TYPE>(subCellInds) / this->twoPowSubRes;
- this->setNewFieldVals(newBigIndx, xi, sigmaVals, neighVals, dataPtr);
-@@ -147,7 +150,7 @@
- template <class TYPE>
- std::valarray<int>
- VsStaggeredField<TYPE>::getOriCellIndexSet(size_t bigIndex) const {
-- return (bigIndex / this->oriCellDimProd) % this->oriCellDims;
-+ return (bigIndex / static_cast<TYPE>(this->oriCellDimProd)) % this->oriCellDims;
- }
-
- template <class TYPE>
-
-------------------------------------------------------------------------
More information about the arch-commits
mailing list