Date: Monday, April 9, 2018 @ 17:47:24 Author: archange Revision: 315452
archrelease: copy trunk to community-x86_64 Added: paraview/repos/community-x86_64/PKGBUILD (from rev 315451, paraview/trunk/PKGBUILD) Deleted: paraview/repos/community-x86_64/PKGBUILD paraview/repos/community-x86_64/jsoncpp-1.8.4.patch paraview/repos/community-x86_64/visit_fix_gcc7.patch ----------------------+ PKGBUILD | 209 +++++++++++++++++++++++-------------------------- jsoncpp-1.8.4.patch | 16 --- visit_fix_gcc7.patch | 43 ---------- 3 files changed, 100 insertions(+), 168 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-04-09 17:46:48 UTC (rev 315451) +++ PKGBUILD 2018-04-09 17:47:24 UTC (rev 315452) @@ -1,109 +0,0 @@ -# Maintainer: Bruno Pagani <archa...@archlinux.org> -# Contributor: Oliver Goethel <deezy> -# Contributor: eolianoe eolianoe <eolianoe [at] gmail [DoT] com> -# Contributor: George Eleftheriou <eleftg> -# Contributor: Mathias Anselmann <mathias.anselm...@gmail.com> -# Contributor: Stéphane Gaudreault <steph...@archlinux.org> -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: Michele Mocciola <mickele> -# Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name> -# Contributor: chuckdaniels - -_pkg=paraview -_mpi=openmpi -pkgname=${_pkg} -#-${_mpi} -pkgver=5.4.1 -pkgrel=2 -pkgdesc="Parallel Visualization application using VTK (${_mpi} version)" -arch=('x86_64') -url="https://www.paraview.org" -license=('custom') -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' - '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') - -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() { - cd build - - # Flags to enable system libs in VTK building, as in VTK package - # NETCDF NETCDFCPP status? - # LIBPROJ4 UNUSED? - # 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 - do - VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON " - done - # Specific system libs for ParaView version - for lib in CGNS PUGIXML PROTOBUF PYGMENTS - do - VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON " - done - - cmake ../ParaView-v${pkgver} \ - -DBUILD_DOCUMENTATION=OFF \ - -DBUILD_EXAMPLES=ON \ - -DBUILD_SHARED_LIBS=ON \ - -DBUILD_TESTING=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=mpicc \ - -DCMAKE_CXX_COMPILER=mpicxx \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DOSPRAY_INSTALL_DIR=/usr \ - -DPARAVIEW_ENABLE_FFMPEG=ON \ - -DPARAVIEW_ENABLE_MATPLOTLIB=ON \ - -DPARAVIEW_ENABLE_PYTHON=ON \ - -DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON \ - -DPARAVIEW_QT_VERSION=5 \ - -DPARAVIEW_USE_MPI=ON \ - -DPARAVIEW_USE_VISITBRIDGE=ON \ - -DPARAVIEW_USE_OSPRAY=ON \ - -DVISIT_BUILD_READER_CGNS=ON \ - -DVTK_PYTHON_FULL_THREADSAFE=ON \ - -DVTK_PYTHON_VERSION=3 \ - -DVTK_QT_VERSION=5 \ - -DVTK_RENDERING_BACKEND=OpenGL2 \ - -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP \ - ${VTK_USE_SYSTEM_LIB} \ - -GNinja - - ninja ${MAKEFLAGS} -} - -package() { - cd build - - DESTDIR="${pkgdir}" ninja install - - # Install license - install -Dm644 "${srcdir}"/ParaView-v${pkgver}/License_v1.2.txt "${pkgdir}"/usr/share/licenses/paraview/LICENSE - - # Remove IceT man pages to avoid conflicts - rm -- "${pkgdir}"/usr/share/man/man3/icet*.3 -} Copied: paraview/repos/community-x86_64/PKGBUILD (from rev 315451, paraview/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-04-09 17:47:24 UTC (rev 315452) @@ -0,0 +1,100 @@ +# Maintainer: Bruno Pagani <archa...@archlinux.org> +# Contributor: Oliver Goethel <deezy> +# Contributor: eolianoe eolianoe <eolianoe [at] gmail [DoT] com> +# Contributor: George Eleftheriou <eleftg> +# Contributor: Mathias Anselmann <mathias.anselm...@gmail.com> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: Michele Mocciola <mickele> +# Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name> +# Contributor: chuckdaniels + +_pkg=paraview +_mpi=openmpi +pkgname=${_pkg} +#-${_mpi} +pkgver=5.5.0 +pkgrel=1 +pkgdesc="Parallel Visualization application using VTK (${_mpi} version)" +arch=('x86_64') +url="https://www.paraview.org" +license=('custom') +depends=('qt5-tools' 'qt5-x11extras' 'ospray' 'ffmpeg' 'openmpi' + 'cgns' 'python-pygments' 'protobuf' 'pugixml' + 'python-matplotlib' 'python-numpy' 'python-mpi4py' + 'boost-libs' 'glew' 'expat' 'freetype2' + '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") +sha256sums=('1b619e326ff574de808732ca9a7447e4cd14e94ae6568f55b6581896cd569dff') + +prepare() { + mkdir -p build +} + +build() { + cd build + + # Flags to enable system libs in VTK building, as in VTK package + # 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 MPI4PY JSONCPP GLEW HDF5 LZ4 NETCDF + do + VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON " + done + # Specific system libs for ParaView version + for lib in CGNS PUGIXML PROTOBUF PYGMENTS + do + VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON " + done + + cmake ../ParaView-v${pkgver} \ + -DBUILD_DOCUMENTATION=OFF \ + -DBUILD_EXAMPLES=ON \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_TESTING=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_COMPILER=mpicc \ + -DCMAKE_CXX_COMPILER=mpicxx \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DOSPRAY_INSTALL_DIR=/usr \ + -DPARAVIEW_ENABLE_FFMPEG=ON \ + -DPARAVIEW_ENABLE_MATPLOTLIB=ON \ + -DPARAVIEW_ENABLE_PYTHON=ON \ + -DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON \ + -DPARAVIEW_QT_VERSION=5 \ + -DPARAVIEW_USE_MPI=ON \ + -DPARAVIEW_USE_VISITBRIDGE=ON \ + -DPARAVIEW_USE_OSPRAY=ON \ + -DVISIT_BUILD_READER_CGNS=ON \ + -DVTK_PYTHON_FULL_THREADSAFE=ON \ + -DVTK_PYTHON_VERSION=3 \ + -DVTK_QT_VERSION=5 \ + -DVTK_RENDERING_BACKEND=OpenGL2 \ + -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP \ + ${VTK_USE_SYSTEM_LIB} \ + -GNinja + + ninja ${MAKEFLAGS} +} + +package() { + cd build + + DESTDIR="${pkgdir}" ninja install + + # Install license + install -Dm644 "${srcdir}"/ParaView-v${pkgver}/License_v1.2.txt "${pkgdir}"/usr/share/licenses/paraview/LICENSE + + # 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:46:48 UTC (rev 315451) +++ jsoncpp-1.8.4.patch 2018-04-09 17:47:24 UTC (rev 315452) @@ -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:46:48 UTC (rev 315451) +++ visit_fix_gcc7.patch 2018-04-09 17:47:24 UTC (rev 315452) @@ -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> - -------------------------------------------------------------------------