[qt5-qtwebengine-freeworld] build using bundled pulse headers, workaround FTBFS bug rh#1729806

commit b35cabd765d9a67e94161bbc9bd9664de5eb02fd Author: Rex Dieter <rdieter(a)gmail.com&gt; Date: Mon Aug 26 10:36:41 2019 -0500 build using bundled pulse headers, workaround FTBFS bug rh#1729806 .gitignore | 1 + qt5-qtwebengine-freeworld.spec | 11 ++++++++++- sources | 1 + sources.keep | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) --- diff --git a/.gitignore b/.gitignore index 5adbf0b..77900a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /qtwebengine-everywhere-src-5.12.4.tar.xz +/pulseaudio-12.2-headers.tar.gz diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec index f99b743..f63114f 100644 --- a/qt5-qtwebengine-freeworld.spec +++ b/qt5-qtwebengine-freeworld.spec @@ -55,6 +55,10 @@ Release: 3%{?dist} License: (LGPLv2 with exceptions or GPLv3 with exceptions) and BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) URL: http://www.qt.io Source0: http://download.qt.io/official_releases/qt/%{major_minor}/%{version}/subm... + +# 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 @@ -310,7 +314,9 @@ This version is compiled with support for patent-encumbered codecs enabled. %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 @@ -424,6 +430,9 @@ echo "%{_libdir}/%{name}" \ %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf %changelog +* Mon Aug 26 2019 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 5.12.4-3 +- build using bundled pulse headers, workaround FTBFS bug rh#1729806 + * Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 5.12.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index a47e86a..a27206d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 9f1f20537eba9b166cd0e59191e49f29 qtwebengine-everywhere-src-5.12.4.tar.xz +45d9c2aba2e79c5ce319ca7e78bbbf39 pulseaudio-12.2-headers.tar.gz diff --git a/sources.keep b/sources.keep new file mode 100644 index 0000000..86dc953 --- /dev/null +++ b/sources.keep @@ -0,0 +1 @@ +45d9c2aba2e79c5ce319ca7e78bbbf39 pulseaudio-12.2-headers.tar.gz