Date: Saturday, August 25, 2018 @ 00:29:05 Author: archange Revision: 373985
Retrieve patch upstream Modified: paraview/trunk/PKGBUILD Deleted: paraview/trunk/0001-fix-build-on-python-3.7.patch ------------------------------------+ 0001-fix-build-on-python-3.7.patch | 25 ------------------------- PKGBUILD | 13 ++++++------- 2 files changed, 6 insertions(+), 32 deletions(-) Deleted: 0001-fix-build-on-python-3.7.patch =================================================================== --- 0001-fix-build-on-python-3.7.patch 2018-08-24 23:26:05 UTC (rev 373984) +++ 0001-fix-build-on-python-3.7.patch 2018-08-25 00:29:05 UTC (rev 373985) @@ -1,25 +0,0 @@ -From f10c60d254bce7b73738415b4f7a87f8c74d01a2 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <[email protected]> -Date: Thu, 26 Jul 2018 04:47:04 +0000 -Subject: [PATCH] fix build on python 3.7 - ---- - Qt/Python/pqPythonSyntaxHighlighter.cxx | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Qt/Python/pqPythonSyntaxHighlighter.cxx b/Qt/Python/pqPythonSyntaxHighlighter.cxx -index 36e704e7d5..021be2d666 100644 ---- a/Qt/Python/pqPythonSyntaxHighlighter.cxx -+++ b/Qt/Python/pqPythonSyntaxHighlighter.cxx -@@ -194,6 +194,8 @@ void pqPythonSyntaxHighlighter::rehighlightSyntax() - #if PY_MAJOR_VERSION == 2 - vtkSmartPyObject resultingTextBytes(PyUnicode_AsUTF8String(resultingText)); - char* resultingTextAsCString = PyString_AsString(resultingTextBytes); -+#elif PY_VERSION_HEX >= 0x03070000 -+ char* resultingTextAsCString = const_cast<char *>(PyUnicode_AsUTF8(resultingText)); - #else - char* resultingTextAsCString = PyUnicode_AsUTF8(resultingText); - #endif --- -2.18.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-08-24 23:26:05 UTC (rev 373984) +++ PKGBUILD 2018-08-25 00:29:05 UTC (rev 373985) @@ -31,12 +31,12 @@ 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' - 'https://gitlab.kitware.com/vtk/vtk/commit/706f1b397df09a27ab8981ab9464547028d0c322.patch' - '0001-fix-build-on-python-3.7.patch') + 'https://gitlab.kitware.com/vtk/vtk/merge_requests/4490.patch' + 'https://gitlab.kitware.com/paraview/paraview/merge_requests/2613.patch') sha256sums=('4b9d186bac59e412ae09cae49c3ec3ec59803c25f63e89f92efe07b05dc1b896' '638e3148d855e1de2ca7711f9dd1eb6ec5410e3c412d949abf2a34ef2086f0c7' - '37690540cc0cf6b52fb980b39f9f7bc603d1670fac9e2939ff05ddc349407448' - '508717c9cf128772fb99f16354c5a645c6e0d432dd5cfda64d4898860e0c09df') + 'ebad129ed0229f96bc17ff0a43715407b0fdf8cc2658a7b5ebd7e76809ae1392' + '49d643a0220f0f901e571f9f82f5dd48d85fe42a79830b971ab586abf334194f') prepare() { mkdir -p build @@ -43,10 +43,10 @@ cd ParaView-v${pkgver}/ patch -p1 -i ../fix-qt5.11-headers.patch # https://gitlab.kitware.com/paraview/paraview/issues/18323 - patch -p1 -i ../0001-fix-build-on-python-3.7.patch + patch -p1 -i ../2613.patch cd VTK # https://gitlab.kitware.com/vtk/vtk/issues/17350 - patch -p1 -i "${srcdir}"/706f1b397df09a27ab8981ab9464547028d0c322.patch + patch -p1 -i ../../4490.patch } build() { @@ -56,7 +56,6 @@ # 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
