5.3.0

author: Michel Zou 2017-03-20 22:44:19 +0100
committer: Michel Zou 2017-03-20 22:44:19 +0100
commit: 35576e6bf556c8c7f89202d734bc1524aa169fd3 (patch)
tree: 516b23fd5628148a565adc970e3dc8d6c0e77ab0
parent: 786b9d157c6326039a9285e4bb739e09b8b03cca (diff)
download: aur-35576e6bf556c8c7f89202d734bc1524aa169fd3.tar.gz
5 files changed, 9 insertions, 148 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cf92312bb159..a91506da53a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Mar  3 09:11:32 UTC 2017
+# Mon Mar 20 21:44:19 UTC 2017
 pkgbase = mingw-w64-paraview
 	pkgdesc = Parallel Visualization Application using VTK (mingw-w64)
-	pkgver = 5.2.0
+	pkgver = 5.3.0
 	pkgrel = 1
 	url = http://www.paraview.org
 	arch = any
@@ -27,14 +27,8 @@ pkgbase = mingw-w64-paraview
 	options = !buildflags
 	options = !strip
 	options = staticlibs
-	source = http://paraview.org/files/v5.2/ParaView-v5.2.0.tar.gz
-	source = vtk_hdf5_internal.patch
-	source = 332e61a.patch
-	source = 6541e9c.patch
-	sha1sums = c578cdad44673cd3311bd5c5fec52075ea923701
-	sha1sums = cbadaa87cd775d1edb1dbc1db4dedb9f3cdc4fd5
-	sha1sums = SKIP
-	sha1sums = SKIP
+	source = http://paraview.org/files/v5.3/ParaView-v5.3.0.tar.gz
+	sha1sums = c8a31039b189e63b20618bbfa91e89555ce62b6d
 
 pkgname = mingw-w64-paraview
 
