[neon/qt/qtwebengine/Neon/experimental] debian: merge

[Jonathan Riddell]

Git commit 96f527378b6e7e48ee41efef2e163cf28879d6a3 by Jonathan Riddell.
Committed on 21/10/2020 at 11:12.
Pushed by jriddell into branch 'Neon/experimental'.

merge

M  +14   -15   debian/control
M  +12   -8    debian/patches/series
M  +2    -2    debian/patches/system-lcms2.patch
M  +13   -16   debian/rules

https://invent.kde.org/neon/qt/qtwebengine/commit/96f527378b6e7e48ee41efef2e163cf28879d6a3

diff --cc debian/patches/series
index 12ffd78,52d194b..fe7dbc7
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,11 -1,15 +1,15 @@@
 -run-unbundling-script.patch
 +#run-unbundling-script.patch
  system-lcms2.patch
- #system-nspr-prtime.patch
- #system-icu-utf.patch
- #no-icudtl-dat.patch
+ system-nspr-prtime.patch
+ system-icu-utf.patch
  verbose-gn-bootstrap.patch
- 
- # needed for ubuntu's 18.04 gcc on armhf
- work-around-the-gcc-bug-in-skia.patch
- # does not apply to qt 5.15
- # chromium-buglist-on-mali-400.patch
+ mipsel-linux-5.patch
+ mipsel-ptrace-include.patch
+ mipsel-no-dav1d.patch
+ mipsel-no-v8-embedded-builtins.patch
+ mipsel-link-atomic.patch
+ icu-67.patch
+ openh264-picasm.patch
+ gcc-10.patch
+ bison-3.7.patch
+ sandbox-time64-syscalls.patch
diff --cc debian/rules
index 4d003d5,d63e452..f8ef330
--- a/debian/rules
+++ b/debian/rules
@@@ -33,22 -39,21 +39,19 @@@ small_architectures := armhf mipse
  no_gold_architectures := arm64 armhf mipsel
  
  config_args = -proprietary-codecs \
 -              -feature-webengine-system-libvpx \
                -system-ffmpeg \
                -system-opus \
 -              -system-webp \
 -              -system-webengine-icu
 +              -system-webp
  
- touch_files = src/3rdparty/chromium/third_party/analytics/google-analytics-bundle.js \
- 	      src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits2_worker/lighthouse/lighthouse-background.js \
+ touch_files = src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits_worker/lighthouse/lighthouse-dt-bundle.js \
+ 	      src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits/lighthouse/report-generator.js \
  	      src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/diff/diff_match_patch.js \
  	      src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/formatter_worker/acorn/acorn.js \
- 	      src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/gonzales/gonzales-scss.js \
  	      src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/network/NetworkConfigView.js \
- 	      src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/settings/EditFileSystemView.js \
  	      src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/terminal/xterm.js/build/xterm.css \
  	      src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/terminal/xterm.js/build/xterm.js \
- 	      src/3rdparty/chromium/third_party/web-animations-js/sources/web-animations.min.js \
- 	      src/3rdparty/chromium/third_party/web-animations-js/sources/web-animations-next-lite.min.js \
- 	      src/3rdparty/chromium/third_party/web-animations-js/sources/web-animations-next.min.js
+ 	      src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/polymer_bundled.min.js \
+ 	      src/3rdparty/chromium/third_party/web-animations-js/sources/web-animations-next-lite.min.js
  
  %:
  	dh $@ --with pkgkde_symbolshelper
@@@ -74,11 -77,8 +75,11 @@@ override_dh_auto_clean
  
  override_dh_auto_configure:
  	# Run qmake once to create .qmake.conf and be sure to append the following values.
- 	qmake QT_BUILD_PARTS+=tests QMAKE_EXTRA_ARGS+="$(config_args)"
+ 	qmake QT_BUILD_PARTS+=tests QMAKE_EXTRA_ARGS+="$(config_args)" QMAKE_PYTHON2=python2
  
 +	echo "QMAKE_CXX = g++-8" >> .qmake.conf
 +	echo "QMAKE_CC = gcc-8" >> .qmake.conf
 +
  # Enable gstabs debugging symbols only on gstab_architectures.
  ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gstab_architectures)))
  	echo "QMAKE_CXXFLAGS -= -g" >> .qmake.conf