[SCM] mapnik-viewer branch, master, updated. debian/0.0.svn1697-1-9-g34d4a4a

[David Paleino]

The following commit has been merged in the master branch:
commit 34d4a4a76b7a305279d1f13966ec398fb837ed7e
Author: David Paleino <dapal at debian.org>
Date:   Tue May 3 12:35:28 2011 +0200

    03-fix_boost.patch: fix FTBFS due to newer Boost::Filesystem (Closes: #624992)

diff --git a/debian/changelog b/debian/changelog
index b9853e9..4ad412f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ mapnik-viewer (0.0~svn2521-1) UNRELEASED; urgency=low
   * New SVN snapshot
   * debian/patches/:
     - *.patch refreshed to cleanly apply
+  * 03-fix_boost.patch: fix FTBFS due to newer Boost::Filesystem
+    (Closes: #624992)
 
- -- David Paleino <dapal at debian.org>  Tue, 03 May 2011 12:33:40 +0200
+ -- David Paleino <dapal at debian.org>  Tue, 03 May 2011 12:34:28 +0200
 
 mapnik-viewer (0.0~svn1697-1) unstable; urgency=low
 
diff --git a/debian/patches/03-fix_boost.patch b/debian/patches/03-fix_boost.patch
new file mode 100644
index 0000000..926a18e
--- /dev/null
+++ b/debian/patches/03-fix_boost.patch
@@ -0,0 +1,30 @@
+From: David Paleino <dapal at debian.org>
+Subject: port to newer Boost::Filesystem
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624992
+Forwarded: no
+
+---
+ main.cpp |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+--- mapnik-viewer.orig/main.cpp
++++ mapnik-viewer/main.cpp
+@@ -60,9 +60,15 @@ int main( int argc, char **argv )
+ 
+         if (boost::filesystem::exists(path) && boost::filesystem::is_directory(path)) {
+             for (boost::filesystem::directory_iterator itr(path); itr != end_itr; ++itr ) {
++#if (BOOST_FILESYSTEM_VERSION == 3)
++                if (!boost::filesystem::is_directory(*itr) && is_font_file(itr->path().filename().string())) {
++                    std::cout << "register font " << itr->path().filename().string() << "\n";
++                    freetype_engine::register_font(itr->path().filename().string());
++#else
+                 if (!boost::filesystem::is_directory(*itr) && is_font_file(itr->path().leaf())) {
+-                    std::cout << "register font " << itr->string() << "\n";
+-                    freetype_engine::register_font(itr->string());
++                    std::cout << "register font " << itr->path().leaf() << "\n";
++                    freetype_engine::register_font(itr->path().leaf());
++#endif
+                 }
+             }
+         }
diff --git a/debian/patches/series b/debian/patches/series
index f9b83ec..6d26a37 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 00-fix_build.patch
 01-fix_mapnik_paths.patch
 02-fix_mapnik_API.patch
+03-fix_boost.patch

-- 
mapnik-viewer