[neon/qt/qtwebengine/Neon/release] debian: merge salsa

[Jonathan Esk-Riddell]

Git commit edb8541362f32297ef2b0b75fb9e082450e0d717 by Jonathan Esk-Riddell.
Committed on 09/01/2023 at 14:21.
Pushed by jriddell into branch 'Neon/release'.

merge salsa

M  +84   -0    debian/changelog
M  +15   -17   debian/control
M  +5    -2    debian/patches/series
M  +3    -6    debian/rules

https://invent.kde.org/neon/qt/qtwebengine/commit/edb8541362f32297ef2b0b75fb9e082450e0d717

diff --cc debian/control
index a8e54f1,f00b80b..8cfd992
--- a/debian/control
+++ b/debian/control
@@@ -65,10 -64,9 +64,9 @@@ Build-Depends: binutils (>= 2.32-8~)
                 libxtst-dev,
                 mesa-common-dev,
                 ninja-build,
-                node-pako,
                 node-rollup-plugin-terser,
                 node-yargs,
 -               nodejs (>= 16.14),
 +               nodejs,
                 pkg-config,
                 pkg-kde-tools,
                 protobuf-compiler,
diff --cc debian/patches/series
index 5de94a9,48ea6b4..a17c3f7
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,9 -1,12 +1,8 @@@
  system-lcms2.patch
  system-nspr-prtime.patch
 -system-icu-utf.patch
  verbose-gn-bootstrap.patch
 -mipsel-ptrace-include.patch
 -mipsel-no-dav1d.patch
 -mipsel-link-atomic.patch
  sandbox-time64-syscalls.patch
- remove-benchmark-from-inputs.patch
- python2.patch
+ mipsel-code-range-size.patch
  breakpad-getcontext.patch
  mipsel-ggc-min-expand.patch
  mips64el-crashpad.patch
diff --cc debian/rules
index 114b5ac,b96302f..aaac58e
--- a/debian/rules
+++ b/debian/rules
@@@ -116,9 -122,9 +116,9 @@@ ifeq ($(DEB_HOST_ARCH),i386
  endif
  
  	# Run qmake again now with the proper values.
- 	qmake QT_BUILD_PARTS+=tests QMAKE_EXTRA_ARGS+="$(config_args)" QMAKE_PYTHON2=python2
+ 	qmake QT_BUILD_PARTS+=tests QMAKE_EXTRA_ARGS+="$(config_args)" QMAKE_PYTHON3=python3
  
 -	# Create js files, that are needed for building step for arch and indep builds
 +	# # Create js files, that are needed for building step for arch and indep builds
  	cd $(CURDIR)/src/3rdparty/chromium/third_party/jstemplate/; \
  		cat util.js jsevalcontext.js jstemplate.js exports.js > jstemplate_compiled.js