[packages/ParaView] - updated to 4.0.1 - files needs fixing
baggins
baggins at pld-linux.org
Sun Jul 14 21:45:57 CEST 2013
commit 625736597f22315b6ca774f27445a65b8d103d4c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Jul 14 21:45:41 2013 +0200
- updated to 4.0.1
- files needs fixing
ParaView-3.2.2-hdf5.patch | 11 ------
ParaView-3.8.0-include.patch | 20 ----------
ParaView-gcc47.patch | 35 ------------------
ParaView-install.patch | 12 ++++++
ParaView-system-Protobuf.patch | 60 ++++++++++++++++++++++++++++++
ParaView-system-netcdf.patch | 75 ++++++++++++++++++++++++++++++++++++++
ParaView-vtk-use-system-libs.patch | 37 ++++++++++---------
ParaView-vtkboost.patch | 22 -----------
ParaView-vtknetcdf-lm.patch | 10 -----
ParaView.spec | 72 +++++++++++++++++++++++-------------
disable-broken-tests.patch | 17 +++++++++
11 files changed, 229 insertions(+), 142 deletions(-)
---
diff --git a/ParaView.spec b/ParaView.spec
index d1cae5b..5aa901c 100644
--- a/ParaView.spec
+++ b/ParaView.spec
@@ -1,21 +1,19 @@
Summary: Parallel visualization application
Name: ParaView
-Version: 3.14.1
-Release: 3
+Version: 4.0.1
+Release: 0.1
License: BSD
Group: Applications/Engineering
URL: http://www.paraview.org/
-Source0: http://www.paraview.org/files/v3.14/%{name}-%{version}-Source.tar.gz
-# Source0-md5: 039c612777f5eb7bba5d37319f34c922
+Source0: http://www.paraview.org/files/v4.0/%{name}-v%{version}-source.tgz
+# Source0-md5: 6a300744eaf32676a3a7e1b42eb642c7
Source1: %{name}_22x22.png
Source2: %{name}.xml
-Patch0: %{name}-3.8.0-include.patch
-Patch1: %{name}-gcc47.patch
-Patch2: %{name}-3.2.2-hdf5.patch
-Patch3: %{name}-kwprocessxml_rpath.patch
-Patch4: %{name}-vtkboost.patch
-Patch5: %{name}-vtk-use-system-libs.patch
-Patch6: %{name}-vtknetcdf-lm.patch
+Patch0: %{name}-vtk-use-system-libs.patch
+Patch1: %{name}-install.patch
+Patch2: %{name}-system-Protobuf.patch
+Patch3: %{name}-system-netcdf.patch
+Patch4: disable-broken-tests.patch
BuildRequires: Mesa-libOSMesa-devel
BuildRequires: QtDesigner-devel
BuildRequires: QtHelp-devel
@@ -37,7 +35,10 @@ BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libtheora-devel
BuildRequires: libtiff-devel
+BuildRequires: netcdf-devel
+BuildRequires: netcdf-cxx-devel
BuildRequires: openssl-devel
+BuildRequires: protobuf-devel
BuildRequires: python-devel
BuildRequires: qt4-build
BuildRequires: readline-devel
@@ -74,30 +75,39 @@ support.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
-%setup -q -n %{name}-%{version}-Source
-%patch0 -p1
+%setup -q -n %{name}-v%{version}-source
+%patch0 -p0
%patch1 -p1
%patch2 -p1
-%patch3 -p1
+%patch3 -p0
%patch4 -p1
-%patch5 -p0
-%patch6 -p1
-#Remove included hdf5 just to be sure
-rm -r VTK/Utilities/vtkhdf5
+#Remove included thirdparty sources just to be sure
+for x in protobuf ; do
+ rm -r ThirdParty/$x/vtk$x
+done
+for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png sqlite tiff zlib ; do
+ rm -r VTK/ThirdParty/$x/vtk$x
+done
+
+%{__rm} -r ParaViewCore/ServerImplementation/Default/Testing
%build
+rm -rf build
mkdir build
cd build
%cmake .. \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_CXX_COMPILER:FILEPATH=%{__cxx} \
+ -DCMAKE_C_COMPILER:FILEPATH=%{__cc} \
-DPV_INSTALL_INCLUDE_DIR:PATH=include/paraview \
- -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/paraview \
+ -DPV_INSTALL_LIBRARY_DIR:PATH=%{_lib}/paraview \
-DTCL_LIBRARY:PATH=tcl \
-DTK_LIBRARY:PATH=tk \
-DPARAVIEW_BUILD_PLUGIN_AdiosReader:BOOL=ON \
@@ -106,23 +116,33 @@ cd build
-DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON \
-DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
-DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \
- -DPARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON \
- -DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \
- -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
+ -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
+ -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/paraview \
+ -DVTK_INSTALL_INCLUDE_DIR:PATH=include/paraview \
+ -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/paraview \
+ -DVTK_INSTALL_PACKAGE_DIR=share/cmake/paraview \
-DVTK_USE_BOOST:BOOL=ON \
-DVTK_USE_INFOVIS:BOOL=OFF \
-DVTK_USE_N_WAY_ARRAYS:BOOL=ON \
-DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON \
- -DVTK_USE_SYSTEM_LIBRARIES=ON \
- -DVTK_USE_SYSTEM_HDF5=ON \
-DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
-DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
-DVTK_USE_SYSTEM_HDF5:BOOL=ON \
+ -DVTK_USE_SYSTEM_HDF5=ON \
+ -DHDF5_HL_LIBRARY:FILEPATH=%{_libdir}/libhdf5_hl.so \
-DVTK_USE_SYSTEM_JPEG:BOOL=ON \
+ -DVTK_USE_SYSTEM_LIBPROJ4=OFF \
+ -DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \
+ -DVTK_USE_SYSTEM_LIBRARIES=ON \
-DVTK_USE_SYSTEM_PNG:BOOL=ON \
-DVTK_USE_SYSTEM_TIFF:BOOL=ON \
-DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
- -DVTK_USE_SYSTEM_LIBPROJ4=OFF \
+ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \
+ -DVTK_USE_INFOVIS:BOOL=OFF \
+ -DVTK_USE_SYSTEM_ICET=OFF \
+ -DVTK_USE_SYSTEM_NETCDF=ON \
+ -DVTK_USE_SYSTEM_QTTESTING=OFF \
+ -DVTK_USE_SYSTEM_XDMF2=OFF \
-DXDMF_WRAP_PYTHON:BOOL=ON \
-DBUILD_DOCUMENTATION:BOOL=ON \
-DBUILD_EXAMPLES:BOOL=ON
diff --git a/ParaView-3.2.2-hdf5.patch b/ParaView-3.2.2-hdf5.patch
deleted file mode 100644
index f019fe9..0000000
--- a/ParaView-3.2.2-hdf5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfH5Driver.h.hdf5 2007-11-07 13:51:40.000000000 -0700
-+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfH5Driver.h 2008-06-26 16:31:16.000000000 -0600
-@@ -27,7 +27,7 @@
- #include "XdmfDsmBuffer.h"
-
- #include "H5Ipublic.h"
--#include "H5pubconf.h"
-+#include "H5public.h"
-
- #include "XdmfExport.h"
-
diff --git a/ParaView-3.8.0-include.patch b/ParaView-3.8.0-include.patch
deleted file mode 100644
index d216cc6..0000000
--- a/ParaView-3.8.0-include.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ParaView-3.8.0/Utilities/Xdmf2/libsrc/XdmfDataDesc.h.include 2009-11-27 02:56:17.000000000 -0700
-+++ ParaView-3.8.0/Utilities/Xdmf2/libsrc/XdmfDataDesc.h 2010-04-19 13:59:05.609711395 -0600
-@@ -27,6 +27,7 @@
-
- #include "XdmfObject.h"
- #include "XdmfHDFSupport.h"
-+#include <cstring>
-
- #define XDMF_SELECTALL 0
- #define XDMF_HYPERSLAB 1
---- ParaView-3.8.1/VTK/Utilities/vtkmetaio/metaUtils.cxx.orig 2010-09-28 10:08:05.000000000 -0400
-+++ ParaView-3.8.1/VTK/Utilities/vtkmetaio/metaUtils.cxx 2011-03-29 20:05:06.658419554 -0400
-@@ -36,6 +36,7 @@
-
- #include <stdlib.h>
- #include <string.h>
-+#include <stddef.h>
- #include <string>
-
- #if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580)
diff --git a/ParaView-gcc47.patch b/ParaView-gcc47.patch
deleted file mode 100644
index 7cd826c..0000000
--- a/ParaView-gcc47.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -up ParaView-3.14.0-RC2/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47 ParaView-3.14.0-RC2/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx
---- ParaView-3.14.0-RC2/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47 2012-02-09 10:43:55.000000000 -0700
-+++ ParaView-3.14.0-RC2/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx 2012-02-11 14:30:02.946878437 -0700
-@@ -37,6 +37,8 @@
- #include "vtkTimeSourceExample.h"
- #include "vtkXdmfReader.h"
-
-+#include <unistd.h>
-+
- #define NUMTESTS 20
-
- const char testobject[NUMTESTS][40] = {
-diff -up ParaView-3.14.0-RC2/VTK/Rendering/vtkFreeTypeTools.cxx.gcc47 ParaView-3.14.0-RC2/VTK/Rendering/vtkFreeTypeTools.cxx
---- ParaView-3.14.0-RC2/VTK/Rendering/vtkFreeTypeTools.cxx.gcc47 2012-02-09 10:45:19.000000000 -0700
-+++ ParaView-3.14.0-RC2/VTK/Rendering/vtkFreeTypeTools.cxx 2012-02-11 13:53:22.515115770 -0700
-@@ -31,6 +31,8 @@
- // The embedded fonts
- #include "fonts/vtkEmbeddedFonts.h"
-
-+#include <unistd.h>
-+
- #ifdef FTGL_USE_NAMESPACE
- using namespace ftgl;
- #endif
-diff -up ParaView-3.14.0-RC2/VTK/Rendering/vtkFreeTypeUtilities.cxx.gcc47 ParaView-3.14.0-RC2/VTK/Rendering/vtkFreeTypeUtilities.cxx
---- ParaView-3.14.0-RC2/VTK/Rendering/vtkFreeTypeUtilities.cxx.gcc47 2012-02-09 10:45:19.000000000 -0700
-+++ ParaView-3.14.0-RC2/VTK/Rendering/vtkFreeTypeUtilities.cxx 2012-02-11 11:34:44.396589034 -0700
-@@ -31,6 +31,7 @@
- #include "fonts/vtkEmbeddedFonts.h"
-
- #include <sys/stat.h>
-+#include <unistd.h>
-
- #ifdef FTGL_USE_NAMESPACE
- using namespace ftgl;
diff --git a/ParaView-install.patch b/ParaView-install.patch
new file mode 100644
index 0000000..529e32f
--- /dev/null
+++ b/ParaView-install.patch
@@ -0,0 +1,12 @@
+diff -up ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt.install ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt
+--- ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt.install 2012-12-03 08:31:22.000000000 -0700
++++ ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt 2012-12-05 11:20:52.659956535 -0700
+@@ -82,7 +82,7 @@ set (SQTK_VERSION "SQTK-${SQTK_RELEASE}
+
+ # put the plugin inside the pv install
+ set(SQTK_LIB_INSTALL_PATH
+- "${CMAKE_INSTALL_PREFIX}/lib/paraview-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}"
++ "${PV_INSTALL_LIB_DIR}"
+ )
+ #message(STATUS "SQTK will be installed at ${SQTK_LIB_INSTALL_PATH}")
+
diff --git a/ParaView-system-Protobuf.patch b/ParaView-system-Protobuf.patch
new file mode 100644
index 0000000..871ce12
--- /dev/null
+++ b/ParaView-system-Protobuf.patch
@@ -0,0 +1,60 @@
+diff -up ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.Protobuf ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt
+--- ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.Protobuf 2012-11-27 09:09:41.000000000 -0700
++++ ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt 2012-11-27 13:00:36.072178577 -0700
+@@ -80,16 +80,16 @@ set (${vtk-module}_HDRS
+ #------------------------------------------------------------------------------
+ # Generate the protbuf message file.
+ #------------------------------------------------------------------------------
+-get_target_property(PROTOC_LOCATION protoc_compiler LOCATION)
++get_target_property(PROTOC_LOCATION protoc LOCATION)
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.h
+ ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.cc
+
+- COMMAND protoc_compiler
++ COMMAND protoc
+ "--cpp_out=dllexport_decl=VTKPVSERVERIMPLEMENTATIONCORE_EXPORT:${CMAKE_CURRENT_BINARY_DIR}"
+ --proto_path "@CMAKE_CURRENT_SOURCE_DIR@"
+ "${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto"
+- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto protoc_compiler
++ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ )
+
+@@ -108,5 +108,7 @@ endif()
+ vtk_module_library(vtkPVServerImplementationCore
+ ${Module_SRCS})
+
++target_link_libraries(vtkPVServerImplementationCore -lpthread)
++
+ add_dependencies(vtkPVServerImplementationCore
+ protobuf_code_generation)
+diff -up ParaView/ThirdParty/protobuf/CMakeLists.txt.Protobuf ParaView/ThirdParty/protobuf/CMakeLists.txt
+--- ParaView/ThirdParty/protobuf/CMakeLists.txt.Protobuf 2012-11-27 09:09:45.000000000 -0700
++++ ParaView/ThirdParty/protobuf/CMakeLists.txt 2012-11-27 13:02:04.535632175 -0700
+@@ -34,7 +34,7 @@ set (PROTOBUF_INSTALL_BIN_DIR ${VTK_INST
+ set (PROTOBUF_INSTALL_LIB_DIR ${VTK_INSTALL_LIBRARY_DIR})
+ set (PROTOBUF_INSTALL_EXPORT_NAME ${VTK_INSTALL_EXPORT_NAME})
+
+-vtk_module_third_party(protobuf
++vtk_module_third_party(Protobuf
+ INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/vtkprotobuf/src
+ LIBRARIES protobuf
+ )
+@@ -42,11 +42,11 @@ vtk_module_third_party(protobuf
+ # protobuf exports it's build-dir targets to a custom file
+ # (PROTOBUF_EXPORTS.cmake). We don't care much about that. We export
+ # build-dir targets ourselves.
+-vtk_target_export(protobuf)
+-vtk_target_export(protobuf-lite)
+-if (NOT CMAKE_CROSSCOMPILING)
+- vtk_compile_tools_target_export(protoc_compiler)
+-endif()
++#vtk_target_export(protobuf)
++#vtk_target_export(protobuf-lite)
++#if (NOT CMAKE_CROSSCOMPILING)
++# vtk_compile_tools_target_export(protoc_compiler)
++#endif()
+
+ # All these exports don't add any install rules. However we make protobuf itself
+ # install components at the right location by setting PROTOBUF_INSTALL_*
diff --git a/ParaView-system-netcdf.patch b/ParaView-system-netcdf.patch
new file mode 100644
index 0000000..df0ef94
--- /dev/null
+++ b/ParaView-system-netcdf.patch
@@ -0,0 +1,75 @@
+diff -up VTK/IO/NetCDF/CMakeLists.txt.netcdf VTK/IO/NetCDF/CMakeLists.txt
+--- VTK/IO/NetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700
++++ VTK/IO/NetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700
+@@ -10,5 +10,5 @@ set(Module_SRCS
+
+ vtk_module_library(vtkIONetCDF ${Module_SRCS})
+
+-target_link_libraries(vtkIONetCDF vtkNetCDF_cxx)
++target_link_libraries(vtkIONetCDF netcdf_c++ netcdf)
+ set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "")
+diff -up VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf VTK/IO/ParallelNetCDF/CMakeLists.txt
+--- VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700
++++ VTK/IO/ParallelNetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700
+@@ -8,4 +8,4 @@ set(Module_SRCS
+
+ vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS})
+
+-target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx)
++target_link_libraries(vtkIOParallelNetCDF netcdf)
+diff -up VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
+--- VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700
++++ VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt 2013-01-28 15:40:27.534030910 -0700
+@@ -241,7 +241,7 @@ ENDIF(APPLE)
+
+
+ VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS})
+-TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF)
++TARGET_LINK_LIBRARIES(vtkexoIIc netcdf)
+
+ #INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
+
+diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt
+--- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700
++++ VTK/ThirdParty/netcdf/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700
+@@ -1,8 +1,12 @@
+ set(vtknetcdf_THIRD_PARTY 1)
+-set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
+-set(vtknetcdf_INCLUDE_DIRS
+- ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
+- ${vtknetcdf_BINARY_DIR}/vtknetcdf
+- )
++if(NOT VTK_USE_SYSTEM_NETCDF)
++ set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
++ set(vtknetcdf_INCLUDE_DIRS
++ ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
++ ${vtknetcdf_BINARY_DIR}/vtknetcdf
++ )
++ add_subdirectory(vtknetcdf)
++else(NOT VTK_USE_SYSTEM_NETCDF)
++ set(vtknetcdf_LIBRARIES netcdf)
++endif()
+ vtk_module_export_info()
+-add_subdirectory(vtknetcdf)
+diff -up VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
+--- VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf 2013-01-28 14:44:36.000000000 -0700
++++ VTK/ThirdParty/netcdf/vtk_netcdfcpp.h 2013-01-28 15:40:00.826176289 -0700
+@@ -16,6 +16,6 @@
+ #define __vtk_netcdfcpp_h
+
+ /* Use the netcdf library configured for VTK. */
+-#include <vtknetcdf/cxx/netcdfcpp.h>
++#include <netcdfcpp.h>
+
+ #endif
+diff -up VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdf.h
+--- VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf 2013-01-28 14:44:36.000000000 -0700
++++ VTK/ThirdParty/netcdf/vtk_netcdf.h 2013-01-28 15:40:00.826176289 -0700
+@@ -16,6 +16,6 @@
+ #define __vtk_netcdf_h
+
+ /* Use the netcdf library configured for VTK. */
+-#include <vtknetcdf/include/netcdf.h>
++#include <netcdf.h>
+
+ #endif
diff --git a/ParaView-vtk-use-system-libs.patch b/ParaView-vtk-use-system-libs.patch
index 5d44c35..7beecbc 100644
--- a/ParaView-vtk-use-system-libs.patch
+++ b/ParaView-vtk-use-system-libs.patch
@@ -1,8 +1,8 @@
diff -up VTK/CMakeLists.txt.system VTK/CMakeLists.txt
---- VTK/CMakeLists.txt.system 2010-09-27 14:40:00.000000000 -0600
-+++ VTK/CMakeLists.txt 2011-02-08 14:08:29.367122550 -0700
-@@ -106,6 +106,11 @@ IF(CMAKE_CONFIGURATION_TYPES)
- ENDIF(CMAKE_CONFIGURATION_TYPES)
+--- VTK/CMakeLists.txt.system 2012-12-03 08:31:29.000000000 -0700
++++ VTK/CMakeLists.txt 2012-12-06 09:58:22.809749444 -0700
+@@ -97,6 +97,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_I
+ set(VTK_INSTALL_DOXYGEN_DIR_CM24 ${VTK_INSTALL_DATA_DIR}/doxygen)
#-----------------------------------------------------------------------------
+# Do we try to use system libraries by default?
@@ -10,17 +10,18 @@ diff -up VTK/CMakeLists.txt.system VTK/CMakeLists.txt
+MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES)
+
+#-----------------------------------------------------------------------------
- # Load some macros.
- INCLUDE(vtkDependentOption)
- INCLUDE(vtkThirdParty)
-diff -up VTK/CMake/vtkThirdParty.cmake.system VTK/CMake/vtkThirdParty.cmake
---- VTK/CMake/vtkThirdParty.cmake.system 2010-09-27 14:40:00.000000000 -0600
-+++ VTK/CMake/vtkThirdParty.cmake 2011-02-08 14:07:46.424662568 -0700
-@@ -1,6 +1,6 @@
- #-----------------------------------------------------------------------------
- MACRO(VTK_THIRD_PARTY_OPTION upper lower)
-- OPTION(VTK_USE_SYSTEM_${upper} "Use the system's ${lower} library." OFF)
-+ OPTION(VTK_USE_SYSTEM_${upper} "Use the system's ${lower} library." ${VTK_USE_SYSTEM_LIBRARIES})
- MARK_AS_ADVANCED(VTK_USE_SYSTEM_${upper})
- IF(VTK_USE_SYSTEM_${upper})
- IF(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake)
+ # The third party macros are still used in one or two third party builds.
+ include(vtkThirdParty)
+
+diff -up VTK/CMake/vtkModuleMacros.cmake.system VTK/CMake/vtkModuleMacros.cmake
+--- VTK/CMake/vtkModuleMacros.cmake.system 2012-12-03 08:31:29.000000000 -0700
++++ VTK/CMake/vtkModuleMacros.cmake 2012-12-06 09:58:22.810749439 -0700
+@@ -563,7 +563,7 @@ macro(vtk_module_third_party _pkg)
+ message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES")
+ endif()
+
+- option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" OFF)
++ option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" ${VTK_USE_SYSTEM_LIBRARIES})
+ mark_as_advanced(VTK_USE_SYSTEM_${_upper})
+
+ if(VTK_USE_SYSTEM_${_upper})
diff --git a/ParaView-vtkboost.patch b/ParaView-vtkboost.patch
deleted file mode 100644
index 0a45842..0000000
--- a/ParaView-vtkboost.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ParaView-3.14.1-Source/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx 2012-04-02 10:57:30.000000000 -0600
-+++ VTK5.10.1/Infovis/vtkBoostBreadthFirstSearchTree.cxx 2012-10-15 14:33:21.000000000 -0600
-@@ -49,11 +49,17 @@
-
- #if BOOST_VERSION >= 104800 // Boost 1.48.x
- namespace {
-- vtkIdType unwrap_edge_id(vtkEdgeType const &e) {
-+ vtkIdType unwrap_edge_id(vtkEdgeType const &e)
-+ {
- return e.Id;
- }
-- vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) {
-+ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e)
-+ {
-+# if BOOST_VERSION == 104800
- return e.underlying_desc.Id;
-+# else
-+ return e.underlying_descx.Id;
-+# endif
- }
- }
- #endif
diff --git a/ParaView-vtknetcdf-lm.patch b/ParaView-vtknetcdf-lm.patch
deleted file mode 100644
index 343c2fe..0000000
--- a/ParaView-vtknetcdf-lm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ParaView-3.14.1-Source/VTK/Utilities/vtknetcdf/CMakeLists.txt~ 2012-04-02 18:57:30.000000000 +0200
-+++ ParaView-3.14.1-Source/VTK/Utilities/vtknetcdf/CMakeLists.txt 2012-11-15 12:48:08.386680992 +0100
-@@ -343,6 +343,7 @@
- TARGET_LINK_LIBRARIES(vtkNetCDF ${VTK_HDF5_LIBRARIES})
- endif()
- ENDIF (NETCDF_ENABLE_NETCDF4)
-+TARGET_LINK_LIBRARIES(vtkNetCDF -lm)
-
- VTK_ADD_LIBRARY(vtkNetCDF_cxx ${netcdf_cxx_SOURCES})
- TARGET_LINK_LIBRARIES(vtkNetCDF_cxx vtkNetCDF)
diff --git a/disable-broken-tests.patch b/disable-broken-tests.patch
new file mode 100644
index 0000000..d5f28c0
--- /dev/null
+++ b/disable-broken-tests.patch
@@ -0,0 +1,17 @@
+--- ParaView-v4.0.1-source/ParaViewCore/ServerManager/Default/Testing/Cxx/CMakeLists.txt~ 2013-07-14 21:17:50.899664442 +0200
++++ ParaView-v4.0.1-source/ParaViewCore/ServerManager/Default/Testing/Cxx/CMakeLists.txt 2013-07-14 21:37:51.474780574 +0200
+@@ -14,14 +14,6 @@
+ TestProxyAnnotation
+ )
+
+-foreach (name ${test_srcs})
+- vtk_module_test_executable(${name}
+- ${name}.cxx)
+- add_test(NAME ${name}
+- COMMAND ${name} ${name} -D ${VTK_DATA_ROOT})
+- set_tests_properties(${name} PROPERTIES LABELS "PARAVIEW")
+-endforeach()
+-
+ #------------------------------------------------------------------------------
+ if (PARAVIEW_DATA_ROOT)
+ # This is the executable that can load any Server Manager state (*.pvsm) file
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ParaView.git/commitdiff/625736597f22315b6ca774f27445a65b8d103d4c
More information about the pld-cvs-commit
mailing list