diff --git a/332e61a.patch b/332e61a.patch
deleted file mode 100644
index 6f8207c539b4..000000000000
--- a/332e61a.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 332e61a1df65e58c2b2991aebc2ad52799a67936 Mon Sep 17 00:00:00 2001
-From: xantares <xantares09@hotmail.com>
-Date: Wed, 1 Mar 2017 10:06:30 -0500
-Subject: [PATCH] Do not use extern templates for mingw as suggested in https://gitlab.kitware.com/vtk/vtk/issues/16916
-
----
- Common/Core/vtkConfigure.h.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Common/Core/vtkConfigure.h.in b/Common/Core/vtkConfigure.h.in
-index dad3005..c2f58e0 100644
---- a/Common/Core/vtkConfigure.h.in
-+++ b/Common/Core/vtkConfigure.h.in
-@@ -169,7 +169,7 @@
- 
- /** extern template declarations for C++11
-  */
--#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1700)
-+#if ((__cplusplus >= 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1700)) && !defined(__MINGW32__)
- #define VTK_USE_EXTERN_TEMPLATE
- #endif
- 
---
-libgit2 0.24.0
-
diff --git a/6541e9c.patch b/6541e9c.patch
deleted file mode 100644
index 40637b16ab0c..000000000000
--- a/6541e9c.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 6541e9c7662d3987baded0ea90de80937fa23d7a Mon Sep 17 00:00:00 2001
-From: Steven Hahn <hahnse@ornl.gov>
-Date: Tue, 14 Feb 2017 13:30:12 -0500
-Subject: [PATCH] Fix compilation errors when building with HDF5 1.10.0
-
----
- ThirdParty/netcdf/vtknetcdf/libsrc4/nc4internal.h |  2 +-
- ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx | 12 +++++++++++-
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/ThirdParty/netcdf/vtknetcdf/libsrc4/nc4internal.h b/ThirdParty/netcdf/vtknetcdf/libsrc4/nc4internal.h
-index 628d0c9..e023f38 100644
---- a/ThirdParty/netcdf/vtknetcdf/libsrc4/nc4internal.h
-+++ b/ThirdParty/netcdf/vtknetcdf/libsrc4/nc4internal.h
-@@ -367,7 +367,7 @@ NC_FILE_INFO_T *nc4_find_nc_file(int ncid);
- int nc4_find_dim(NC_GRP_INFO_T *grp, int dimid, NC_DIM_INFO_T **dim, NC_GRP_INFO_T **dim_grp);
- int nc4_find_dim_len(NC_GRP_INFO_T *grp, int dimid, size_t **len);
- int nc4_find_type(NC_HDF5_FILE_INFO_T *h5, int typeid, NC_TYPE_INFO_T **type);
--NC_TYPE_INFO_T *nc4_rec_find_nc_type(NC_GRP_INFO_T *start_grp, hid_t target_nc_typeid);
-+NC_TYPE_INFO_T *nc4_rec_find_nc_type(NC_GRP_INFO_T *start_grp, nc_type target_nc_typeid);
- NC_TYPE_INFO_T *nc4_rec_find_hdf_type(NC_GRP_INFO_T *start_grp, hid_t target_hdf_typeid);
- NC_TYPE_INFO_T *nc4_rec_find_named_type(NC_GRP_INFO_T *start_grp, char *name);
- NC_TYPE_INFO_T *nc4_rec_find_equal_type(NC_GRP_INFO_T *start_grp, int ncid1, NC_TYPE_INFO_T *type);
-diff --git a/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx b/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx
-index 48a7753..5db2620 100644
---- a/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx
-+++ b/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx
-@@ -139,7 +139,11 @@ static int H5FD_dsm_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
- #if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8))
- static haddr_t H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
- static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
-+#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=10))
-+static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file, H5FD_mem_t type);
-+#else
- static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file);
-+#endif
- #else
- static haddr_t H5FD_dsm_get_eoa(H5FD_t *_file);
- static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr);
-@@ -155,6 +159,9 @@ static const H5FD_class_t H5FD_dsm_g = {
-     "dsm",                      /*name          */
-     MAXADDR,                    /*maxaddr       */
-     H5F_CLOSE_WEAK,             /*fc_degree     */
-+#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=10))
-+    NULL,                       /*terminate     */
-+#endif
-     NULL,                       /*sb_size       */
-     NULL,                       /*sb_encode     */
-     NULL,                       /*sb_decode     */
-@@ -687,7 +694,10 @@ H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr)
-  *-------------------------------------------------------------------------
-  */
- static haddr_t
--#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8))
-+
-+#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=10))
-+H5FD_dsm_get_eof(const H5FD_t *_file, H5FD_mem_t type)
-+#elif ((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8))
- H5FD_dsm_get_eof(const H5FD_t *_file)
- #else
- H5FD_dsm_get_eof(H5FD_t *_file)
---
-libgit2 0.24.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 9c0d60dc27ca..b59dd3d9593c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mingw-w64-paraview
-_majordotminor=5.2
+_majordotminor=5.3
 pkgver=${_majordotminor}.0
 pkgrel=1
 pkgdesc='Parallel Visualization Application using VTK (mingw-w64)'
@@ -9,27 +9,22 @@ license=('custom')
 depends=('mingw-w64-qt5-xmlpatterns' 'mingw-w64-qt5-tools' 'mingw-w64-boost' 'mingw-w64-glew' 'mingw-w64-expat'  'mingw-w64-freetype2'  'mingw-w64-libjpeg'  'mingw-w64-libxml2' 'mingw-w64-libtheora' 'mingw-w64-libpng' 'mingw-w64-libtiff' 'mingw-w64-zlib' 'mingw-w64-jsoncpp' 'mingw-w64-pugixml' 'mingw-w64-hdf5' 'mingw-w64-lz4')
 makedepends=('mingw-w64-cmake')
 options=('!buildflags' '!strip' 'staticlibs')
