[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#785541: marked as done (jessie-pu: package paraview/4.1.0+dfsg+1-1)

Your message dated Sat, 2 Jan 2016 19:38:54 +0100
with message-id <[🔎] CALF6qJny3Z+V8ni4bKEuyDRF2rQzYuagYPPXrJRSDWLB63ckeg@mail.gmail.com>
and subject line Re: Bug#785541: jessie-pu: package paraview/4.1.0+dfsg+1-1
has caused the Debian Bug report #785541,
regarding jessie-pu: package paraview/4.1.0+dfsg+1-1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
785541: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=785541
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu

This upload will fix 2 RC-bugs:
#783842 (FTBFS) and #783797 (grave severity bug,
which makes paraview-dev unusable).

The diff is attached.

Thanks

diff --git a/debian/changelog b/debian/changelog
index 3df3454..8487f20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+paraview (4.1.0+dfsg+1-2) unstable; urgency=medium
+
+  * [151d46f] Fix FTBFS against new freetype. (Closes: #783842)
+  * [0065768] Install missing files in paraview-dev. (Closes: #783797)
+
+ -- Anton Gladky <gladk@debian.org>  Tue, 05 May 2015 19:17:31 +0200
+
 paraview (4.1.0+dfsg+1-1) unstable; urgency=medium
 
   * [130e468] Add python-matplotlib into Depends. (Closes: #761297)
diff --git a/debian/paraview-dev.install b/debian/paraview-dev.install
index e2b1f91..27ed25d 100644
--- a/debian/paraview-dev.install
+++ b/debian/paraview-dev.install
@@ -3,4 +3,6 @@ usr/lib/cmake/paraview/*.cmake
 usr/lib/cmake/paraview/*.in
 usr/lib/cmake/paraview/*.xsl
 usr/lib/cmake/paraview/*.cmake
-usr/bin/vtkWrapClientServer
+usr/bin/vtk*
+usr/lib/paraview/site-packages/vtk/*.so
+usr/lib/paraview/*.a
diff --git a/debian/patches/fix_ftbfs_freetype.patch b/debian/patches/fix_ftbfs_freetype.patch
new file mode 100644
index 0000000..e21e807
--- /dev/null
+++ b/debian/patches/fix_ftbfs_freetype.patch
@@ -0,0 +1,27 @@
+Description: Fix FTBFS against new freetype
+Author: Anton Gladky <gladk@debian.org>
+Bug-Debian: https://bugs.debian.org/783842
+Last-Update: 2015-05-05
+
+--- paraview-4.1.0+dfsg+1.orig/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
++++ paraview-4.1.0+dfsg+1/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
+@@ -1186,7 +1186,7 @@ bool vtkFreeTypeTools::CalculateBounding
+     if (bitmap)
+       {
+       metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent);
+-      metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)),
++      metaData.descent = std::min(-static_cast<int>(bitmap->rows - (bitmapGlyph->top - 1)),
+                                   metaData.descent);
+       }
+     ++heightString;
+@@ -1951,8 +1951,8 @@ void vtkFreeTypeTools::GetLineMetrics(T
+     if (bitmap)
+       {
+       bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left);
+-      bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width);
+-      bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows);
++      bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast<int>(bitmap->width));
++      bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows));
+       bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1);
+       }
+     else
diff --git a/debian/patches/reduce_cmake_error.cmake b/debian/patches/reduce_cmake_error.cmake
new file mode 100644
index 0000000..b99ee3d
--- /dev/null
+++ b/debian/patches/reduce_cmake_error.cmake
@@ -0,0 +1,34 @@
+Description: Reduce the error message in cmake if module is missing
+Author: Anton Gladky <gladk@debian.org>
+Bug-Debian: https://bugs.debian.org/783797
+Last-Update: 2015-05-05
+
+Index: paraview-4.1.0+dfsg+1/VTK/CMake/vtkModuleAPI.cmake
+===================================================================
+--- paraview-4.1.0+dfsg+1.orig/VTK/CMake/vtkModuleAPI.cmake
++++ paraview-4.1.0+dfsg+1/VTK/CMake/vtkModuleAPI.cmake
+@@ -50,7 +50,7 @@ macro(vtk_module_load mod)
+       include(${mod} OPTIONAL)
+     endif()
+     if(NOT ${mod}_LOADED)
+-      message(FATAL_ERROR "No such module: \"${mod}\"")
++      message(STATUS "No such module: \"${mod}\"")
+     endif()
+   endif()
+ endmacro()
+@@ -110,14 +110,11 @@ endmacro()
+ macro(vtk_module_config ns)
+   set(_${ns}_MISSING ${ARGN})
+   if(_${ns}_MISSING)
+-    list(REMOVE_ITEM _${ns}_MISSING ${VTK_MODULES_ENABLED})
+-  endif()
+-  if(_${ns}_MISSING)
+     set(msg "")
+     foreach(mod ${_${ns}_MISSING})
+       set(msg "${msg}\n  ${mod}")
+     endforeach()
+-    message(FATAL_ERROR "Requested modules not available:${msg}")
++    message(STATUS "Requested modules not available:${msg}")
+   endif()
+ 
+   set(${ns}_DEFINITIONS "")
diff --git a/debian/patches/series b/debian/patches/series
index 16cdaa6..7eea230 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@ fix_path_paraview.patch
 fix_FTBFS_KWSys.patch
 fix_ftbfs_gcc49.patch
 fix_GLintptr_FTBFS.patch
+fix_ftbfs_freetype.patch
+reduce_cmake_error.cmake
diff --git a/debian/rules b/debian/rules
index 76d39e7..6f9c6e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ extra_flags += -Wno-dev \
 	-DVTK_INSTALL_DATA_DIR="share/paraview" \
 	-DVTK_INSTALL_DOC_DIR="share/doc/paraview" \
 	-DVTK_INSTALL_PACKAGE_DIR="lib/cmake/paraview" \
-	-DVTK_CUSTOM_LIBRARY_SUFFIX="" \
+	-DVTK_CUSTOM_LIBRARY_SUFFIX="-pv" \
 	-DVTK_USE_SYSTEM_TIFF=ON \
 	-DVTK_USE_SYSTEM_ZLIB=ON \
 	-DBUILD_EXAMPLES=OFF \

--- End Message ---
--- Begin Message --- 
tags 785541 +wontfix
thanks

--- End Message ---
Reply to: