[Pkg-javascript-commits] [uglifyjs] 222/228: Unfuzz patches.

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository uglifyjs.

commit cdbb0665ee9c386eb60ff061e457d74734236e55
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Apr 15 15:46:50 2017 +0200

    Unfuzz patches.
---
 debian/patches/1001_break_dep_loop.patch         | 33 +++++++++++++-----------
 debian/patches/1002_avoid_timeout_in_tests.patch | 10 -------
 debian/patches/2002_node_conflict.patch          |  4 +--
 3 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/debian/patches/1001_break_dep_loop.patch b/debian/patches/1001_break_dep_loop.patch
index 32b1b9c..fc2d673 100644
--- a/debian/patches/1001_break_dep_loop.patch
+++ b/debian/patches/1001_break_dep_loop.patch
@@ -5,18 +5,21 @@ Last-Update: 2016-12-09
 
 --- a/package.json
 +++ b/package.json
-@@ -30,7 +30,6 @@
+@@ -29,7 +29,6 @@
+     "LICENSE"
    ],
    "dependencies": {
-     "async": "~0.2.6",
 -    "source-map": "~0.5.1",
-     "uglify-to-browserify": "~1.0.0",
      "yargs": "~3.10.0"
    },
-@@ -41,6 +40,9 @@
-     "estraverse": "~1.5.1",
+   "devDependencies": {
+@@ -40,8 +39,12 @@
      "mocha": "~2.3.4"
    },
+   "optionalDependencies": {
++    "source-map": "~0.5.1",
+     "uglify-to-browserify": "~1.0.0"
+   },
 +  "optionalDependencies": {
 +    "source-map": "~0.5.1"
 +    },
@@ -31,25 +34,25 @@ Last-Update: 2016-12-09
  
 +var sourceMap;
 +try {
-+	sourceMap = require("source-map");
++    sourceMap = require("source-map");
 +} catch(e) {
 +}
 +
- var FILES = exports.FILES = [
+ var UglifyJS = exports;
+ var FILES = UglifyJS.FILES = [
      "../lib/utils.js",
-     "../lib/ast.js",
-@@ -28,7 +34,7 @@
- new Function("MOZ_SourceMap", "exports", "DEBUG", FILES.map(function(file){
+@@ -27,7 +33,7 @@
+ new Function("MOZ_SourceMap", "exports", FILES.map(function(file){
      return fs.readFileSync(file, "utf8");
  }).join("\n\n"))(
 -    require("source-map"),
 +    sourceMap,
-     UglifyJS,
-     !!global.UGLIFY_DEBUG
+     UglifyJS
  );
-@@ -120,18 +126,22 @@
-         inMap = JSON.parse(fs.readFileSync(options.inSourceMap, "utf8"));
-     }
+ 
+@@ -139,18 +145,22 @@
+     // 5. output
+     var output = { max_line_len: 32000 };
      if (options.outSourceMap || options.sourceMapInline) {
 -        output.source_map = UglifyJS.SourceMap({
 -            // prefer outFileName, otherwise use outSourceMap without .map suffix
diff --git a/debian/patches/1002_avoid_timeout_in_tests.patch b/debian/patches/1002_avoid_timeout_in_tests.patch
index 29ed2d5..1ef3591 100644
--- a/debian/patches/1002_avoid_timeout_in_tests.patch
+++ b/debian/patches/1002_avoid_timeout_in_tests.patch
@@ -7,16 +7,6 @@ Author: Jonas Smedegaard <dr at jones.dk>
 Bug-Debian: https://bugs.debian.org/851318
 Last-Update: 2017-02-08
 
---- a/test/mocha/cli.js
-+++ b/test/mocha/cli.js
-@@ -4,7 +4,6 @@
- describe("bin/uglifyjs", function () {
-     var uglifyjscmd = '"' + process.argv[0] + '" bin/uglifyjs';
-     it("should produce a functional build when using --self", function (done) {
--        this.timeout(5000);
- 
-         var command = uglifyjscmd + ' --self -cm --wrap WrappedUglifyJS';
- 
 --- a/test/mocha/let.js
 +++ b/test/mocha/let.js
 @@ -3,7 +3,6 @@
diff --git a/debian/patches/2002_node_conflict.patch b/debian/patches/2002_node_conflict.patch
index fa47c1a..a07e63d 100644
--- a/debian/patches/2002_node_conflict.patch
+++ b/debian/patches/2002_node_conflict.patch
@@ -20,8 +20,8 @@ Last-Update: 2012-12-10
 -#! /usr/bin/env node
 +#! /usr/bin/nodejs
  
- global.UGLIFY_DEBUG = true;
- 
+ var U = require("../tools/node");
+ var path = require("path");
 --- a/bin/extract-props.js
 +++ b/bin/extract-props.js
 @@ -1,4 +1,4 @@

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