[neon/qt/qtwebengine/Neon/release_focal] debian: Borrow patch from debian to remove non DFSG rjsmin that is breaking build.

[Scarlett Moore]

Git commit 007bcb2ac5ad63be28a7d42dfe4e14b0312d9316 by Scarlett Moore.
Committed on 09/09/2022 at 18:49.
Pushed by scarlettmoore into branch 'Neon/release_focal'.

Borrow patch from debian to remove non DFSG rjsmin that is breaking build.

M  +6    -0    debian/changelog
M  +0    -1    debian/control
A  +15   -0    debian/patches/remove-benchmark-from-inputs.patch
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt/qtwebengine/commit/007bcb2ac5ad63be28a7d42dfe4e14b0312d9316

diff --git a/debian/changelog b/debian/changelog
index b1a73ce..d36cb24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qtwebengine-opensource-src (5.15.10+dfsg-3ubuntu3) focal; urgency=medium
+
+  * Borrow patch from debian to remove non DFSG rjsmin that is breaking build. 
+
+ -- Scarlett Moore <sgmoore at debian.org>  Fri, 09 Sep 2022 11:47:34 -0700
+
 qtwebengine-opensource-src (5.15.10+dfsg-3ubuntu2) focal; urgency=medium
 
   * python3.. 
diff --git a/debian/control b/debian/control
index 81b50dc..d7cffec 100644
--- a/debian/control
+++ b/debian/control
@@ -72,7 +72,6 @@ Build-Depends: binutils (>= 2.32-8~),
                pkg-kde-tools,
                protobuf-compiler,
                python-is-python2,
-               python3-rjsmin,
                python2,
                qtbase5-dev (>= 5.15.2+dfsg~),
                qtbase5-private-dev (>= 5.15.2+dfsg~),
diff --git a/debian/patches/remove-benchmark-from-inputs.patch b/debian/patches/remove-benchmark-from-inputs.patch
new file mode 100644
index 0000000..9882da7
--- /dev/null
+++ b/debian/patches/remove-benchmark-from-inputs.patch
@@ -0,0 +1,15 @@
+Description: remove a non-DFSG benchmark file from build inputs
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: no
+Last-Update: 2021-03-11
+
+--- a/src/3rdparty/chromium/third_party/catapult/tracing/trace_viewer.gni
++++ b/src/3rdparty/chromium/third_party/catapult/tracing/trace_viewer.gni
+@@ -677,7 +677,6 @@ py_vulcanize_files = [
+   "../common/py_vulcanize/third_party/rjsmin/_setup/py3/shell.py",
+   "../common/py_vulcanize/third_party/rjsmin/_setup/py3/util.py",
+   "../common/py_vulcanize/third_party/rjsmin/bench/__init__.py",
+-  "../common/py_vulcanize/third_party/rjsmin/bench/jsmin.py",
+   "../common/py_vulcanize/third_party/rjsmin/bench/jsmin_2_0_9.py",
+   "../common/py_vulcanize/third_party/rjsmin/bench/main.py",
+   "../common/py_vulcanize/third_party/rjsmin/bench/write.py",
diff --git a/debian/patches/series b/debian/patches/series
index d20df85..0f71171 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ verbose-gn-bootstrap.patch
 #sandbox-time64-syscalls.patch
 mipsel-code-range-size.patch
 0001-lower-version-to-.3-to-align-with-the-rest-of-the-pa.patch
+remove-benchmark-from-inputs.patch