From d21e49cf82312fb38d4176262fba6327440de871 Mon Sep 17 00:00:00 2001 From: Jared Smith Date: Apr 20 2018 19:56:06 +0000 Subject: Use newer npm(snapdragon) --- diff --git a/nodejs-extglob.spec b/nodejs-extglob.spec index 4bcc797..1ac050b 100644 --- a/nodejs-extglob.spec +++ b/nodejs-extglob.spec @@ -20,6 +20,8 @@ Source1: tests-%{version}.tar.bz2 Source2: examples-%{version}.tar.bz2 Source10: dl-tests.sh +Patch0: nodejs-extglob_use-newer-snapdragon.patch + BuildArch: noarch %if 0%{?fedora} >= 19 ExclusiveArch: %{nodejs_arches} noarch @@ -51,8 +53,12 @@ power of regular expressions to glob patterns. %prep %setup -q -n package # setup the tests -%autosetup -T -D -a 1 -n package -%autosetup -T -D -a 2 -n package +%setup -q -T -D -a 1 -n package +%setup -q -T -D -a 2 -n package + +%patch0 -p1 + +rm lib/.DS_Store %nodejs_fixdep expand-brackets '~3.0.0' %nodejs_fixdep snapdragon '~0.12.0' diff --git a/nodejs-extglob_use-newer-snapdragon.patch b/nodejs-extglob_use-newer-snapdragon.patch new file mode 100644 index 0000000..18fdb7f --- /dev/null +++ b/nodejs-extglob_use-newer-snapdragon.patch @@ -0,0 +1,106 @@ +diff --git a/lib/extglob.js b/lib/extglob.js +index 015f928..8b3ec04 100644 +--- a/lib/extglob.js ++++ b/lib/extglob.js +@@ -22,6 +22,9 @@ var parsers = require('./parsers'); + function Extglob(options) { + this.options = extend({source: 'extglob'}, options); + this.snapdragon = this.options.snapdragon || new Snapdragon(this.options); ++ ++ this.snapdragon.use(capture()) ++ + this.snapdragon.patterns = this.snapdragon.patterns || {}; + this.compiler = this.snapdragon.compiler; + this.parser = this.snapdragon.parser; +diff --git a/lib/parsers.js b/lib/parsers.js +index 2ba7352..670e44a 100644 +--- a/lib/parsers.js ++++ b/lib/parsers.js +@@ -31,7 +31,7 @@ function parsers(extglob) { + * Extglob open: "*(" + */ + +- .capture('paren.open', function() { ++ .set('paren.open', function() { + var parsed = this.parsed; + var pos = this.position(); + var m = this.match(/^([!@*?+])?\(/); +@@ -72,7 +72,7 @@ function parsers(extglob) { + * Extglob close: ")" + */ + +- .capture('paren.close', function() { ++ .set('paren.close', function() { + var parsed = this.parsed; + var pos = this.position(); + var m = this.match(/^\)/); +@@ -103,7 +103,7 @@ function parsers(extglob) { + * Escape: "\\." + */ + +- .capture('escape', function() { ++ .set('escape', function() { + var pos = this.position(); + var m = this.match(/^\\(.)/); + if (!m) return; +@@ -119,7 +119,7 @@ function parsers(extglob) { + * Question marks: "?" + */ + +- .capture('qmark', function() { ++ .set('qmark', function() { + var parsed = this.parsed; + var pos = this.position(); + var m = this.match(/^\?+(?!\()/); +@@ -137,10 +137,47 @@ function parsers(extglob) { + * Character parsers + */ + +- .capture('star', /^\*(?!\()/) +- .capture('plus', /^\+(?!\()/) +- .capture('dot', /^\./) +- .capture('text', not); ++ .set('star', function() { ++ var parsed = this.parse; ++ var pos = this.position(); ++ var m = this.match(/^\*(?!\()/); ++ if (!m) return; ++ return pos({ ++ type: 'star', ++ val: m[0] ++ }); ++ }) ++ .set('plus', function() { ++ var parsed = this.parse; ++ var pos = this.position(); ++ var m = this.match(/^\+(?!\()/); ++ if (!m) return; ++ return pos({ ++ type: 'star', ++ val: m[0] ++ }); ++ }) ++ .set('dot', function() { ++ var parsed = this.parse; ++ var pos = this.position(); ++ var m = this.match(/^\./); ++ if (!m) return; ++ return pos({ ++ type: 'dot', ++ val: m[0] ++ }); ++ }) ++ .set('text', function() { ++ var pos = this.position(); ++ var m = this.match(not); ++ if (!m || !m[0]) return; ++ ++ return pos({ ++ type: 'text', ++ val: m[0] ++ }); ++ }); ++ + }; + + /**