qtwebengine: refresh patches

* drop 0001-eLinux-build-ffmpegsumo-as-well.patch which is already included in 5.4.1

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

9 files changed, 47 insertions, 66 deletions

diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
index 032fe4de..b4a8852e 100644
--- a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
@@ -1,8 +1,8 @@
-From 41b142ec46c61d075b5cd95a88b57f0db74cbf31 Mon Sep 17 00:00:00 2001
+From 21d008c31a262ddcaeb3a8457de49061361ed882 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Fri, 3 Oct 2014 03:52:11 +0200
-Subject: [PATCH] base.gypi: include atomicops_internals_x86_gcc.cc when
- building for x64 arch
+Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc
+ when building for x64 arch
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
@@ -23,5 +23,5 @@ index a5a990a..af30cfa 100644
                  ['include', 'atomicops_internals_x86_gcc.cc'],
                ],
 -- 
-2.1.3
+2.3.1
 
diff --git a/recipes-qt/qt5/qtwebengine/0001-eLinux-build-ffmpegsumo-as-well.patch b/recipes-qt/qt5/qtwebengine/0001-eLinux-build-ffmpegsumo-as-well.patch
deleted file mode 100644
index eb80afd2..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-eLinux-build-ffmpegsumo-as-well.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 72ff0b7d9600db642e2d2e95c78c70454bbdb5e7 Mon Sep 17 00:00:00 2001
-From: Zeno Albisser <zeno.albisser@theqtcompany.com>
-Date: Fri, 30 Jan 2015 13:10:15 +0100
-Subject: [PATCH] eLinux: build ffmpegsumo as well.
-
-This will only contain free codecs.
-
-Change-Id: I021b2c121bf146abb24b7a90dd1c3580638b1058
-Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
-
-Upstream-Status: Backport [ 72ff0b7d9600db642e2d2e95c78c70454bbdb5e7 from https://gitorious.org/qt/qtwebengine.git ]
----
- src/core/config/embedded_linux.pri | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri
-index 4000625..773bf0b 100644
---- a/src/core/config/embedded_linux.pri
-+++ b/src/core/config/embedded_linux.pri
-@@ -1,7 +1,7 @@
- GYP_ARGS += "-D qt_os=\"embedded_linux\" -I config/embedded_linux.gypi"
- 
- GYP_CONFIG += \
--    build_ffmpegsumo=0 \
-+    build_ffmpegsumo=1 \
-     configuration_policy=0 \
-     desktop_linux=0 \
-     disable_nacl=1 \
--- 
-1.9.1
-
diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
index 4587219e..46a1e00c 100644
--- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
@@ -1,4 +1,4 @@
-From 41f9b2c1521950e1e3e1f01260f18e698d948814 Mon Sep 17 00:00:00 2001
+From 005fabe4148c78e8393c50ca6ebc9d0c2151c3cd Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Mon, 30 Jun 2014 20:08:17 +0200
 Subject: [PATCH 1/3] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H
@@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
-index acf15a8..08b2642 100644
+index 4c2547d..64c08ad 100644
 --- a/tools/qmake/mkspecs/features/functions.prf
 +++ b/tools/qmake/mkspecs/features/functions.prf
-@@ -84,8 +84,8 @@ defineReplace(findIncludedMocFiles) {
+@@ -87,8 +87,8 @@ defineReplace(findIncludedMocFiles) {
  defineReplace(mocOutput) {
    out = $$1
    # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
@@ -25,5 +25,5 @@ index acf15a8..08b2642 100644
  }
  
 -- 
-2.1.3
+2.3.1
 
diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
index 58218a56..173a58bd 100644
--- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
@@ -1,4 +1,4 @@
-From b36aeace50dc429cccbb9b84a6e538ebcd12ade9 Mon Sep 17 00:00:00 2001
+From 323f3d4fbd00b8655a1928c389d5f05ef4526044 Mon Sep 17 00:00:00 2001
 From: Simon Busch <morphis@gravedo.de>
 Date: Tue, 18 Nov 2014 10:38:18 +0100
 Subject: [PATCH 2/3] functions.prf: Make sure we only use the file name to
@@ -11,10 +11,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
-index 08b2642..0123336 100644
+index 64c08ad..b46478b 100644
 --- a/tools/qmake/mkspecs/features/functions.prf
 +++ b/tools/qmake/mkspecs/features/functions.prf
-@@ -82,7 +82,8 @@ defineReplace(findIncludedMocFiles) {
+@@ -85,7 +85,8 @@ defineReplace(findIncludedMocFiles) {
  }
  
  defineReplace(mocOutput) {
@@ -25,5 +25,5 @@ index 08b2642..0123336 100644
    out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
    out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)})
 -- 
-2.1.3
+2.3.1
 
diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
index b19556ff..bc8a0700 100644
--- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
@@ -1,4 +1,4 @@
-From 69e05cdc9000a1962101b2859d0ae3d77bb751d7 Mon Sep 17 00:00:00 2001
+From 762c943fbe1bee878275788f376b33abce46e25a Mon Sep 17 00:00:00 2001
 From: Frieder Schrempf <frieder.schrempf@online.de>
 Date: Mon, 1 Dec 2014 14:34:40 +0000
 Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform
@@ -12,18 +12,18 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
-index 0123336..5cea82a 100644
+index b46478b..6205bf4 100644
 --- a/tools/qmake/mkspecs/features/functions.prf
 +++ b/tools/qmake/mkspecs/features/functions.prf
-@@ -7,7 +7,7 @@ defineTest(isPlatformSupported) {
+@@ -10,7 +10,7 @@ defineTest(isPlatformSupported) {
  
-   linux-g++*:!isGCCVersionSupported():return(false)
+   linux-g++*:!isGCCVersionSupported(): return(false)
    !isPythonVersionSupported(): return(false)
 -  linux-g++*|win32-msvc2013|macx-clang: return(true)
 +  linux-g++*|linux-oe-g++*|win32-msvc2013|macx-clang: return(true)
    boot2qt: return(true)
  
-   warning("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation".)
+   skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.")
 -- 
-2.1.3
+2.3.1
 
diff --git a/recipes-qt/qt5/qtwebengine/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch b/recipes-qt/qt5/qtwebengine/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch
new file mode 100644
index 00000000..71ee4fe7
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch
@@ -0,0 +1,26 @@
+From 1306df17fccb672e95911398740d48408488035a Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Fri, 27 Feb 2015 19:51:55 +0100
+Subject: [PATCH 4/4] configure.prf: don't fail when libcap test fails
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ tools/qmake/mkspecs/features/configure.prf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
+index 6e74b55..b91fde8 100644
+--- a/tools/qmake/mkspecs/features/configure.prf
++++ b/tools/qmake/mkspecs/features/configure.prf
+@@ -20,7 +20,7 @@ defineTest(runConfigure) {
+         qtCompileTest($$test)
+     }
+     # libcap-dev package doesn't ship .pc files on Ubuntu.
+-    linux:!config_libcap:skipBuild("libcap appears to be missing")
++    #linux:!config_libcap:skipBuild("libcap appears to be missing")
+     contains(QT_CONFIG, xcb) {
+         for(package, $$list("libdrm xcomposite xi xrandr")) {
+             !packagesExist($$package):skipBuild("Unmet dependency: $$package")
+-- 
+2.3.1
+
diff --git a/recipes-qt/qt5/qtwebengine/0004-dont-fail-libcap-config-test.patch b/recipes-qt/qt5/qtwebengine/0004-dont-fail-libcap-config-test.patch
deleted file mode 100644
index 897e7e54..00000000
--- a/recipes-qt/qt5/qtwebengine/0004-dont-fail-libcap-config-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u -r1.1 tools/qmake/mkspecs/features/configure.prf
---- a/tools/qmake/mkspecs/features/configure.prf  2015/02/04 10:24:55     1.1
-+++ b/tools/qmake/mkspecs/features/configure.prf  2015/02/04 10:26:52
-@@ -20,7 +20,7 @@
-         qtCompileTest($$test)
-     }
-     # libcap-dev package doesn't ship .pc files on Ubuntu.
--    linux:!config_libcap:skipBuild("libcap appears to be missing")
-+    #linux:!config_libcap:skipBuild("libcap appears to be missing")
-     contains(QT_CONFIG, xcb) {
-         for(package, $$list("libdrm xcomposite xi xrandr")) {
-             !packagesExist($$package):skipBuild("Unmet dependency: $$package")
-
diff --git a/recipes-qt/qt5/qtwebengine_5.4.1.bb b/recipes-qt/qt5/qtwebengine_5.4.1.bb
index 11096cae..4b21f32c 100644
--- a/recipes-qt/qt5/qtwebengine_5.4.1.bb
+++ b/recipes-qt/qt5/qtwebengine_5.4.1.bb
@@ -8,7 +8,6 @@ SRC_URI += " \
     file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
     file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
     file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
-    file://0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch \
-    file://0001-eLinux-build-ffmpegsumo-as-well.patch \
-    file://0004-dont-fail-libcap-config-test.patch \
+    file://0004-configure.prf-don-t-fail-when-libcap-test-fails.patch \
+    file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \
 "
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 2f10e131..8d1f1717 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -9,7 +9,7 @@ SRC_URI += " \
     file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
     file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
     file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
-    file://0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch \
+    file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \
 "
 SRCREV_qtwebengine = "8eefc3a0658d1b10de12f43534cfd63af825ebc8"
 SRCREV_chromium = "be4ec3fa64a4c6c2b641830a9811ab7847c7dd39"