summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schauer Marin Rodrigues <josch@debian.org>2021-12-11 00:06:11 +0100
committerJohannes Schauer Marin Rodrigues <josch@debian.org>2021-12-11 00:06:11 +0100
commitb81dd8c2fdf6d06538c2d1215758a6dd55d938bf (patch)
tree94350e2dd1a68351e029a288b4def747c6305354
parent80cd6cadb21c0d221e7a1b2d974c1fd8c4182837 (diff)
debian/patches/yaml.patch: update with commit from https://github.com/mapbox/carto/pull/514
-rw-r--r--debian/patches/yaml.patch17
1 files changed, 16 insertions, 1 deletions
diff --git a/debian/patches/yaml.patch b/debian/patches/yaml.patch
index 6eacc88..e85822b 100644
--- a/debian/patches/yaml.patch
+++ b/debian/patches/yaml.patch
@@ -1,6 +1,18 @@
+From 3951644f3f54a08d1eda6c328fe10710aaa49b05 Mon Sep 17 00:00:00 2001
+From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
+Date: Sat, 11 Dec 2021 00:02:21 +0100
+Subject: [PATCH] lib/carto/mml.js: FIX: Error: Function yaml.safeLoad is
+ removed in js-yaml 4. Use yaml.load instead, which is now safe by default.
+
+---
+ lib/carto/mml.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/carto/mml.js b/lib/carto/mml.js
+index aab6bc9..afacf62 100644
--- a/lib/carto/mml.js
+++ b/lib/carto/mml.js
-@@ -22,7 +22,7 @@ carto.MML.prototype.load = function load
+@@ -22,7 +22,7 @@ carto.MML.prototype.load = function load(basedir, data, callback) {
env = {};
try {
@@ -9,3 +21,6 @@
} catch (err) {
env = {};
util.error(env, {
+--
+2.33.0
+