diff --git a/.gitignore b/.gitignore index 6a1e5fa..1ceb264 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /qtwebengine-everywhere-src-5.12.2-clean.tar.xz /qtwebengine-everywhere-src-5.12.3-clean.tar.xz /qtwebengine-everywhere-src-5.12.4-clean.tar.xz +/pulseaudio-12.2-headers.tar.gz diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index e043191..2d5c817 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -65,6 +65,9 @@ Source3: get_free_ffmpeg_source_files.py # macros Source10: macros.qt5-qtwebengine +# pulseaudio headers +Source20: pulseaudio-12.2-headers.tar.gz + # some tweaks to linux.pri (system yasm, link libpci, run unbundling script) Patch0: qtwebengine-everywhere-src-5.10.0-linux-pri.patch # quick hack to avoid checking for the nonexistent icudtl.dat and silence the @@ -344,7 +347,9 @@ BuildArch: noarch %prep -%setup -q -n %{qt_module}-everywhere-src-%{version}%{?prerelease:-%{prerelease}} +%setup -q -n %{qt_module}-everywhere-src-%{version}%{?prerelease:-%{prerelease}} -a20 + +mv pulse src/3rdparty/chromium/ pushd src/3rdparty/chromium %patch101 -p2 -b .0001 @@ -587,6 +592,7 @@ done %changelog * Wed Aug 07 2019 Rex Dieter - 5.12.4-7 - rebuild (re2, #1672014#c10) +- build using bundled pulse headers, workaround FTBFS bug #1729806 * Fri Jul 26 2019 Fedora Release Engineering - 5.12.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index c8b47cf..39eb9c0 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (qtwebengine-everywhere-src-5.12.4-clean.tar.xz) = 6ac76ef0fde00763a407363e1ce79d883d827020580c0ec712ae1b2f1262d9daf2a1039c44f271ac4b498acaa9af1c1dcdb7367bcf3a6b97acdc9d8973b3cd18 +SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be