From aa77a21fa2ef5af6fb51564aeb72b31efc36cc40 Mon Sep 17 00:00:00 2001
From: Yadd <yadd@debian.org>
Date: Mon, 29 Aug 2022 10:25:11 +0200
Subject: [PATCH] refresh patches
---
debian/patches/drop-ie8.patch | 2 +-
debian/patches/series | 1 -
debian/patches/skip-gzip-js.patch | 16 ++++++++++------
debian/patches/skip-insight.patch | 8 ++++++--
debian/patches/skip-modules.patch | 21 ---------------------
5 files changed, 17 insertions(+), 31 deletions(-)
delete mode 100644 debian/patches/skip-modules.patch
diff --git a/debian/patches/drop-ie8.patch b/debian/patches/drop-ie8.patch
index 34a6f7e..b67e12e 100644
--- a/debian/patches/drop-ie8.patch
+++ b/debian/patches/drop-ie8.patch
@@ -5,7 +5,7 @@ Last-Update: 2021-10-24
--- a/Gruntfile.js
+++ b/Gruntfile.js
-@@ -302,7 +302,7 @@
+@@ -318,7 +318,7 @@
// Support: Android 4.0 only
// UglifyJS 3 breaks Android 4.0 if this option is not enabled.
// This is in lieu of setting ie8 for all of mangle, compress, and output
diff --git a/debian/patches/series b/debian/patches/series
index 2dc7b60..1b8ad87 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-skip-modules.patch
skip-gzip-js.patch
skip-raw-body.patch
skip-insight.patch
diff --git a/debian/patches/skip-gzip-js.patch b/debian/patches/skip-gzip-js.patch
index 6efc718..685070c 100644
--- a/debian/patches/skip-gzip-js.patch
+++ b/debian/patches/skip-gzip-js.patch
@@ -1,16 +1,20 @@
Description: Skip gzip js
+Forwarded: not-needed
+Reviewed-By: Yadd <yadd@debian.org>
+Last-Update: 2022-08-29
+
--- a/Gruntfile.js
+++ b/Gruntfile.js
-@@ -13,7 +13,7 @@
+@@ -20,7 +20,7 @@
}
var fs = require( "fs" ),
- gzip = require( "gzip-js" ),
-+ gzip = require( "zlib" ),
- isTravis = process.env.TRAVIS,
- travisBrowsers = process.env.BROWSERS && process.env.BROWSERS.split( "," );
-
-@@ -29,7 +29,7 @@
++ zlib = require( "zlib" ),
+ oldNode = /^v10\./.test( process.version ),
+ nodeV17OrNewer = !/^v1[0246]\./.test( process.version ),
+ isCi = process.env.GITHUB_ACTION,
+@@ -38,7 +38,7 @@
options: {
compress: {
gz: function( contents ) {
diff --git a/debian/patches/skip-insight.patch b/debian/patches/skip-insight.patch
index e4d6d41..33c2693 100644
--- a/debian/patches/skip-insight.patch
+++ b/debian/patches/skip-insight.patch
@@ -1,10 +1,14 @@
Description: Skip insight
+Forwarded: not-needed
+Reviewed-By: Yadd <yadd@debian.org>
+Last-Update: 2022-08-29
+
--- a/build/tasks/build.js
+++ b/build/tasks/build.js
-@@ -9,7 +9,6 @@
- module.exports = function( grunt ) {
+@@ -10,7 +10,6 @@
var fs = require( "fs" ),
requirejs = require( "requirejs" ),
+ slimBuildFlags = require( "./lib/slim-build-flags" ),
- Insight = require( "insight" ),
pkg = require( "../../package.json" ),
srcFolder = __dirname + "/../../src/",
diff --git a/debian/patches/skip-modules.patch b/debian/patches/skip-modules.patch
deleted file mode 100644
index 6727efa..0000000
--- a/debian/patches/skip-modules.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: skip unavailable modules
-Last-Update: 2022-02-21
-
---- a/package.json
-+++ b/package.json
-@@ -32,15 +32,7 @@
- "grunt": "1.3.0",
- "grunt-babel": "8.0.0",
- "grunt-cli": "1.3.2",
-- "grunt-compare-size": "0.4.2",
- "grunt-contrib-uglify": "3.4.0",
-- "grunt-contrib-watch": "1.1.0",
-- "grunt-eslint": "22.0.0",
-- "grunt-git-authors": "3.2.0",
-- "grunt-jsonlint": "1.1.0",
-- "grunt-karma": "4.0.0",
-- "grunt-newer": "1.3.0",
-- "grunt-npmcopy": "0.2.0",
- "gzip-js": "0.3.2",
- "husky": "1.3.1",
- "insight": "0.10.1",
--
GitLab