Merge version 3.0.11.1-2+rpi1 and 3.0.11.1-3 to produce 3.0.11.1-3+rpi1

diff --cc debian/changelog
index 2a13ba74f1c9baf470fb9c86bca6b48e695adbe5,14fabf56f3b54be23db058e4716e79cd2584b601..712786853cfae781492b1d2dd88eb9ac38462ce2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- vlc (3.0.11.1-2+rpi1) bullseye-staging; urgency=medium
++vlc (3.0.11.1-3+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 3.0.11.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 30 Aug 2020 00:37:35 +0000]
 +  * Add extern to three functions for gcc-10 compatibility.
 +  * Partially fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 28 Sep 2020 07:56:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 26 Oct 2020 13:07:11 +0000
++
+ vlc (3.0.11.1-3) unstable; urgency=medium
+ 
+   * debian/patches: Apply upstream patches to fix build with Qt 5.15 (Closes:
+     #972157)
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Wed, 21 Oct 2020 21:14:33 +0200
  
  vlc (3.0.11.1-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index 00ff3ab4b1e3a2db8a34f258ae2d2f7223c5bb09,a5058f2198f63a7e88069bdf53fe1332f5a76ac2..c3a49a4066431b423d35729128942300376fdf4c
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,5 +1,6 @@@
  0001-configure-fix-linking-on-RISC-V-ISA.patch
  0002-Revert-configure-Require-libmodplug-0.8.9.patch
  0003-Do-not-generate-cache-during-build.patch
+ 0004-qt-fix-missing-header-when-compiling-with-Qt-5.15.patch
+ 0005-qt-add-missing-include-for-QPainterPath.patch
 +add-extern-qualifiers.patch