From 2d2e64c7c198ff82ea6e306f7673168dcf5ddca7 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sat, 24 Dec 2011 23:14:50 +0000
Subject: Sat Dec 24 23:14:50 UTC 2011

---
 community/vtk/PKGBUILD                         | 15 ++++++---
 community/vtk/fix-boost-graph-api-changes.diff | 42 ++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 community/vtk/fix-boost-graph-api-changes.diff

(limited to 'community/vtk')

diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD
index 4dadb8d58..78af11f86 100644
--- a/community/vtk/PKGBUILD
+++ b/community/vtk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58425 2011-11-12 17:19:02Z ibiru $
+# $Id: PKGBUILD 61185 2011-12-23 22:04:01Z tdziedzic $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
 # Contributor: leepesjee <lpeschier at xs4all dot nl>
@@ -9,7 +9,7 @@
 
 pkgname=vtk
 pkgver=5.8.0
-pkgrel=6
+pkgrel=7
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.'
 arch=('i686' 'x86_64')
 url='http://www.vtk.org'
@@ -24,11 +24,13 @@ optdepends=('python2: python bindings'
 source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz"
         "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz"
         'fixkernelversioncheck.diff'
-        'ffmpeg-0.8.diff')
+        'ffmpeg-0.8.diff'
+        'fix-boost-graph-api-changes.diff')
 md5sums=('37b7297d02d647cc6ca95b38174cb41f'
          'a05295b81930e894fc0e31866f399151'
          '9e137af23701f76fc727222ebac23389'
-         'e992321c9d1def6034d0fa6607b40c5a')
+         'e992321c9d1def6034d0fa6607b40c5a'
+         'e715aef2aea26fc05f904efb5d0d5627')
 
 build() {
   cd VTK
@@ -41,6 +43,10 @@ build() {
   # remove next pkgver bump
   patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff
 
+  # fix compilation error: http://vtk.org/Bug/view.php?id=12772
+  # remove next pkgver bump
+  patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff
+
   cd ${srcdir}
 
   rm -rf build
@@ -82,6 +88,7 @@ build() {
     -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
     -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
     -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
     ${srcdir}/VTK
 
   make
diff --git a/community/vtk/fix-boost-graph-api-changes.diff b/community/vtk/fix-boost-graph-api-changes.diff
new file mode 100644
index 000000000..2162e7a28
--- /dev/null
+++ b/community/vtk/fix-boost-graph-api-changes.diff
@@ -0,0 +1,42 @@
+commit d3ecc2c459dd1df937fc97887581ace1036da533
+Author: Marcus D. Hanwell <marcus.hanwell@kitware.com>
+Date:   Tue Dec 13 15:36:06 2011 -0500
+
+    BUG: 12772 fixes for change in Boost graph API
+    
+    This fixes bug 12772, where an API change in Boost was causing
+    compilation failures using Boost 1.38. Thanks to Orion Poplawski for
+    reporting the issue and posting the patch.
+    
+    Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06
+
+diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
+index c789f6b..cf7cd47 100644
+--- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx
++++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
+@@ -47,6 +47,15 @@ using namespace boost;
+ vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree);
+ 
+ 
++namespace {
++  vtkIdType unwrap_edge_id(vtkEdgeType const &e) {
++    return e.Id;
++  }
++  vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) {
++    return e.underlying_desc.Id;
++  }
++}
++
+ // Redefine the bfs visitor, the only visitor we
+ // are using is the tree_edge visitor.
+ template <typename IdMap>
+@@ -95,7 +104,8 @@ public:
+ 
+     // Copy the vertex and edge data from the graph to the tree.
+     tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v);
+-    tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id);
++    tree->GetEdgeData()->CopyData(graph->GetEdgeData(),
++                                  unwrap_edge_id(e), tree_e.Id);
+   }
+ 
+ private:
-- 
cgit v1.2.3-54-g00ecf