From 08b04d54904384a3f5e5dc63f95aab02f3186c5c Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Feb 19 2014 19:27:39 +0000 Subject: Update to 1.3.0 upstream release --- diff --git a/.gitignore b/.gitignore index 0b01202..547b998 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /mapnik-1.2.1.tgz /mapnik-1.2.2.tgz /mapnik-1.2.3.tgz +/mapnik-1.3.0.tgz diff --git a/nodejs-mapnik-build.patch b/nodejs-mapnik-build.patch new file mode 100644 index 0000000..eaabdc6 --- /dev/null +++ b/nodejs-mapnik-build.patch @@ -0,0 +1,46 @@ +commit 9d0729017c5c3e4b497cb3a87d835f6bf93afe25 +Author: Tom Hughes +Date: Wed Feb 19 17:55:41 2014 +0000 + + Don't try and build mapnik-vector-tile + +diff --git a/binding.gyp b/binding.gyp +index 3195426..ae7dad9 100644 +--- a/binding.gyp ++++ b/binding.gyp +@@ -17,28 +17,7 @@ + ], + 'targets': [ + { +- 'target_name': 'action_before_build', +- 'type': 'none', +- 'actions': [ +- { +- 'action_name': 'generate_protoc_files', +- 'inputs': [ +- './node_modules/mapnik-vector-tile/proto/vector_tile.proto' +- ], +- 'outputs': [ +- './node_modules/mapnik-vector-tile/src/vector_tile.pb.cc', +- './node_modules/mapnik-vector-tile/src/vector_tile.pb.h' +- ], +- 'action': [ 'protoc', +- '-I./node_modules/mapnik-vector-tile/proto/', +- '--cpp_out=./node_modules/mapnik-vector-tile/src/', +- './node_modules/mapnik-vector-tile/proto/vector_tile.proto'] +- } +- ] +- }, +- { + 'target_name': '<(module_name)', +- 'dependencies': [ 'action_before_build' ], + 'sources': [ + "src/node_mapnik.cpp", + "src/mapnik_map.cpp", +@@ -168,4 +147,4 @@ + ] + } + ] +-} +\ No newline at end of file ++} diff --git a/nodejs-mapnik-clipped.patch b/nodejs-mapnik-clipped.patch deleted file mode 100644 index 574b02e..0000000 --- a/nodejs-mapnik-clipped.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit 31ef4e8af38ec3830b0106ed555ea8b7c36be046 -Author: Tom Hughes -Date: Fri Jan 10 17:21:38 2014 +0000 - - Disable failing test - -diff --git a/test/vector-tile.test.js b/test/vector-tile.test.js -index a2cd0d3..769dd01 100644 ---- a/test/vector-tile.test.js -+++ b/test/vector-tile.test.js -@@ -363,21 +363,21 @@ describe('mapnik.VectorTile ', function() { - assert.equal(features.length,1); - assert.equal(features[0].id(),89); - // ensure querying clipped polygons works -- var pbf = require('fs').readFileSync('./test/data/vector_tile/6.20.34.pbf'); -- var vt = new mapnik.VectorTile(6, 20, 34); -- vt.setData(pbf,function(err) { -- if (err) throw err; -- var json = vt.toJSON(); -- assert.equal(2, json[0].features.length); -- assert.equal('Brazil', json[0].features[0].properties.name); -- assert.equal('Bolivia', json[0].features[1].properties.name); -- var results = vt.query(-64.27521952641217,-16.28853953000943,{tolerance:10}) -- assert.equal(1, results.length); -- var feat_json = JSON.parse(results[0].toJSON()); -- assert.equal('Bolivia',feat_json.properties.name); -- assert.equal(86,feat_json.id); -+ // var pbf = require('fs').readFileSync('./test/data/vector_tile/6.20.34.pbf'); -+ // var vt = new mapnik.VectorTile(6, 20, 34); -+ // vt.setData(pbf,function(err) { -+ // if (err) throw err; -+ // var json = vt.toJSON(); -+ // assert.equal(2, json[0].features.length); -+ // assert.equal('Brazil', json[0].features[0].properties.name); -+ // assert.equal('Bolivia', json[0].features[1].properties.name); -+ // var results = vt.query(-64.27521952641217,-16.28853953000943,{tolerance:10}) -+ // assert.equal(1, results.length); -+ // var feat_json = JSON.parse(results[0].toJSON()); -+ // assert.equal('Bolivia',feat_json.properties.name); -+ // assert.equal(86,feat_json.id); - done(); -- }); -+ // }); - }); - - it('should read back the vector tile and render an image with markers', function(done) { diff --git a/nodejs-mapnik-color.patch b/nodejs-mapnik-color.patch index 0e215f5..68dab76 100644 --- a/nodejs-mapnik-color.patch +++ b/nodejs-mapnik-color.patch @@ -1,4 +1,4 @@ -commit 5551da57b88610216c9a3990d1f953d800b73d3f +commit d3878c87910e29601c598204028eddef0e59c8ca Author: Tom Hughes Date: Fri Jul 5 19:19:25 2013 +0100 diff --git a/nodejs-mapnik-fonts.patch b/nodejs-mapnik-fonts.patch index afcd65b..04218e7 100644 --- a/nodejs-mapnik-fonts.patch +++ b/nodejs-mapnik-fonts.patch @@ -1,14 +1,14 @@ -commit 791b073589e362572e4938dee6230385262590af +commit 1a49e4872a7b269fdf9d81ef7b48ed0ba72464fd Author: Tom Hughes Date: Tue Jul 16 22:19:00 2013 +0100 Fix system font paths diff --git a/lib/mapnik.js b/lib/mapnik.js -index 5245da9..1e5ddf6 100644 +index 7836231..46ca305 100644 --- a/lib/mapnik.js +++ b/lib/mapnik.js -@@ -41,8 +41,8 @@ exports.register_system_fonts = function() { +@@ -42,8 +42,8 @@ exports.register_system_fonts = function() { if (process.platform == 'linux' || (process.platform.indexOf('bsd') != -1) || process.platform.indexOf('bsd') == 'sunos') { diff --git a/nodejs-mapnik-geojson.patch b/nodejs-mapnik-geojson.patch deleted file mode 100644 index 28fde87..0000000 --- a/nodejs-mapnik-geojson.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 4cf5badf98a28bf51d148e87a2ee68279ebf5199 -Author: Tom Hughes -Date: Fri Jul 5 19:06:05 2013 +0100 - - Remove the GeoJSON test as Fedora's mapnik doesn't have the geojson plugin - -diff --git a/test/unicode-loading.test.js b/test/unicode-loading.test.js -index 6abc42f..7b6f974 100644 ---- a/test/unicode-loading.test.js -+++ b/test/unicode-loading.test.js -@@ -106,13 +106,6 @@ describe('Handling unicode paths, filenames, and data', function(){ - assert.ok(ds); - }); - -- it('open json with unicode name', function(){ -- var filepath = './test/data/你好_points.geojson'; -- assert.ok(existsSync(filepath)); -- var ds = new mapnik.Datasource({type:'geojson',file:filepath}); -- assert.ok(ds); -- }); -- - it('open sqlite with unicode name', function(){ - var filepath = './test/data/你好_points.sqlite'; - assert.ok(existsSync(filepath)); -@@ -120,4 +113,4 @@ describe('Handling unicode paths, filenames, and data', function(){ - assert.ok(ds); - }); - --}); -\ No newline at end of file -+}); diff --git a/nodejs-mapnik-hsv.patch b/nodejs-mapnik-hsv.patch index 93f2e10..c0d6912 100644 --- a/nodejs-mapnik-hsv.patch +++ b/nodejs-mapnik-hsv.patch @@ -1,14 +1,14 @@ -commit 3d98454d741f3789ef47f0173212f8d71eea69ed +commit e9adf2ac293f1336c7a0cf62d97cc27942b26c75 Author: Tom Hughes Date: Fri Sep 27 22:30:01 2013 +0100 Disable HSV support diff --git a/src/node_mapnik.cpp b/src/node_mapnik.cpp -index 2d7eccb..e1ea70f 100644 +index 1beb256..6c7494f 100644 --- a/src/node_mapnik.cpp +++ b/src/node_mapnik.cpp -@@ -256,10 +256,10 @@ extern "C" { +@@ -266,10 +266,10 @@ extern "C" { NODE_MAPNIK_DEFINE_CONSTANT(composite_ops, "invert", mapnik::invert) NODE_MAPNIK_DEFINE_CONSTANT(composite_ops, "grain_merge", mapnik::grain_merge) NODE_MAPNIK_DEFINE_CONSTANT(composite_ops, "grain_extract", mapnik::grain_extract) diff --git a/nodejs-mapnik-precision.patch b/nodejs-mapnik-precision.patch index 2a7d5d9..24820f3 100644 --- a/nodejs-mapnik-precision.patch +++ b/nodejs-mapnik-precision.patch @@ -1,14 +1,14 @@ -commit b64c51bd71ac7d576272aa4b88505a2445a33e74 +commit 8b279c1d8ff74df7b6ab39f8bf520223fa73507d Author: Tom Hughes Date: Tue Jul 30 18:39:30 2013 +0100 Work around precision issues in test/vector-tile.test.js diff --git a/test/vector-tile.test.js b/test/vector-tile.test.js -index bc75bbf..a2cd0d3 100644 +index 401e1dd..5522528 100644 --- a/test/vector-tile.test.js +++ b/test/vector-tile.test.js -@@ -295,7 +295,7 @@ describe('mapnik.VectorTile ', function() { +@@ -346,7 +346,7 @@ describe('mapnik.VectorTile ', function() { var actual = './test/data/vector_tile/tile0.actual.png'; var expected = './test/data/vector_tile/tile0.expected.png'; vtile_image.save(actual, 'png32'); @@ -17,7 +17,7 @@ index bc75bbf..a2cd0d3 100644 done(); }); }); -@@ -314,7 +314,7 @@ describe('mapnik.VectorTile ', function() { +@@ -366,7 +366,7 @@ describe('mapnik.VectorTile ', function() { var actual = './test/data/vector_tile/tile0-b.actual.png'; var expected = './test/data/vector_tile/tile0-b.expected.png'; vtile_image.save(actual, 'png32'); @@ -26,7 +26,7 @@ index bc75bbf..a2cd0d3 100644 done(); }); }); -@@ -338,7 +338,7 @@ describe('mapnik.VectorTile ', function() { +@@ -391,7 +391,7 @@ describe('mapnik.VectorTile ', function() { } fs.writeFileSync(actual_file,JSON.stringify(utf,null,1)); var expected = JSON.parse(fs.readFileSync(expected_file)); @@ -35,7 +35,7 @@ index bc75bbf..a2cd0d3 100644 done(); }); }); -@@ -397,7 +397,7 @@ describe('mapnik.VectorTile ', function() { +@@ -453,7 +453,7 @@ describe('mapnik.VectorTile ', function() { vtile_image.save(expected, 'png32'); } vtile_image.save(actual, 'png32'); diff --git a/nodejs-mapnik.spec b/nodejs-mapnik.spec index 1a624ea..db320c7 100644 --- a/nodejs-mapnik.spec +++ b/nodejs-mapnik.spec @@ -1,13 +1,13 @@ Name: nodejs-mapnik -Version: 1.2.3 -Release: 2%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Summary: Bindings to Mapnik tile rendering library for Node.js License: BSD URL: https://github.com/mapnik/node-mapnik Source0: http://registry.npmjs.org/mapnik/-/mapnik-%{version}.tgz -# Drop tests which need the (not present in Fedora) geojson plugin to mapnik -Patch0: nodejs-mapnik-geojson.patch +# Don't try and build mapnik-vector-tile +Patch0: nodejs-mapnik-build.patch # Reported upstream - https://github.com/mapnik/node-mapnik/issues/163 Patch1: nodejs-mapnik-color.patch # Correct system font paths @@ -16,8 +16,6 @@ Patch2: nodejs-mapnik-fonts.patch Patch3: nodejs-mapnik-precision.patch # Disable HSV support - not supported in Fedora mapnik build Patch4: nodejs-mapnik-hsv.patch -# Disable failing test -Patch5: nodejs-mapnik-clipped.patch ExclusiveArch: %{nodejs_arches} BuildRequires: nodejs-devel @@ -31,7 +29,7 @@ BuildRequires: cairo-devel BuildRequires: polyclipping-devel BuildRequires: protobuf-lite-devel BuildRequires: libtool-ltdl-devel -BuildRequires: npm(mapnik-vector-tile) >= 0.1.0 +BuildRequires: npm(mapnik-vector-tile) >= 0.4.0 BuildRequires: npm(npm) BuildRequires: npm(mocha) @@ -50,7 +48,6 @@ BuildRequires: npm(sphericalmercator) %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 rm -rf node_modules echo '{}' > common.gypi %nodejs_symlink_deps --check @@ -59,9 +56,6 @@ echo '{}' > common.gypi %build export CXXFLAGS="%{optflags}" node-gyp rebuild -install -p -D -m0755 build/Release/_mapnik.node lib -python gen_settings.py -%nodejs_fixdep -r mapnik-vector-tile %install @@ -85,6 +79,9 @@ ln -s %{nodejs_sitelib}/mapnik/bin/mapnik-render.js %{buildroot}/%{_bindir}/map %changelog +* Wed Feb 19 2014 Tom Hughes - 1.3.0-1 +- Update to 1.3.0 upstream release + * Fri Feb 14 2014 T.C. Hollingsworth - 1.2.3-2 - rebuild for icu-53 (via v8) diff --git a/sources b/sources index 09653db..e08059c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0e19eb7bdf9bc0796ecbc1214766c87f mapnik-1.2.3.tgz +00bd55f52a9d283b5ee4ea6d5861738a mapnik-1.3.0.tgz