From 2168be5d85eb72e25472cb4c752fa8f962db3818 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Aug 19 2014 18:31:43 +0000 Subject: Update to 1.4.12 upstream release --- diff --git a/.gitignore b/.gitignore index ba3a83d..cb33a09 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /node-mapnik-0c39be780741d47b60e35523c6cde7e3dae5b20a.tar.gz /node-mapnik-9711f6561d1bb3965a98d6ac638c0e44f9915d5a.tar.gz /node-mapnik-ae61e6df4a6150089935ff8a3ae098eef3d0c839.tar.gz +/node-mapnik-640482f40ccb8883fbfaebe2377a52a62507ef2c.tar.gz diff --git a/nodejs-mapnik-hsv.patch b/nodejs-mapnik-hsv.patch index 22c6835..027d2b5 100644 --- a/nodejs-mapnik-hsv.patch +++ b/nodejs-mapnik-hsv.patch @@ -1,25 +1,23 @@ -commit 6977fcaeb66519fc4847360721fa384cc0a80b0c +commit 018d029fbdf308938ea540518973d0790507fa9a 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 6d9a118..bef29b6 100644 +index 6464630..9753e8e 100644 --- a/src/node_mapnik.cpp +++ b/src/node_mapnik.cpp -@@ -257,10 +257,10 @@ extern "C" { - NODE_MAPNIK_DEFINE_CONSTANT(composite_ops, "invert", mapnik::invert) +@@ -248,9 +248,9 @@ extern "C" { + NODE_MAPNIK_DEFINE_CONSTANT(composite_ops, "invert-rgb", mapnik::invert_rgb) NODE_MAPNIK_DEFINE_CONSTANT(composite_ops, "grain_merge", mapnik::grain_merge) NODE_MAPNIK_DEFINE_CONSTANT(composite_ops, "grain_extract", mapnik::grain_extract) - NODE_MAPNIK_DEFINE_CONSTANT(composite_ops, "hue", mapnik::hue) - NODE_MAPNIK_DEFINE_CONSTANT(composite_ops, "saturation", mapnik::saturation) - NODE_MAPNIK_DEFINE_CONSTANT(composite_ops, "color", mapnik::_color) -- NODE_MAPNIK_DEFINE_CONSTANT(composite_ops, "value", mapnik::_value) +// NODE_MAPNIK_DEFINE_CONSTANT(composite_ops, "hue", mapnik::hue) +// NODE_MAPNIK_DEFINE_CONSTANT(composite_ops, "saturation", mapnik::saturation) +// NODE_MAPNIK_DEFINE_CONSTANT(composite_ops, "color", mapnik::_color) -+// NODE_MAPNIK_DEFINE_CONSTANT(composite_ops, "value", mapnik::_value) - - target->Set(NanNew("compositeOp"), composite_ops); - #endif + #if MAPNIK_VERSION >= 300000 + NODE_MAPNIK_DEFINE_CONSTANT(composite_ops, "linear_dodge", mapnik::linear_dodge) + NODE_MAPNIK_DEFINE_CONSTANT(composite_ops, "linear_burn", mapnik::linear_burn) diff --git a/nodejs-mapnik-precision.patch b/nodejs-mapnik-precision.patch index f3bcbf2..d1dc8b8 100644 --- a/nodejs-mapnik-precision.patch +++ b/nodejs-mapnik-precision.patch @@ -1,4 +1,4 @@ -commit 7bc6a90feb5cfef5a5909006a3361dd2be5c341f +commit 758bb67a9390e431890a504c944cf23e984ad8f9 Author: Tom Hughes Date: Tue Jul 30 18:39:30 2013 +0100 @@ -18,10 +18,37 @@ index 2f1639f..b4318ee 100644 }) }) diff --git a/test/vector-tile.test.js b/test/vector-tile.test.js -index c10c90f..ec47bee 100644 +index ca29973..8f3a384 100644 --- a/test/vector-tile.test.js +++ b/test/vector-tile.test.js -@@ -454,7 +454,7 @@ describe('mapnik.VectorTile ', function() { +@@ -401,7 +401,7 @@ describe('mapnik.VectorTile ', function() { + if (!existsSync(expected)) { + vtile_image.save(expected, 'png32'); + } +- assert.equal(0,vtile_image.compare(new mapnik.Image.open(expected))); ++ assert.ok(vtile_image.compare(new mapnik.Image.open(expected)) < 50); + // render with cairo + var surface = new mapnik.CairoSurface('svg',vtile.width(),vtile.height()); + vtile.render(map, surface, {renderer:'cairo'}, function(err,surface) { +@@ -412,7 +412,7 @@ describe('mapnik.VectorTile ', function() { + fs.writeFileSync(expected_svg,surface.getData()); + } + fs.writeFileSync(actual_svg,surface.getData()); +- assert.ok(Math.abs(fs.readFileSync(actual_svg).length - fs.readFileSync(expected_svg).length) < 10); ++ assert.ok(Math.abs(fs.readFileSync(actual_svg).length - fs.readFileSync(expected_svg).length) < 20); + var surface2 = new mapnik.CairoSurface('svg',vtile.width(),vtile.height()); + vtile.render(map, surface2, {renderer:'svg'}, function(err,surface2) { + if (err) throw err; +@@ -447,7 +447,7 @@ describe('mapnik.VectorTile ', function() { + if (!existsSync(expected)) { + vtile_image.save(expected, 'png32'); + } +- assert.equal(0,vtile_image.compare(new mapnik.Image.open(expected))); ++ assert.ok(vtile_image.compare(new mapnik.Image.open(expected))) < 2; + done(); + }); + }); +@@ -472,7 +472,7 @@ describe('mapnik.VectorTile ', function() { } fs.writeFileSync(actual_file,JSON.stringify(utf,null,1)); var expected = JSON.parse(fs.readFileSync(expected_file)); @@ -30,3 +57,12 @@ index c10c90f..ec47bee 100644 done(); }); }); +@@ -573,7 +573,7 @@ describe('mapnik.VectorTile ', function() { + vtile_image.save(expected, 'png32'); + } + // TODO - visual difference in master vs 2.3.x due to https://github.com/mapnik/mapnik/commit/ecc5acbdb953e172fcc652b55ed19b8b581e2146 +- assert.equal(0,vtile_image.compare(new mapnik.Image.open(expected))); ++ assert.ok(vtile_image.compare(new mapnik.Image.open(expected)) < 50); + done(); + }); + }); diff --git a/nodejs-mapnik-pregyp.patch b/nodejs-mapnik-pregyp.patch new file mode 100644 index 0000000..48a73f9 --- /dev/null +++ b/nodejs-mapnik-pregyp.patch @@ -0,0 +1,32 @@ +commit 437deb5fe3dfc59f9c653b1c85d8d07ab6f7d8e5 +Author: Tom Hughes +Date: Mon Aug 18 14:30:51 2014 +0100 + + Patch out use of node-pre-gyp + +diff --git a/lib/mapnik.js b/lib/mapnik.js +index ed4fabd..9e8e74e 100644 +--- a/lib/mapnik.js ++++ b/lib/mapnik.js +@@ -1,6 +1,5 @@ +-var binary = require('node-pre-gyp'); + var path = require('path'); +-var binding_path = binary.find(path.resolve(path.join(__dirname,'../package.json'))); ++var binding_path = path.resolve(path.join(__dirname,'binding/mapnik.node')); + var settings_path = path.join(path.dirname(binding_path),'mapnik_settings.js'); + var settings = require(settings_path); + +diff --git a/package.json b/package.json +index a044293..5dee39b 100644 +--- a/package.json ++++ b/package.json +@@ -38,8 +38,7 @@ + ], + "dependencies" : { + "nan": "~1.2.0", +- "mapnik-vector-tile": "~0.5.2", +- "node-pre-gyp": "0.5.23" ++ "mapnik-vector-tile": "~0.5.2" + }, + "bundledDependencies": [ + "mapnik-vector-tile", diff --git a/nodejs-mapnik-svg.patch b/nodejs-mapnik-svg.patch new file mode 100644 index 0000000..6dfffd7 --- /dev/null +++ b/nodejs-mapnik-svg.patch @@ -0,0 +1,31 @@ +commit 83aa22bedf46281f4f4f9009be00ea3b02780cae +Author: Tom Hughes +Date: Tue Aug 19 18:43:25 2014 +0100 + + Remove native SVG tests + +diff --git a/test/vector-tile.test.js b/test/vector-tile.test.js +index 8f3a384..410cbf8 100644 +--- a/test/vector-tile.test.js ++++ b/test/vector-tile.test.js +@@ -413,19 +413,7 @@ describe('mapnik.VectorTile ', function() { + } + fs.writeFileSync(actual_svg,surface.getData()); + assert.ok(Math.abs(fs.readFileSync(actual_svg).length - fs.readFileSync(expected_svg).length) < 20); +- var surface2 = new mapnik.CairoSurface('svg',vtile.width(),vtile.height()); +- vtile.render(map, surface2, {renderer:'svg'}, function(err,surface2) { +- if (err) throw err; +- var actual_svg2 = './test/data/vector_tile/tile0.actual-svg.svg'; +- var expected_svg2 = './test/data/vector_tile/tile0.expected-svg.svg'; +- if (!existsSync(expected_svg2)) { +- fs.writeFileSync(expected_svg2,surface2.getData()); +- } +- fs.writeFileSync(actual_svg2,surface2.getData()); +- assert.ok(Math.abs(fs.readFileSync(actual_svg2).length - fs.readFileSync(expected_svg2).length) < 10); +- done(); +- }); +- ++ done(); + }); + }); + }); diff --git a/nodejs-mapnik-webp.patch b/nodejs-mapnik-webp.patch new file mode 100644 index 0000000..2792810 --- /dev/null +++ b/nodejs-mapnik-webp.patch @@ -0,0 +1,36 @@ +commit 337c2f664ac87cd926bb89185fe0b3c48c6ab0ab +Author: Tom Hughes +Date: Mon Aug 18 17:14:34 2014 +0100 + + Remove webp tests + +diff --git a/test/image.test.js b/test/image.test.js +index ebd16f1..0e31bc7 100644 +--- a/test/image.test.js ++++ b/test/image.test.js +@@ -289,25 +289,4 @@ describe('mapnik.Image ', function() { + }); + }); + +- it('should be able to open and save webp', function(done) { +- var im = new mapnik.Image(10,10); +- im.background = new mapnik.Color('green'); +- var filename = './test/data/images/10x10.webp'; +- // sync open +- assert.equal(0,im.compare(new mapnik.Image.open(filename))); +- // sync fromBytes +- assert.equal(0,im.compare(new mapnik.Image.fromBytesSync(im.encodeSync("webp")))); +- // async open +- mapnik.Image.open(filename,function(err,im2) { +- if (err) throw err; +- assert.equal(0,im.compare(im2)); +- // async fromBytes +- mapnik.Image.fromBytes(im.encodeSync(),function(err,im3) { +- if (err) throw err; +- assert.equal(0,im.compare(im3)); +- done(); +- }); +- }); +- }); +- + }); diff --git a/nodejs-mapnik.spec b/nodejs-mapnik.spec index 455a9f7..b8c35ee 100644 --- a/nodejs-mapnik.spec +++ b/nodejs-mapnik.spec @@ -1,8 +1,8 @@ -%global commit ae61e6df4a6150089935ff8a3ae098eef3d0c839 +%global commit 640482f40ccb8883fbfaebe2377a52a62507ef2c Name: nodejs-mapnik -Version: 1.4.10 -Release: 2%{?dist} +Version: 1.4.12 +Release: 1%{?dist} Summary: Bindings to Mapnik tile rendering library for Node.js License: BSD @@ -14,6 +14,12 @@ Patch0: nodejs-mapnik-color.patch Patch1: nodejs-mapnik-precision.patch # Disable HSV support - not supported in Fedora mapnik build Patch2: nodejs-mapnik-hsv.patch +# Disable use of binary builds via pre-gyp +Patch3: nodejs-mapnik-pregyp.patch +# Remove webp tests as our mapnik doesn't support webp +Patch4: nodejs-mapnik-webp.patch +# Remove native SVG renderer tests as our mapnik doesn't support it +Patch5: nodejs-mapnik-svg.patch ExclusiveArch: %{nodejs_arches} BuildRequires: nodejs-devel @@ -46,7 +52,9 @@ BuildRequires: npm(nan) >= 1.2.0 %patch0 -p1 %patch1 -p1 %patch2 -p1 -%nodejs_fixdep -r node-pre-gyp +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 rm -rf node_modules echo '{}' > common.gypi %nodejs_symlink_deps --check @@ -80,6 +88,9 @@ ln -s %{nodejs_sitelib}/mapnik/bin/mapnik-render.js %{buildroot}/%{_bindir}/map %changelog +* Mon Aug 18 2014 Tom Hughes - 1.4.12-1 +- Update to 1.4.12 upstream release + * Sun Aug 17 2014 Fedora Release Engineering - 1.4.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index a32c199..baeaf0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9df0652427688becc028ab999dee7283 node-mapnik-ae61e6df4a6150089935ff8a3ae098eef3d0c839.tar.gz +8199d16fd6aa160a6c50b7d7f720eb54 node-mapnik-640482f40ccb8883fbfaebe2377a52a62507ef2c.tar.gz