[paraview] 01/01: Use packaged version of some libs instead of embedded.
Anton Gladky
gladk at moszumanska.debian.org
Thu Feb 4 05:38:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch 5.0v2
in repository paraview.
commit 3186f9b04d59ce7c0646f6d846358918abe41419
Author: Anton Gladky <gladk at debian.org>
Date: Thu Feb 4 06:37:58 2016 +0100
Use packaged version of some libs instead of embedded.
---
debian/control | 6 +-
debian/copyright | 21 +++
debian/patches/series | 2 +
debian/patches/use_system_mpi4py.patch | 44 +++++++
debian/patches/use_system_utf8.patch | 232 +++++++++++++++++++++++++++++++++
debian/rules | 25 ++--
debian/watch | 2 +-
7 files changed, 319 insertions(+), 13 deletions(-)
diff --git a/debian/control b/debian/control
index fd66b45..b905158 100644
--- a/debian/control
+++ b/debian/control
@@ -44,8 +44,12 @@ Build-Depends: debhelper (>= 9),
libgl2ps-dev,
libqtwebkit-dev,
libeigen3-dev,
+ libnetcdf-dev,
+ libnetcdf-cxx-legacy-dev,
libjsoncpp-dev,
- libxdmf-dev
+ libglew-dev,
+ libxdmf-dev,
+ libutfcpp-dev
Standards-Version: 3.9.6
Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/paraview.git
Vcs-Git: git://anonscm.debian.org/debian-science/packages/paraview.git
diff --git a/debian/copyright b/debian/copyright
index 2a07247..1d07ae5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,27 @@ Files-Excluded: Web VTK/Examples/GUI/Win32
Web/Widgets/Pipeline/*.js
Web/Widgets/PipelineBrowser/paraview.ui.pipeline.js
VTK/Web
+ VTK/ThirdParty/expat/vtkexpat
+ VTK/ThirdParty/freetype/vtkfreetype
+ VTK/ThirdParty/gl2ps/vtkgl2ps
+ VTK/ThirdParty/hdf5/vtkhdf5
+ VTK/ThirdParty/jpeg/vtkjpeg
+ VKT/ThirdParty/jsoncpp/vtkjsoncpp
+ VTK/ThirdParty/libxml2/vtklibxml2
+ VTK/ThirdParty/netcdf/vtknetcdf
+ VTK/ThirdParty/oggtheora/vtkoggtheora
+ VTK/ThirdParty/png/vtkpng
+ VTK/ThirdParty/sqlite/vtksqlite
+ VTK/ThirdParty/tiff/vtktiff
+ VTK/ThirdParty/zlib/vtkzlib
+ VTK/ThirdParty/glew/vtkglew
+ VTK/ThirdParty/utf8
+ VTK/ThirdParty/AutobahnPython
+ VTK/ThirdParty/SixPython
+ VTK/ThirdParty/ZopeInterface
+ VTK/ThirdParty/mpi4py
+ VTK/ThirdParty/Twisted
+
Files: *
diff --git a/debian/patches/series b/debian/patches/series
index 47d6104..ddfef58 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,6 @@ fix_ftbfs_gcc49.patch
reduce_cmake_error.cmake
use_system_sqlite.patch
use_system_xdmf.patch
+use_system_utf8.patch
+use_system_mpi4py.patch
remove_webgl.patch
diff --git a/debian/patches/use_system_mpi4py.patch b/debian/patches/use_system_mpi4py.patch
new file mode 100644
index 0000000..9af4c91
--- /dev/null
+++ b/debian/patches/use_system_mpi4py.patch
@@ -0,0 +1,44 @@
+Description: use system mpi4py
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2015-03-24
+
+Index: paraview-5.0.0+dfsg1/VTK/Parallel/MPI4Py/CMakeLists.txt
+===================================================================
+--- paraview-5.0.0+dfsg1.orig/VTK/Parallel/MPI4Py/CMakeLists.txt
++++ paraview-5.0.0+dfsg1/VTK/Parallel/MPI4Py/CMakeLists.txt
+@@ -18,7 +18,7 @@ if(VTK_USE_SYSTEM_MPI4PY)
+ mark_as_advanced(MPI4PY_INCLUDE_DIR)
+ endif()
+ else()
+- set(MPI4PY_INCLUDE_DIR "${vtkmpi4py_SOURCE_DIR}/vtkmpi4py/src/include")
++ set(MPI4PY_INCLUDE_DIR "/usr/include")
+ endif()
+ include_directories("${MPI4PY_INCLUDE_DIR}")
+
+Index: paraview-5.0.0+dfsg1/VTK/Parallel/MPI4Py/module.cmake
+===================================================================
+--- paraview-5.0.0+dfsg1.orig/VTK/Parallel/MPI4Py/module.cmake
++++ paraview-5.0.0+dfsg1/VTK/Parallel/MPI4Py/module.cmake
+@@ -5,8 +5,6 @@ if (VTK_WRAP_PYTHON)
+ DEPENDS
+ vtkParallelMPI
+ vtkPython
+- COMPILE_DEPENDS
+- vtkmpi4py
+ EXCLUDE_FROM_TCL_WRAPPING
+ EXCLUDE_FROM_JAVA_WRAPPING
+ KIT
+Index: paraview-5.0.0+dfsg1/ParaViewCore/ClientServerCore/Core/module.cmake
+===================================================================
+--- paraview-5.0.0+dfsg1.orig/ParaViewCore/ClientServerCore/Core/module.cmake
++++ paraview-5.0.0+dfsg1/ParaViewCore/ClientServerCore/Core/module.cmake
+@@ -11,9 +11,6 @@ if (PARAVIEW_ENABLE_PYTHON)
+ endif ()
+
+ set (__compile_dependencies)
+-if (PARAVIEW_ENABLE_PYTHON AND PARAVIEW_USE_MPI)
+- list(APPEND __compile_dependencies vtkmpi4py)
+-endif()
+
+ vtk_module(vtkPVClientServerCoreCore
+ GROUPS
diff --git a/debian/patches/use_system_utf8.patch b/debian/patches/use_system_utf8.patch
new file mode 100644
index 0000000..7197402
--- /dev/null
+++ b/debian/patches/use_system_utf8.patch
@@ -0,0 +1,232 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ vtk6 (6.2.0-1) unstable; urgency=medium
+ .
+ [ James Cowgill ]
+ * [0b9b309] Fix FTBFS due to new freetype. (Closes: #779802)
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: https://bugs.debian.org/779802
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: ParaView-v5.0.0-source/VTK/Common/Core/vtkUnicodeString.cxx
+===================================================================
+--- ParaView-v5.0.0-source.orig/VTK/Common/Core/vtkUnicodeString.cxx
++++ ParaView-v5.0.0-source/VTK/Common/Core/vtkUnicodeString.cxx
+@@ -41,7 +41,7 @@ vtkUnicodeString::const_iterator::const_
+
+ vtkUnicodeString::value_type vtkUnicodeString::const_iterator::operator*() const
+ {
+- return vtk_utf8::unchecked::peek_next(this->Position);
++ return utf8::unchecked::peek_next(this->Position);
+ }
+
+ bool vtkUnicodeString::const_iterator::operator==(const const_iterator& rhs) const
+@@ -56,27 +56,27 @@ bool vtkUnicodeString::const_iterator::o
+
+ vtkUnicodeString::const_iterator& vtkUnicodeString::const_iterator::operator++()
+ {
+- vtk_utf8::unchecked::next(this->Position);
++ utf8::unchecked::next(this->Position);
+ return *this;
+ }
+
+ vtkUnicodeString::const_iterator vtkUnicodeString::const_iterator::operator++(int)
+ {
+ const_iterator result(this->Position);
+- vtk_utf8::unchecked::next(this->Position);
++ utf8::unchecked::next(this->Position);
+ return result;
+ }
+
+ vtkUnicodeString::const_iterator& vtkUnicodeString::const_iterator::operator--()
+ {
+- vtk_utf8::unchecked::prior(this->Position);
++ utf8::unchecked::prior(this->Position);
+ return *this;
+ }
+
+ vtkUnicodeString::const_iterator vtkUnicodeString::const_iterator::operator--(int)
+ {
+ const_iterator result(this->Position);
+- vtk_utf8::unchecked::prior(this->Position);
++ utf8::unchecked::prior(this->Position);
+ return result;
+ }
+
+@@ -134,7 +134,7 @@ vtkUnicodeString::vtkUnicodeString(const
+ vtkUnicodeString::vtkUnicodeString(size_type count, value_type character)
+ {
+ for(size_type i = 0; i != count; ++i)
+- vtk_utf8::append(character, vtkUnicodeString::back_insert_iterator(this->Storage));
++ utf8::append(character, vtkUnicodeString::back_insert_iterator(this->Storage));
+ }
+
+ vtkUnicodeString::vtkUnicodeString(const_iterator first, const_iterator last) :
+@@ -149,7 +149,7 @@ bool vtkUnicodeString::is_utf8(const cha
+
+ bool vtkUnicodeString::is_utf8(const std::string& value)
+ {
+- return vtk_utf8::is_valid(value.begin(), value.end());
++ return utf8::is_valid(value.begin(), value.end());
+ }
+
+ vtkUnicodeString vtkUnicodeString::from_utf8(const char* value)
+@@ -160,7 +160,7 @@ vtkUnicodeString vtkUnicodeString::from_
+ vtkUnicodeString vtkUnicodeString::from_utf8(const char* begin, const char* end)
+ {
+ vtkUnicodeString result;
+- if(vtk_utf8::is_valid(begin, end))
++ if(utf8::is_valid(begin, end))
+ {
+ result.Storage = std::string(begin, end);
+ }
+@@ -174,7 +174,7 @@ vtkUnicodeString vtkUnicodeString::from_
+ vtkUnicodeString vtkUnicodeString::from_utf8(const std::string& value)
+ {
+ vtkUnicodeString result;
+- if(vtk_utf8::is_valid(value.begin(), value.end()))
++ if(utf8::is_valid(value.begin(), value.end()))
+ {
+ result.Storage = value;
+ }
+@@ -197,9 +197,9 @@ vtkUnicodeString vtkUnicodeString::from_
+
+ try
+ {
+- vtk_utf8::utf16to8(value, value + length, vtkUnicodeString::back_insert_iterator(result.Storage));
++ utf8::utf16to8(value, value + length, vtkUnicodeString::back_insert_iterator(result.Storage));
+ }
+- catch(vtk_utf8::invalid_utf16&)
++ catch(utf8::invalid_utf16&)
+ {
+ vtkGenericWarningMacro(<< "vtkUnicodeString::from_utf16(): not a valid UTF-16 string.");
+ }
+@@ -233,15 +233,15 @@ vtkUnicodeString::value_type vtkUnicodeS
+ throw std::out_of_range("character out-of-range");
+
+ std::string::const_iterator iterator = this->Storage.begin();
+- vtk_utf8::unchecked::advance(iterator, offset);
+- return vtk_utf8::unchecked::peek_next(iterator);
++ utf8::unchecked::advance(iterator, offset);
++ return utf8::unchecked::peek_next(iterator);
+ }
+
+ vtkUnicodeString::value_type vtkUnicodeString::operator[](size_type offset) const
+ {
+ std::string::const_iterator iterator = this->Storage.begin();
+- vtk_utf8::unchecked::advance(iterator, offset);
+- return vtk_utf8::unchecked::peek_next(iterator);
++ utf8::unchecked::advance(iterator, offset);
++ return utf8::unchecked::peek_next(iterator);
+ }
+
+ const char* vtkUnicodeString::utf8_str() const
+@@ -257,14 +257,14 @@ void vtkUnicodeString::utf8_str(std::str
+ std::vector<vtkTypeUInt16> vtkUnicodeString::utf16_str() const
+ {
+ std::vector<vtkTypeUInt16> result;
+- vtk_utf8::unchecked::utf8to16(this->Storage.begin(), this->Storage.end(), std::back_inserter(result));
++ utf8::unchecked::utf8to16(this->Storage.begin(), this->Storage.end(), std::back_inserter(result));
+ return result;
+ }
+
+ void vtkUnicodeString::utf16_str(std::vector<vtkTypeUInt16>& result) const
+ {
+ result.clear();
+- vtk_utf8::unchecked::utf8to16(this->Storage.begin(), this->Storage.end(), std::back_inserter(result));
++ utf8::unchecked::utf8to16(this->Storage.begin(), this->Storage.end(), std::back_inserter(result));
+ }
+
+ vtkUnicodeString::size_type vtkUnicodeString::byte_count() const
+@@ -274,7 +274,7 @@ vtkUnicodeString::size_type vtkUnicodeSt
+
+ vtkUnicodeString::size_type vtkUnicodeString::character_count() const
+ {
+- return vtk_utf8::unchecked::distance(this->Storage.begin(), this->Storage.end());
++ return utf8::unchecked::distance(this->Storage.begin(), this->Storage.end());
+ }
+
+ bool vtkUnicodeString::empty() const
+@@ -300,9 +300,9 @@ void vtkUnicodeString::push_back(value_t
+ {
+ try
+ {
+- vtk_utf8::append(character, vtkUnicodeString::back_insert_iterator(this->Storage));
++ utf8::append(character, vtkUnicodeString::back_insert_iterator(this->Storage));
+ }
+- catch(vtk_utf8::invalid_code_point&)
++ catch(utf8::invalid_code_point&)
+ {
+ vtkGenericWarningMacro("vtkUnicodeString::push_back(): " << character << "is not a valid Unicode code point");
+ }
+@@ -319,7 +319,7 @@ void vtkUnicodeString::append(size_type
+ {
+ this->Storage.append(vtkUnicodeString(count, character).Storage);
+ }
+- catch(vtk_utf8::invalid_code_point&)
++ catch(utf8::invalid_code_point&)
+ {
+ vtkGenericWarningMacro("vtkUnicodeString::append(): " << character << "is not a valid Unicode code point");
+ }
+@@ -345,7 +345,7 @@ void vtkUnicodeString::assign(size_type
+ {
+ this->Storage.assign(vtkUnicodeString(count, character).Storage);
+ }
+- catch(vtk_utf8::invalid_code_point&)
++ catch(utf8::invalid_code_point&)
+ {
+ vtkGenericWarningMacro("vtkUnicodeString::assign(): " << character << "is not a valid Unicode code point");
+ }
+@@ -415,11 +415,11 @@ vtkUnicodeString vtkUnicodeString::subst
+ std::string::const_iterator last = this->Storage.end();
+
+ while(from != last && offset--)
+- vtk_utf8::unchecked::advance(from, 1);
++ utf8::unchecked::advance(from, 1);
+
+ std::string::const_iterator to = from;
+ while(to != last && count--)
+- vtk_utf8::unchecked::advance(to, 1);
++ utf8::unchecked::advance(to, 1);
+
+ return vtkUnicodeString(from, to);
+ }
+Index: ParaView-v5.0.0-source/VTK/IO/Core/vtkUTF8TextCodec.cxx
+===================================================================
+--- ParaView-v5.0.0-source.orig/VTK/IO/Core/vtkUTF8TextCodec.cxx
++++ ParaView-v5.0.0-source/VTK/IO/Core/vtkUTF8TextCodec.cxx
+@@ -124,7 +124,7 @@ vtkUnicodeString::value_type vtkUTF8Text
+ throw(std::string("End of Input"));
+ }
+
+- getSize = vtk_utf8::internal::sequence_length(c);
++ getSize = utf8::internal::sequence_length(c);
+
+ if (0 == getSize)
+ throw(std::string("Not enough space"));
+@@ -138,7 +138,7 @@ vtkUnicodeString::value_type vtkUTF8Text
+
+ istream::char_type* c1 = c;
+
+- const vtkTypeUInt32 code_point = vtk_utf8::next(c1, &c[getSize]);
++ const vtkTypeUInt32 code_point = utf8::next(c1, &c[getSize]);
+
+ return code_point;
+ }
diff --git a/debian/rules b/debian/rules
index dbde855..6c13ffb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,18 +20,26 @@ extra_flags += -Wno-dev \
-DCMAKE_INSTALL_RPATH=/usr/lib/paraview \
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \
-DCMAKE_SKIP_RPATH=OFF \
+ -DPARAVIEW_ENABLE_FFMPEG=ON \
+ -DPARAVIEW_ENABLE_WEB=OFF \
-DBUILD_SHARED_LIBS=ON \
- -DVTK_USE_SYSTEM_FREETYPE=ON \
- -DVTK_USE_SYSTEM_JPEG=ON \
- -DVTK_USE_SYSTEM_JSONCPP=ON \
- -DVTK_USE_SYSTEM_PNG=ON \
-DBUILD_TESTING=OFF \
-DVTK_USE_MPEG2_ENCODER=OFF \
-DVTK_USE_FFMPEG_ENCODER=ON \
- -DPARAVIEW_ENABLE_FFMPEG=ON \
- -DPARAVIEW_ENABLE_WEB=OFF \
-DVTK_USE_OGGTHEORA_ENCODER=ON \
+ -DVTK_USE_SYSTEM_FREETYPE=ON \
+ -DVTK_USE_SYSTEM_GL2PS=ON \
+ -DVTK_USE_SYSTEM_JPEG=ON \
+ -DVTK_USE_SYSTEM_JSONCPP=ON \
+ -DVTK_USE_SYSTEM_NETCDF=ON \
+ -DVTK_USE_SYSTEM_GLEW=ON \
+ -DVTK_USE_SYSTEM_PNG=ON \
-DVTK_USE_SYSTEM_OGGTHEORA=ON \
+ -DVTK_USE_SYSTEM_TIFF=ON \
+ -DVTK_USE_SYSTEM_ZLIB=ON \
+ -DVTK_USE_SYSTEM_LIBXML2=ON \
+ -DVTK_USE_SYSTEM_EXPAT=ON \
+ -DVTK_USE_SYSTEM_HDF5=ON \
-DVTK_INSTALL_LIBRARY_DIR="lib/paraview" \
-DVTK_INSTALL_ARCHIVE_DIR="lib/paraview" \
-DVTK_INSTALL_INCLUDE_DIR="include/paraview" \
@@ -39,17 +47,12 @@ extra_flags += -Wno-dev \
-DVTK_INSTALL_DOC_DIR="share/doc/paraview" \
-DVTK_INSTALL_PACKAGE_DIR="lib/cmake/paraview" \
-DVTK_CUSTOM_LIBRARY_SUFFIX="" \
- -DVTK_USE_SYSTEM_TIFF=ON \
- -DVTK_USE_SYSTEM_ZLIB=ON \
-DBUILD_EXAMPLES=OFF \
- -DVTK_USE_SYSTEM_LIBXML2=ON \
- -DVTK_USE_SYSTEM_EXPAT=ON \
-DDOCUMENTATION_HTML_HELP=ON \
-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON \
-DBUILD_DOCUMENTATION=ON \
-DPARAVIEW_USE_MPI=ON \
-DMPI_INCLUDE_PATH="/usr/include/mpi" \
- -DVTK_USE_SYSTEM_HDF5=ON \
-DPARAVIEW_ENABLE_PYTHON=ON \
-DPARAVIEW_BUILD_PLUGIN_AdiosReader:BOOL=ON \
-DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON \
diff --git a/debian/watch b/debian/watch
index 9b095ca..e92e549 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
+opts=repacksuffix=+dfsg1,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
https://github.com/Kitware/ParaView/tags .*/v?(\d\S*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/paraview.git
More information about the debian-science-commits
mailing list