[Pkg-javascript-commits] [acorn] 04/06: Drop all patches and depend on nodejs (> 6)

[Julien Puydt]

This is an automated email from the git hooks/post-receive script.

jpuydt-guest pushed a commit to branch master
in repository acorn.

commit 16008dcacdf1960791d8938696ed04137a5d4807
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Fri Aug 18 09:01:28 2017 +0200

    Drop all patches and depend on nodejs (> 6)
---
 debian/changelog                              |  1 +
 debian/control                                |  2 +-
 debian/patches/default_arg.patch              | 38 ---------------------------
 debian/patches/destructuring_assignment.patch | 33 -----------------------
 debian/patches/series                         |  2 --
 5 files changed, 2 insertions(+), 74 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 17a6252..dc2457e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 acorn (5.1.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop all patches and depend on nodejs (> 6) (Closes: #872480).
 
  -- Julien Puydt <julien.puydt at laposte.net>  Fri, 18 Aug 2017 08:59:47 +0200
 
diff --git a/debian/control b/debian/control
index 5bcbe36..1f54bfa 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 10),
                node-ast-types,
                node-es6-module-transpiler,
                node-graceful-fs,
-               nodejs
+               nodejs (> 6)
 Standards-Version: 4.0.0
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-javascript/acorn.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-javascript/acorn.git
diff --git a/debian/patches/default_arg.patch b/debian/patches/default_arg.patch
deleted file mode 100644
index 90c2e10..0000000
--- a/debian/patches/default_arg.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: do not use default arguments (Debian's nodejs is too old)
-Author: Julien Puydt
-Forwarded: no
-
---- a/src/loose/state.js
-+++ b/src/loose/state.js
-@@ -4,7 +4,8 @@
- export const pluginsLoose = {}
- 
- export class LooseParser {
--  constructor(input, options = {}) {
-+  constructor(input, options) {
-+    if (!options) options = {};
-     this.toks = tokenizer(input, options)
-     this.options = this.toks.options
-     this.input = this.toks.input
---- a/src/tokentype.js
-+++ b/src/tokentype.js
-@@ -22,7 +22,8 @@
- // continue jumps to that label.
- 
- export class TokenType {
--  constructor(label, conf = {}) {
-+  constructor(label, conf) {
-+    if (!conf) conf = {};
-     this.label = label
-     this.keyword = conf.keyword
-     this.beforeExpr = !!conf.beforeExpr
-@@ -46,7 +47,8 @@
- export const keywords = {}
- 
- // Succinct definitions of keyword token types
--function kw(name, options = {}) {
-+function kw(name, options) {
-+  if (!options) options = {};
-   options.keyword = name
-   return keywords[name] = new TokenType(name, options)
- }
diff --git a/debian/patches/destructuring_assignment.patch b/debian/patches/destructuring_assignment.patch
deleted file mode 100644
index 4f42577..0000000
--- a/debian/patches/destructuring_assignment.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: avoid the use of destructuring assignments (Debian's nodejs is old)
-Author: Julien Puydt
-Forwarded: no
-
---- a/src/expression.js
-+++ b/src/expression.js
-@@ -30,13 +30,13 @@
- pp.checkPropClash = function(prop, propHash) {
-   if (this.options.ecmaVersion >= 6 && (prop.computed || prop.method || prop.shorthand))
-     return
--  let {key} = prop, name
-+  let key = prop.key, name
-   switch (key.type) {
-   case "Identifier": name = key.name; break
-   case "Literal": name = String(key.value); break
-   default: return
-   }
--  let {kind} = prop
-+  let kind = prop.kind
-   if (this.options.ecmaVersion >= 6) {
-     if (name === "__proto__" && kind === "init") {
-       if (propHash.proto) this.raiseRecoverable(key.start, "Redefinition of __proto__ property")
---- a/src/statement.js
-+++ b/src/statement.js
-@@ -517,7 +517,7 @@
-     method.kind = "method"
-     let isGetSet = false
-     if (!method.computed) {
--      let {key} = method
-+      let key = method.key
-       if (!isGenerator && !isAsync && key.type === "Identifier" && this.type !== tt.parenL && (key.name === "get" || key.name === "set")) {
-         isGetSet = true
-         method.kind = key.name
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9a7f8ad..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-default_arg.patch
-destructuring_assignment.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/acorn.git