From: Raspbian automatic forward porter Date: Mon, 26 Oct 2020 13:07:12 +0000 (+0000) Subject: Merge version 3.0.11.1-2+rpi1 and 3.0.11.1-3 to produce 3.0.11.1-3+rpi1 X-Git-Tag: archive/raspbian/3.0.11.1-3+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5a4b4a2c0a6c87afa1123d1f6924f9be38c1fec1;p=vlc.git Merge version 3.0.11.1-2+rpi1 and 3.0.11.1-3 to produce 3.0.11.1-3+rpi1 --- 5a4b4a2c0a6c87afa1123d1f6924f9be38c1fec1 diff --cc debian/changelog index 2a13ba74,14fabf56..71278685 --- a/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 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 Mon, 28 Sep 2020 07:56:21 +0000 ++ -- Raspbian forward porter 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 Wed, 21 Oct 2020 21:14:33 +0200 vlc (3.0.11.1-2) unstable; urgency=medium diff --cc debian/patches/series index 00ff3ab4,a5058f21..c3a49a40 --- a/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