[packages/ParaView] - updated to 3.14.1 - updated patches from fedora
baggins
baggins at pld-linux.org
Fri Nov 16 11:05:13 CET 2012
commit 8d833c50db28d352cfcbb52491d89af4f9f7e059
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Nov 16 11:04:36 2012 +0100
- updated to 3.14.1
- updated patches from fedora
ParaView-gcc47.patch | 41 ++++++++++++++++---------
ParaView-kwprocessxml_rpath.patch | 27 ++++++++++++++++
ParaView-vtk-use-system-libs.patch | 26 ++++++++++++++++
ParaView-vtkboost.patch | 22 +++++++++++++
ParaView.spec | 63 +++++++++++++++++++++++++++++---------
5 files changed, 149 insertions(+), 30 deletions(-)
---
diff --git a/ParaView.spec b/ParaView.spec
index fed6e29..5174f74 100644
--- a/ParaView.spec
+++ b/ParaView.spec
@@ -1,24 +1,28 @@
Summary: Parallel visualization application
Name: ParaView
-Version: 3.12.0
-Release: 3
+Version: 3.14.1
+Release: 1
License: BSD
Group: Applications/Engineering
URL: http://www.paraview.org/
-Source0: http://www.paraview.org/files/v3.12/%{name}-%{version}.tar.gz
-# Source0-md5: 8feabc6261e2060648eaac593d85b1de
+Source0: http://www.paraview.org/files/v3.14/%{name}-%{version}-Source.tar.gz
+# Source0-md5: 039c612777f5eb7bba5d37319f34c922
Source1: %{name}_22x22.png
Source2: %{name}.xml
Patch0: %{name}-3.8.0-include.patch
-Patch1: %{name}-3.12.0-boost-1.48.0-bfs.patch
-Patch2: %{name}-gcc47.patch
-Patch3: %{name}-3.2.2-hdf5.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
BuildRequires: Mesa-libOSMesa-devel
BuildRequires: QtDesigner-devel
BuildRequires: QtHelp-devel
BuildRequires: QtSql-devel
BuildRequires: QtSql-sqlite
BuildRequires: QtUiTools-devel
+BuildRequires: QtXmlPatterns-devel
BuildRequires: QtWebKit-devel
BuildRequires: boost-devel
BuildRequires: cmake
@@ -42,6 +46,7 @@ BuildRequires: wget
BuildRequires: zlib-devel
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
+%requires_eq_to hdf5 hdf5-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define skip_post_check_so lib.*Python.*\.so.*
@@ -76,12 +81,14 @@ The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}-Source
%patch0 -p1
-# We don't have boot 1.48 yet
-#%patch1 -p1
+%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
+%patch5 -p0
+%patch6 -p1
#Remove included hdf5 just to be sure
rm -r VTK/Utilities/vtkhdf5
@@ -100,11 +107,14 @@ cd build
-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 \
-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 \
@@ -112,10 +122,13 @@ cd build
-DVTK_USE_SYSTEM_PNG:BOOL=ON \
-DVTK_USE_SYSTEM_TIFF:BOOL=ON \
-DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
+ -DVTK_USE_SYSTEM_LIBPROJ4=OFF \
-DXDMF_WRAP_PYTHON:BOOL=ON \
-DBUILD_DOCUMENTATION:BOOL=ON \
-DBUILD_EXAMPLES:BOOL=ON
+# -DVTK_PYTHON_SETUP_ARGS="--prefix=/usr --root=$RPM_BUILD_ROOT" \
+
%{__make} VERBOSE=1
%install
@@ -144,9 +157,13 @@ Categories=Application;Graphics;
Exec=paraview
EOF
+# Move python files by hand for now
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/Python/vtk $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/
+%{__rm} -r $RPM_BUILD_ROOT%{_bindir}/Python
+
# Install vtk*Python.so by hand for now
-cp -p bin/vtk*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/vtk/
-mv $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/vtk/vtkPV*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/paraview/vtk*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/vtk/
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/vtk/vtkPV*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/
# Cleanup vtk binaries
rm $RPM_BUILD_ROOT%{_bindir}/vtk*
@@ -190,7 +207,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/paraview/*.py
%{_libdir}/paraview/testing
%{_libdir}/paraview/.plugins
-%{_libdir}/paraview/SESAMEConversions.xml
%{_libdir}/paraview/hints
%{_libdir}/paraview/ParaViewCore
%dir %{_libdir}/paraview/site-packages
@@ -200,13 +216,30 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/paraview/site-packages/paraview/*.so
%{_libdir}/paraview/site-packages/paraview/demos
%{_libdir}/paraview/site-packages/paraview/vtk
+%dir %{_libdir}/paraview/site-packages/vtk
+%{_libdir}/paraview/site-packages/vtk/*.py*
+%dir %{_libdir}/paraview/site-packages/vtk/gtk
+%{_libdir}/paraview/site-packages/vtk/gtk/*.py*
+%dir %{_libdir}/paraview/site-packages/vtk/qt
+%{_libdir}/paraview/site-packages/vtk/qt/*.py*
+%dir %{_libdir}/paraview/site-packages/vtk/qt4
+%{_libdir}/paraview/site-packages/vtk/qt4/*.py*
+%dir %{_libdir}/paraview/site-packages/vtk/test
+%{_libdir}/paraview/site-packages/vtk/test/*.py*
+%dir %{_libdir}/paraview/site-packages/vtk/tk
+%{_libdir}/paraview/site-packages/vtk/tk/*.py*
+%dir %{_libdir}/paraview/site-packages/vtk/util
+%{_libdir}/paraview/site-packages/vtk/util/*.py*
+%dir %{_libdir}/paraview/site-packages/vtk/wx
+%{_libdir}/paraview/site-packages/vtk/wx/*.py*
%{_desktopdir}/ParaView.desktop
%{_pixmapsdir}/ParaView_22x22.png
%{_datadir}/mime/packages/ParaView.xml
-%dir %{_datadir}/doc/paraview-3.12
-%{_datadir}/doc/paraview-3.12/paraview.qch
+%dir %{_datadir}/doc/paraview-3.14
+%{_datadir}/doc/paraview-3.14/paraview.qch
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kwProcessXML
+%attr(755,root,root) %{_libdir}/paraview/kwProcessXML-real
%{_includedir}/paraview/
diff --git a/ParaView-gcc47.patch b/ParaView-gcc47.patch
index c34e901..7cd826c 100644
--- a/ParaView-gcc47.patch
+++ b/ParaView-gcc47.patch
@@ -1,18 +1,6 @@
-diff -up ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h.gcc47 ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h
---- ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h.gcc47 2012-01-27 12:12:55.623530977 -0700
-+++ ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h 2012-01-30 15:26:33.107335300 -0700
-@@ -72,7 +72,7 @@ public:
- Clear = QItemSelectionModel::Clear,
- Select = QItemSelectionModel::Select,
- Deselect = QItemSelectionModel::Deselect,
-- ClearAndSelect = Clear | Select
-+ ClearAndSelect = static_cast<int>(Clear) | static_cast<int>(Select)
- };
- Q_DECLARE_FLAGS(SelectionFlags, SelectionFlag)
-
-diff -up ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47 ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx
---- ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47 2011-11-08 13:56:29.000000000 -0700
-+++ ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx 2012-01-27 09:30:00.088542888 -0700
+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"
@@ -22,3 +10,26 @@ diff -up ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47
#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-kwprocessxml_rpath.patch b/ParaView-kwprocessxml_rpath.patch
new file mode 100644
index 0000000..f71ead9
--- /dev/null
+++ b/ParaView-kwprocessxml_rpath.patch
@@ -0,0 +1,27 @@
+Description: This patch forces building of kwProcessXML as shared forwarded
+ executable in our case (even is CMAKE_SKIP_RPATH is OFF in debian)
+Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Bug-Debian: http://bugs.debian.org/640305
+Last-Update: 2011-09-13
+
+--- a/Common/KWCommon/CMakeLists.txt
++++ b/Common/KWCommon/CMakeLists.txt
+@@ -225,7 +225,7 @@
+ IF(KWCOMMON_BUILD_PROCESSXML)
+ # For shared libraries on non-windows systems use the KWSys shared-forward
+ # implementation to make sure shared libraries are found.
+- IF(BUILD_SHARED_LIBS AND CMAKE_SKIP_RPATH)
++ IF(BUILD_SHARED_LIBS )
+ IF(NOT WIN32)
+ SET(KWCommon_FORWARD_DIR_BUILD ${EXECUTABLE_OUTPUT_PATH})
+ SET(KWCommon_FORWARD_BIN_TO_LIB "..${KWCommon_INSTALL_LIB_DIR}")
+@@ -248,7 +248,7 @@
+ COMPONENT Development)
+ ENDIF(NOT KWCommon_INSTALL_NO_DEVELOPMENT)
+ ENDIF(NOT WIN32)
+- ENDIF(BUILD_SHARED_LIBS AND CMAKE_SKIP_RPATH)
++ ENDIF(BUILD_SHARED_LIBS )
+
+ ADD_EXECUTABLE(kwProcessXML${KWCommon_EXE_SUFFIX} ProcessXML.cxx)
+ TARGET_LINK_LIBRARIES(kwProcessXML${KWCommon_EXE_SUFFIX} vtkCommon vtksys)
+
diff --git a/ParaView-vtk-use-system-libs.patch b/ParaView-vtk-use-system-libs.patch
new file mode 100644
index 0000000..5d44c35
--- /dev/null
+++ b/ParaView-vtk-use-system-libs.patch
@@ -0,0 +1,26 @@
+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)
+
+ #-----------------------------------------------------------------------------
++# Do we try to use system libraries by default?
++OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF)
++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)
diff --git a/ParaView-vtkboost.patch b/ParaView-vtkboost.patch
new file mode 100644
index 0000000..0a45842
--- /dev/null
+++ b/ParaView-vtkboost.patch
@@ -0,0 +1,22 @@
+--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ParaView.git/commitdiff/8d833c50db28d352cfcbb52491d89af4f9f7e059
More information about the pld-cvs-commit
mailing list