Merge version 4:4.8.7+dfsg-18+rpi1 and 4:4.8.7+dfsg-19 to produce 4:4.8.7+dfsg-19...

diff --cc debian/changelog
index 1f9b70839916f94a102eb041fb46c2e913d7b4a9,a5b7a0390ce3f8519e1e65f0900e1bea13877bc4..03a376ccadc2afce8638c4048d13fdefe6af03a7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,12 +1,22 @@@
- qt4-x11 (4:4.8.7+dfsg-18+rpi1) buster-staging; urgency=medium
++qt4-x11 (4:4.8.7+dfsg-19+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 4:4.8.6+git64-g5dc8b2b+dfsg-2+rpi1 by Peter Micheal Green <plugwash@raspbian.org> at Thu, 31 Jul 2014 22:56:54 +0000]
 +  * Disable neon
 +
 +  [changes brought forward from 4:4.8.7+dfsg-17+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sun, 14 Apr 2019 10:25:37 +0000]
 +  * Replace a number of occourances of "asm" with "__asm"
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 15 Apr 2019 12:36:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 19 Jul 2019 23:28:16 +0000
++
+ qt4-x11 (4:4.8.7+dfsg-19) unstable; urgency=medium
+ 
+   * Team upload.
+   * Fix FTBS with GCC 9. (Closes: #925811)
+     - Add gcc9-qforeach.patch to backport Q_FOREACH changes from Qt 5
+     - Update qt-everywhere-opensource-src-4.8.7-gcc6.patch to add GCC 9 to
+       the compiler checks
+ 
+  -- Felix Geyer <fgeyer@debian.org>  Sun, 14 Jul 2019 12:19:27 +0200
  
  qt4-x11 (4:4.8.7+dfsg-18) unstable; urgency=medium
  

diff --cc debian/patches/series
index a70cbb2f832796ac36b025a93aefab9802400245,a2f472aa2ec49311ddd4dd7edc659f8e00c61f02..85c22fac92ea97a68eb1e17998739c15e3766359
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -7,10 -7,10 +7,8 @@@ Better-handling-of-invalid-font-tables.
  
  # Patches submitted upstream but still not accepted
  aarch64_arm64_qatomic_support.patch
--
  # Patched blessed by upstream but that will never reach Qt4.
  plugin_system_for_systemtray.patch
--
  # Patches backported from Qt5 that will never be part of Qt4.
  replace_timestamps_with_fixed_date_in_qhelpgenerator.patch
  CVE-2018-15518.patch
@@@ -19,11 -19,11 +17,9 @@@ CVE-2018-19870.patc
  CVE-2018-19871.patch
  CVE-2018-19872.patch
  CVE-2018-19873.patch
--
  # qt-copy patches
  0195-compositing-properties.diff
  0225-invalidate-tabbar-geometry-on-refresh.patch
--
  # debian patches
  qtdebug_syslog.patch
  buildable_appchooser_states_demos.patch
@@@ -72,4 -72,4 +68,5 @@@ add-lxde-support.patc
  openssl_1.1.patch
  riscv64-support.patch
  fix-build-icu59.patch
+ gcc9-qforeach.patch
 +add-underscores-to-asm.patch