[arch-commits] Commit in paraview/trunk (PKGBUILD fix-qt5.11-headers.patch)
Bruno Pagani
archange at archlinux.org
Thu Nov 8 12:51:02 UTC 2018
Date: Thursday, November 8, 2018 @ 12:51:01
Author: archange
Revision: 404015
upgpkg: paraview 5.6.0-1
Modified:
paraview/trunk/PKGBUILD
Deleted:
paraview/trunk/fix-qt5.11-headers.patch
--------------------------+
PKGBUILD | 61 ++++++++--------------
fix-qt5.11-headers.patch | 120 ---------------------------------------------
2 files changed, 23 insertions(+), 158 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-08 12:35:10 UTC (rev 404014)
+++ PKGBUILD 2018-11-08 12:51:01 UTC (rev 404015)
@@ -13,44 +13,27 @@
_mpi=openmpi
pkgname=${_pkg}
#-${_mpi}
-pkgver=5.5.2
-pkgrel=5
+pkgver=5.6.0
+pkgrel=1
pkgdesc="Parallel Visualization application using VTK (${_mpi} version)"
arch=('x86_64')
url="https://www.paraview.org"
license=('BSD' 'custom')
-depends=('qt5-tools' 'qt5-x11extras' 'ospray' 'ffmpeg' 'openmpi' 'intel-tbb'
- 'cgns' 'python-pygments' 'protobuf' 'pugixml'
- 'python-matplotlib' 'python-numpy' 'python-mpi4py'
- 'boost-libs' 'glew' 'expat' 'freetype2'
- 'libjpeg' 'jsoncpp' 'libxml2' 'libpng'
- 'libtiff' 'zlib' 'hdf5' 'lz4' 'netcdf')
-# netcdf-cxx gl2ps libharu
-# python-txaio python-hyperlink
-# proj apparently not used in this VTK configuration
+depends=('boost-libs' 'qt5-tools' 'qt5-x11extras' 'intel-tbb' 'openmpi'
+ 'ffmpeg' 'ospray' 'python-matplotlib' 'python-numpy'
+ 'cgns' 'protobuf' 'python-pygments'
+ 'double-conversion' 'expat' 'freetype2' 'glew' 'hdf5'
+ 'libjpeg' 'jsoncpp' 'libxml2' 'lz4' 'xz' 'python-mpi4py' 'netcdf'
+ 'libogg' 'pegtl' 'libpng' 'pugixml' 'libtheora' 'libtiff' 'zlib')
+# gl2ps
+# netcdf-cxx libharu
+# proj, sqlite apparently not used in this VTK configuration
makedepends=('cmake' 'boost' 'mesa' 'gcc-fortran' 'ninja' 'qt5-tools' 'qt5-xmlpatterns' 'eigen')
-source=("${url}/files/v${pkgver:0:3}/ParaView-v${pkgver}.tar.xz"
- 'fix-qt5.11-headers.patch'
- 'https://gitlab.kitware.com/vtk/vtk/merge_requests/4490.patch'
- 'https://gitlab.kitware.com/paraview/paraview/merge_requests/2613.patch'
- paraview-fix-doc-build.patch::"https://gitlab.kitware.com/paraview/paraview/commit/f9c7e4b0.diff")
-sha256sums=('4b9d186bac59e412ae09cae49c3ec3ec59803c25f63e89f92efe07b05dc1b896'
- '638e3148d855e1de2ca7711f9dd1eb6ec5410e3c412d949abf2a34ef2086f0c7'
- 'a83551ce63b6c439f15ea7525c42c381afcbc790ceecbb5334fff004ab1f242e'
- '031b70659fa53cc04ba791055412ea2fbee7aff58e58189a26a146d5b196e4c8'
- '2e52c2564e5e147b8c1321367147495ba3c43436eecda1b3d26acde8d04a230d')
+source=("${url}/files/v${pkgver:0:3}/ParaView-v${pkgver}.tar.xz")
+sha256sums=('5b49cb96ab78eee0427e25200530ac892f9a3da7725109ce1790f8010cb5b377')
prepare() {
mkdir -p build
- cd ParaView-v${pkgver}/
- patch -p1 -i ../fix-qt5.11-headers.patch
- # https://gitlab.kitware.com/paraview/paraview/issues/18323
- patch -p1 -i ../2613.patch
- # fix build https://gitlab.kitware.com/paraview/paraview/issues/18330
- patch -p1 -i ../paraview-fix-doc-build.patch
- cd VTK
- # https://gitlab.kitware.com/vtk/vtk/issues/17350
- patch -p1 -i ../../4490.patch
}
build() {
@@ -57,23 +40,25 @@
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
- # LIBPROJ4 apparently not used in this VTK configuration
+ # GL2PS has non-upstreamed patches?
+ # KISSFFT is not packaged
+ # UTF8 (utfcpp) is not packaged (but present in AUR)
+ # VERDICT is not packaged
+ # ZFP is not packaged
+ # NETCDFCPP blocked by https://github.com/Unidata/netcdf-cxx4/issues/43
+ # LIBHARU blocked by https://github.com/libharu/libharu/pull/157
+ # LIBPROJ4, SQLITE 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 EIGEN
+ for lib in DOUBLECONVERSION EIGEN EXPAT FREETYPE GLEW HDF5 JPEG JSONCPP LIBXML2 LZ4 LZMA MPI4PY NETCDF OGG PEGTL PNG PUGIXML THEORA TIFF ZLIB
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
+ for lib in CGNS PROTOBUF PYGMENTS
do
VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
done
-# -DCMAKE_C_COMPILER=mpicc \
-# -DCMAKE_CXX_COMPILER=mpicxx \
cmake ../ParaView-v${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
Deleted: fix-qt5.11-headers.patch
===================================================================
--- fix-qt5.11-headers.patch 2018-11-08 12:35:10 UTC (rev 404014)
+++ fix-qt5.11-headers.patch 2018-11-08 12:51:01 UTC (rev 404015)
@@ -1,120 +0,0 @@
-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 <QHeaderView>
-
- #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
-@@ -52,6 +52,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkStringOutputWindow.h"
- #include "vtkWeakPointer.h"
-
-+#include <QAbstractItemView>
- #include <QApplication>
- #include <QCursor>
- #include <QFile>
More information about the arch-commits
mailing list