Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package vtk6
this upload fixes RC-bug #779802: FTBFS due to a new
freetype version, which migrated to testing.
Debdiff is attached.
unblock vtk6/6.1.0+dfsg2-6
-- System Information:
Debian Release: 8.0
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru vtk6-6.1.0+dfsg2/debian/changelog vtk6-6.1.0+dfsg2/debian/changelog
--- vtk6-6.1.0+dfsg2/debian/changelog 2015-01-03 21:07:16.000000000 +0100
+++ vtk6-6.1.0+dfsg2/debian/changelog 2015-03-12 18:45:00.000000000 +0100
@@ -1,3 +1,10 @@
+vtk6 (6.1.0+dfsg2-6) unstable; urgency=medium
+
+ [ James Cowgill ]
+ * [0b9b309] Fix FTBFS due to new freetype. (Closes: #779802)
+
+ -- Anton Gladky <gl...@debian.org> Thu, 12 Mar 2015 18:44:44 +0100
+
vtk6 (6.1.0+dfsg2-5) unstable; urgency=medium
* [8a28236] Remove libvtk6-java. (Closes: #773422)
diff -Nru vtk6-6.1.0+dfsg2/debian/patches/freetype-update.patch vtk6-6.1.0+dfsg2/debian/patches/freetype-update.patch
--- vtk6-6.1.0+dfsg2/debian/patches/freetype-update.patch 1970-01-01 01:00:00.000000000 +0100
+++ vtk6-6.1.0+dfsg2/debian/patches/freetype-update.patch 2015-03-12 18:41:43.000000000 +0100
@@ -0,0 +1,52 @@
+From 88f5a5bf546f7962089e107f7f1ae444c6d2797c Mon Sep 17 00:00:00 2001
+From: "Marcus D. Hanwell" <marcus.hanw...@kitware.com>
+Date: Thu, 8 Jan 2015 16:49:54 -0500
+Subject: [PATCH] Fix compile failures seen with latest FreeType
+
+Thanks to Oon-Ee Ng for reporting the issue on the VTK users list.
+This makes some minor changes to account for changes in return type
+in the FreeType API. VTK should now compile against the latest release.
+
+Change-Id: I5dcb608573f387a37ebbc2f9621e89c4551d98f2
+---
+ Rendering/FreeType/vtkFreeTypeTools.cxx | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Rendering/FreeType/vtkFreeTypeTools.cxx b/Rendering/FreeType/vtkFreeTypeTools.cxx
+index fe0a1c2..84ff0f8 100644
+--- a/Rendering/FreeType/vtkFreeTypeTools.cxx
++++ b/Rendering/FreeType/vtkFreeTypeTools.cxx
+@@ -1198,7 +1198,7 @@ bool vtkFreeTypeTools::CalculateBoundingBox(const T& str,
+ 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;
+@@ -1534,11 +1534,11 @@ bool vtkFreeTypeTools::RenderCharacter(CharType character, int &x, int &y,
+ unsigned char *glyphPtr;
+ float tpropAlpha = iMetaData->rgba[3] / 255.0;
+
+- for (int j = 0; j < bitmap->rows; ++j)
++ for (int j = 0; j < static_cast<int>(bitmap->rows); ++j)
+ {
+ glyphPtr = glyphPtrRow;
+
+- for (int i = 0; i < bitmap->width; ++i)
++ for (int i = 0; i < static_cast<int>(bitmap->width); ++i)
+ {
+ if (*glyphPtr == 0)
+ {
+@@ -2001,8 +2001,8 @@ void vtkFreeTypeTools::GetLineMetrics(T begin, T end, MetaData &metaData,
+ 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 -Nru vtk6-6.1.0+dfsg2/debian/patches/series vtk6-6.1.0+dfsg2/debian/patches/series
--- vtk6-6.1.0+dfsg2/debian/patches/series 2014-10-22 10:53:00.000000000 +0200
+++ vtk6-6.1.0+dfsg2/debian/patches/series 2015-03-12 18:43:34.000000000 +0100
@@ -16,3 +16,4 @@
wxpython3.0.patch
fix_GLintptr_FTBFS.patch
+freetype-update.patch
