diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index a77617a..9152d64 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -49,7 +49,7 @@ Source3: process_ffmpeg_gyp.py Patch0: qtwebengine-opensource-src-5.6.0-beta-no-format.patch # some tweaks to linux.pri (system libs, link libpci, run unbundling script, # do an NSS/BoringSSL "chimera build", see Provides: bundled(boringssl) comment) -Patch1: qtwebengine-opensource-src-5.6.0-beta-linux-pri.patch +Patch1: qtwebengine-opensource-src-5.6.0-rc-linux-pri.patch # don't require the time zone detection API backported from ICU 55 (thanks spot) Patch2: qtwebengine-opensource-src-5.6.0-beta-system-icu54.patch # fix extractCFlag to also look in QMAKE_CFLAGS_RELEASE, needed to detect the @@ -121,7 +121,6 @@ BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(libevent) BuildRequires: pkgconfig(zlib) -BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(minizip) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) @@ -142,7 +141,6 @@ BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(libpci) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(nss) -BuildRequires: pkgconfig(speex) BuildRequires: pkgconfig(libsrtp) BuildRequires: perl BuildRequires: python @@ -372,6 +370,8 @@ popd %changelog * Wed Feb 24 2016 Kevin Kofler - 5.6.0-0.19.rc - Update to 5.6.0 RC +- Rebase linux-pri patch +- Remove BuildRequires pkgconfig(flac), pkgconfig(speex), no longer needed * Wed Feb 24 2016 Kevin Kofler - 5.6.0-0.18.beta - no-sse2 patch: Fix FFT (RealFourier) in webrtc on non-SSE2 x86 diff --git a/qtwebengine-opensource-src-5.6.0-beta-linux-pri.patch b/qtwebengine-opensource-src-5.6.0-rc-linux-pri.patch similarity index 79% rename from qtwebengine-opensource-src-5.6.0-beta-linux-pri.patch rename to qtwebengine-opensource-src-5.6.0-rc-linux-pri.patch index cf24289..5e55b34 100644 --- a/qtwebengine-opensource-src-5.6.0-beta-linux-pri.patch +++ b/qtwebengine-opensource-src-5.6.0-rc-linux-pri.patch @@ -1,7 +1,7 @@ -diff -ur qtwebengine-opensource-src-5.6.0-beta/src/core/config/linux.pri qtwebengine-opensource-src-5.6.0-beta-linux-pri/src/core/config/linux.pri ---- qtwebengine-opensource-src-5.6.0-beta/src/core/config/linux.pri 2015-12-14 16:27:24.000000000 +0100 -+++ qtwebengine-opensource-src-5.6.0-beta-linux-pri/src/core/config/linux.pri 2016-01-14 17:31:05.765975551 +0100 -@@ -18,7 +18,13 @@ +diff -ur qtwebengine-opensource-src-5.6.0-rc/src/core/config/linux.pri qtwebengine-opensource-src-5.6.0-rc-linux-pri/src/core/config/linux.pri +--- qtwebengine-opensource-src-5.6.0-rc/src/core/config/linux.pri 2016-02-15 16:18:46.000000000 +0100 ++++ qtwebengine-opensource-src-5.6.0-rc-linux-pri/src/core/config/linux.pri 2016-02-24 23:24:01.533878478 +0100 +@@ -20,7 +20,13 @@ use_kerberos=0 \ use_pango=0 @@ -17,8 +17,8 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta/src/core/config/linux.pri qtweben use_openssl=1 \ use_openssl_certs=1 @@ -40,6 +46,28 @@ + use?(system_opus): GYP_CONFIG += use_system_opus=1 use?(system_snappy): GYP_CONFIG += use_system_snappy=1 - use?(system_speex): GYP_CONFIG += use_system_speex=1 use?(system_vpx): GYP_CONFIG += use_system_libvpx=1 -use?(system_icu): GYP_CONFIG += use_system_icu=1 +use?(system_icu): GYP_CONFIG += use_system_icu=1 icu_use_data_file_flag=0