Manual merge of version 5.212.0~alpha2-19+rpi1 and 5.212.0~alpha2-20 to produce 5...

diff --cc debian/changelog
index c19f2b67ed8442a2dea7bfa02ab42af3693d3245,cbe65a4566c94e5d495113bdba3e6e9e7d09ace1..919aef04125af5b24d1818bc87f50e16ec351492
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,15 +1,26 @@@
- qtwebkit-opensource-src (5.212.0~alpha2-19+rpi1) buster-staging; urgency=medium
++qtwebkit-opensource-src (5.212.0~alpha2-20+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 5.212.0~alpha2-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 09 Dec 2017 00:03:30 +0000]
 +  * Update symbols file for raspbian.
 +  * Fix clean target.
 +  [changes introduced in 5.212.0~alpha2-6+rpi1] by Peter Michael Green
 +  * Try unsuccessfully to hack offlineasm to prevent generation of movw/movt
 +  * Disable JIT
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 03 Jan 2019 10:30:08 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 05 Mar 2019 17:51:07 +0000
++
+ qtwebkit-opensource-src (5.212.0~alpha2-20) unstable; urgency=medium
+ 
+   * Backport two upstream commits to fix page width in plain text messages
+     in Trojitá (fix_trojita_plaintext.diff; closes: #919522).
+   * Update to debhelper compat level 12.
+   * Use the new cmake+ninja buildsystem.
+   * Drop the documentation packages. They cannot be built properly with
+     qdoc 5.11. See https://github.com/annulen/webkit/issues/793.
+   * Update symbols files from buildds’ logs.
+   * Fix libpng warning by running pngcrush during build.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Tue, 19 Feb 2019 23:25:35 +0300
  
  qtwebkit-opensource-src (5.212.0~alpha2-19) unstable; urgency=medium
  

diff --cc debian/libqt5webkit5.symbols
index 880852d12c1b61ba9c70eea40a6fb38d011cd631,fac8e48099686eec8f05d500edd11627f28e58f8..e6ca98a8c12d0f29cf94f4da9da68b736561f6af
--- 1/debian/libqt5webkit5.symbols
--- 2/debian/libqt5webkit5.symbols
+++ b/debian/libqt5webkit5.symbols
@@@ -2390,10 -2390,8 +2390,10 @@@ libQt5WebKit.so.5 libqt5webkit5 #MINVER
   _ZTV25QWebNotificationPresenter@Base 5.212.0~alpha2
   (arch=alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc powerpcspe ppc64 sh4 x32)_ZTVNSt6thread11_State_implINS_8_InvokerISt5tupleIJPFvPN7bmalloc9AsyncTaskINS3_4HeapEMS5_FvvEEEES9_EEEEEE@Base 5.212.0~alpha2
   (arch=armel)_ZTVSt23_Sp_counted_ptr_inplaceISt5mutexSaIS0_ELN9__gnu_cxx12_Lock_policyE1EE@Base 5.212.0~alpha2
 - (arch=alpha amd64 arm64 armhf hppa hurd-i386 i386 mips mips64el mipsel powerpc ppc64 sh4 x32)_ZTVSt23_Sp_counted_ptr_inplaceISt5mutexSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE@Base 5.212.0~alpha2
 + (optional=disappeardinraspbian)_ZTVSt23_Sp_counted_ptr_inplaceISt5mutexSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE@Base 5.212.0~alpha2
-  (arch=amd64 arm64 armel armhf hppa hurd-i386 i386 mips mips64el mipsel powerpc ppc64 sh4)_ZZNSt19_Sp_make_shared_tag5_S_tiEvE5__tag@Base 5.212.0~alpha2
+  (arch=alpha amd64 arm64 armel armhf hppa hurd-i386 i386 mips mips64el mipsel powerpc ppc64 sh4 x32)_ZZNSt19_Sp_make_shared_tag5_S_tiEvE5__tag@Base 5.212.0~alpha2
 + (optional=appeardinraspbian)_ZTVSt19_Sp_counted_deleterIPSt5mutexNSt12__shared_ptrIS0_LN9__gnu_cxx12_Lock_policyE1EE8_DeleterISaIS0_EEES7_LS4_1EE@Base 5.212.0~alpha2
 + (optional=disappeardinraspbian)_ZTVSt19_Sp_counted_deleterIPSt5mutexNSt12__shared_ptrIS0_LN9__gnu_cxx12_Lock_policyE2EE8_DeleterISaIS0_EEES7_LS4_2EE@Base 5.212.0~alpha2
   _ZZZN21QWebIconImageProvider10identifierEvENKUlvE_clEvE15qstring_literal@Base 5.2.0
   _ZlsR11QDataStreamRK11QWebHistory@Base 5.0.2
   _ZrsR11QDataStreamR11QWebHistory@Base 5.0.2

diff --cc debian/patches/series
index 66b75879865f567f73bf41437e3d2118283b68b3,50d9148a1eae7f553a4f92236b40a4ef5d9bee87..1caaf04f4926e233269c6e6e59cc232147419d7d
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -10,5 -10,4 +10,6 @@@ pkgconfig_description.dif
  use_system_woff2.diff
  pkgconfig_includedir.diff
  doxygen_tags.diff
+ fix_trojita_plaintext.diff
 +hack-offlineasm-to-prevent-generation-of.patch
 +make-further-unsuccesful-changes-to-offl.patch

diff --cc debian/rules
index 0d9ba83bacbc16dad057b0a358bab4d49e9b1408,365b37a2dd87758ac9c74991d882ec820dee5aac..dfbe80231ed2f7ae98f63a03e89ff185eee6622c
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -79,10 -74,3 +74,7 @@@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPT
        xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" \
        ctest --output-on-failure
  endif
- override_dh_auto_test-indep:
-       # Do not attempt to run anything to make build-indep work
- 
 +
 +override_dh_auto_clean:
 +      rm -f `find . -name '*.pyc'`
 +      dh_auto_clean