-source=("http://paraview.org/files/v${_majordotminor}/ParaView-v${pkgver}.tar.gz"
-        'vtk_hdf5_internal.patch' 332e61a.patch 6541e9c.patch)
-sha1sums=('c578cdad44673cd3311bd5c5fec52075ea923701'
-          'cbadaa87cd775d1edb1dbc1db4dedb9f3cdc4fd5' SKIP SKIP)
+source=("http://paraview.org/files/v${_majordotminor}/ParaView-v${pkgver}.tar.gz")
+sha1sums=('c8a31039b189e63b20618bbfa91e89555ce62b6d')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
   cd "${srcdir}/ParaView-v${pkgver}"
 
-  patch -p1 -i ../vtk_hdf5_internal.patch
-
   # disable all plugins ~ -DPARAVIEW_BUILD_PLUGIN_XXX
   sed -i "s|if (PARAVIEW_BUILD_PLUGIN|if(OFF|g" CMake/ParaViewPluginsMacros.cmake
 
-  pushd VTK && patch -p1 -i "${srcdir}"/332e61a.patch && popd
-  pushd VTK && patch -p1 -i "${srcdir}"/6541e9c.patch && popd
-
   # https://gitlab.kitware.com/paraview/paraview/merge_requests/1434
   sed -i "s|#include <Windows.h>|#include <windows.h>|g" ParaViewCore/ServerManager/SMApplication/vtkInitializationHelper.cxx
 
+  sed -i "s|#include <Windows.h>|#include <windows.h>|g" Qt/Core/pqObjectBuilder.cxx
+
   # https://gitlab.kitware.com/paraview/paraview/merge_requests/1436
   echo "target_link_libraries(paraview LINK_PRIVATE msvcr90)" >> Applications/ParaView/CMakeLists.txt
 }
diff --git a/vtk_hdf5_internal.patch b/vtk_hdf5_internal.patch
deleted file mode 100644
index 839881f6b811..000000000000
--- a/vtk_hdf5_internal.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur ParaView-v5.1.2_org/VTK/ThirdParty/hdf5/vtkhdf5/CMakeInstallation.cmake ParaView-v5.1.2/VTK/ThirdParty/hdf5/vtkhdf5/CMakeInstallation.cmake
---- ParaView-v5.1.2_org/VTK/ThirdParty/hdf5/vtkhdf5/CMakeInstallation.cmake	2016-07-26 21:52:16.000000000 +0200
-+++ ParaView-v5.1.2/VTK/ThirdParty/hdf5/vtkhdf5/CMakeInstallation.cmake	2016-10-13 17:01:06.326836570 +0200
-@@ -58,7 +58,7 @@
-   )
-   install (
-       FILES ${HDF5_BINARY_DIR}/CMakeFiles/FindHDF5${HDF_PACKAGE_EXT}.cmake
--      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE}
-+      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE}_paraview
-       COMPONENT configinstall
-   )
- endif (NOT HDF5_EXTERNALLY_CONFIGURED)
-@@ -73,7 +73,7 @@
-   )
-   install (
-       FILES ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake
--      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE}
-+      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE}_paraview
-       COMPONENT configinstall
-   )
- endif (NOT HDF5_EXTERNALLY_CONFIGURED)
-@@ -88,7 +88,7 @@
-   )
-   install (
-       FILES ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake
--      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE}
-+      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE}_paraview
-       COMPONENT configinstall
-   )
- endif (NOT HDF5_EXTERNALLY_CONFIGURED)
-@@ -107,7 +107,7 @@
- )
- install (
-     FILES ${HDF5_BINARY_DIR}/libhdf5.settings
--    DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE}
-+    DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE}_paraview
-     COMPONENT libraries
- )
-
author	Michel Zou	2017-03-20 22:44:19 +0100
committer	Michel Zou	2017-03-20 22:44:19 +0100
commit	35576e6bf556c8c7f89202d734bc1524aa169fd3 (patch)
tree	516b23fd5628148a565adc970e3dc8d6c0e77ab0
parent	786b9d157c6326039a9285e4bb739e09b8b03cca (diff)
download	aur-35576e6bf556c8c7f89202d734bc1524aa169fd3.tar.gz