Date: Monday, June 4, 2018 @ 13:42:29 Author: archange Revision: 340320
archrelease: copy trunk to community-x86_64 Added: paraview/repos/community-x86_64/PKGBUILD (from rev 340319, paraview/trunk/PKGBUILD) paraview/repos/community-x86_64/fix-qt5.11-headers.patch (from rev 340319, paraview/trunk/fix-qt5.11-headers.patch) Deleted: paraview/repos/community-x86_64/PKGBUILD --------------------------+ PKGBUILD | 204 ++++++++++++++++++++++----------------------- fix-qt5.11-headers.patch | 120 ++++++++++++++++++++++++++ 2 files changed, 224 insertions(+), 100 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-06-04 13:42:06 UTC (rev 340319) +++ PKGBUILD 2018-06-04 13:42:29 UTC (rev 340320) @@ -1,100 +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.5.0 -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' - '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/,} -} Copied: paraview/repos/community-x86_64/PKGBUILD (from rev 340319, paraview/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-06-04 13:42:29 UTC (rev 340320) @@ -0,0 +1,104 @@ +# 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.1 +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.xz" + 'fix-qt5.11-headers.patch') +sha256sums=('559f5a0d6947b19c42aed56018ff96158886c90d58b0204b8b6e5bc0288dd65f' + 'dcc44e0d7a92f2d8fe3e7a8956b62b0a3add4d67272070ee99d7a732e0999caa') + +prepare() { + mkdir -p build + cd ParaView-v${pkgver}/ + patch -p1 -i ../fix-qt5.11-headers.patch +} + +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/,} +} Copied: paraview/repos/community-x86_64/fix-qt5.11-headers.patch (from rev 340319, paraview/trunk/fix-qt5.11-headers.patch) =================================================================== --- fix-qt5.11-headers.patch (rev 0) +++ fix-qt5.11-headers.patch 2018-06-04 13:42:29 UTC (rev 340320) @@ -0,0 +1,120 @@ +diff --git a/Plugins/SLACTools/pqSLACDataLoadManager.cxx b/Plugins/SLACTools/pqSLACDataLoadManager.cxx +index 3ba019c26b..52893d6855 100644 +--- a/Plugins/SLACTools/pqSLACDataLoadManager.cxx ++++ b/Plugins/SLACTools/pqSLACDataLoadManager.cxx +@@ -36,6 +36,7 @@ + + #include <QPushButton> + #include <QtDebug> ++#include <QAction> + + class pqSLACDataLoadManager::pqUI : public Ui::pqSLACDataLoadManager + { +diff --git a/Qt/ApplicationComponents/pqColorMapEditor.cxx b/Qt/ApplicationComponents/pqColorMapEditor.cxx +index 0395185e0a..dfc4e904db 100644 +--- a/Qt/ApplicationComponents/pqColorMapEditor.cxx ++++ b/Qt/ApplicationComponents/pqColorMapEditor.cxx +@@ -60,6 +60,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include <QKeyEvent> + #include <QPointer> + #include <QVBoxLayout> ++#include <QStyle> + + class pqColorMapEditor::pqInternals + { +diff --git a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx +index 908e4598e0..b1014cdd2a 100644 +--- a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx ++++ b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx +@@ -43,6 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include "vtkSMUncheckedPropertyHelper.h" + + #include <QGridLayout> ++#include <QStyle> + + class pqDoubleRangeSliderPropertyWidget::pqInternals + { +diff --git a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx +index c297dc3d9e..501633f63a 100644 +--- a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx ++++ b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx +@@ -69,6 +69,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include <QPushButton> + #include <QSet> + #include <QShortcut> ++#include <QStyle> + + //----------------------------------------------------------------------------- + pqStandardViewFrameActionsImplementation::pqStandardViewFrameActionsImplementation( +diff --git a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx +index 6774c2e48e..fedef0f601 100644 +--- a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx ++++ b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx +@@ -53,6 +53,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include <QPainter> + #include <QVariant> + #include <QtDebug> ++#include <QHeaderView> + + namespace + { +diff --git a/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx b/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx +index 55d3146447..de6ce48102 100644 +--- a/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx ++++ b/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx +@@ -35,6 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include "pqTransferFunctionWidgetPropertyWidget.h" + #include "vtkPiecewiseFunction.h" + #include <QString> ++#include <QDoubleValidator> + + class pqTransferFunctionWidgetPropertyDialog::pqInternals + { +diff --git a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx +index 6d2865431e..8d2c4b61cd 100644 +--- a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx ++++ b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx +@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include "vtkSMProxy.h" + + #include <QIntValidator> ++#include <QStyle> + + class pqViewResolutionPropertyWidget::pqInternals + { +diff --git a/Qt/Components/pqChangeInputDialog.cxx b/Qt/Components/pqChangeInputDialog.cxx +index 8a67b10095..06f10af66f 100644 +--- a/Qt/Components/pqChangeInputDialog.cxx ++++ b/Qt/Components/pqChangeInputDialog.cxx +@@ -48,6 +48,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include <QItemSelectionModel> + #include <QLineEdit> + #include <QRadioButton> ++#include <QHeaderView> + + class pqChangeInputDialog::pqInternals : public Ui::pqChangeInputDialog + { +diff --git a/Qt/Components/pqCinemaTrackSelection.cxx b/Qt/Components/pqCinemaTrackSelection.cxx +index 3d6d9dde19..c4a0dd5eca 100644 +--- a/Qt/Components/pqCinemaTrackSelection.cxx ++++ b/Qt/Components/pqCinemaTrackSelection.cxx +@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + ========================================================================*/ + #include <QDebug> ++#include <QtWidgets> + + #include "vtkPVArrayInformation.h" + #include "vtkPVDataInformation.h" +diff --git a/Qt/Python/pqPythonShell.cxx b/Qt/Python/pqPythonShell.cxx +index 3d01fd0a96..7cb356fbc4 100644 +--- a/Qt/Python/pqPythonShell.cxx ++++ b/Qt/Python/pqPythonShell.cxx +@@ -61,6 +61,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include <QTextCharFormat> + #include <QVBoxLayout> + #include <QtDebug> ++#include <QtWidgets> + + QStringList pqPythonShell::Preamble; +