[SCM] mapnik-vector-tile branch, master, updated. debian/0.3.2-3-11-g07e4c55

Jérémy Lal kapouer at melix.org
Mon Sep 16 00:10:55 UTC 2013


The following commit has been merged in the master branch:
commit 0362e06aa41bde902da71a4f3419f79f04dcd40c
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sun Sep 15 19:04:34 2013 +0200

    Add patch 1001 for catch compatibility

diff --git a/debian/patches/1001_catch_compat.patch b/debian/patches/1001_catch_compat.patch
new file mode 100644
index 0000000..8aca1f8
--- /dev/null
+++ b/debian/patches/1001_catch_compat.patch
@@ -0,0 +1,15 @@
+Description: Catch 1.0 build 8 compatibility fixes
+Forwarded: https://github.com/mapbox/mapnik-vector-tile/pull/24
+Author: Jérémy Lal <kapouer at melix.org>
+Last-Update: 2013-09-15
+--- a/test/vector_tile.cpp
++++ b/test/vector_tile.cpp
+@@ -219,7 +219,7 @@
+     mapnik::vector::spherical_mercator merc(256);
+     merc.xyz(x,y,z,minx,miny,maxx,maxy);
+     bbox.init(minx,miny,maxx,maxy);
+-    int result = Catch::Main( argc, argv );
++    int result = Catch::Session().run( argc, argv );
+     if (!result) printf("\x1b[1;32m ✓ \x1b[0m\n");
+     google::protobuf::ShutdownProtobufLibrary();
+     return result;

-- 
Vector tiles integration with mapnik - development files



More information about the Pkg-grass-devel mailing list