summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-02-27 11:50:43 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2015-02-27 19:56:24 +0100
commitf8c39026aa1510eaf62fcedc42bc687d6d8ad6ac (patch)
treee27355a2223ff85bf026d4063e9686b91f77c51b /recipes-qt/qt5/qtwebengine/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch
parent4d4a34c5d29ef7b730eb9da87b39f91352ef66fa (diff)
downloadmeta-qt5-f8c39026aa1510eaf62fcedc42bc687d6d8ad6ac.tar.gz
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>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch26
1 files changed, 26 insertions, 0 deletions
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 @@
1From 1306df17fccb672e95911398740d48408488035a Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 27 Feb 2015 19:51:55 +0100
4Subject: [PATCH 4/4] configure.prf: don't fail when libcap test fails
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 tools/qmake/mkspecs/features/configure.prf | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
12index 6e74b55..b91fde8 100644
13--- a/tools/qmake/mkspecs/features/configure.prf
14+++ b/tools/qmake/mkspecs/features/configure.prf
15@@ -20,7 +20,7 @@ defineTest(runConfigure) {
16 qtCompileTest($$test)
17 }
18 # libcap-dev package doesn't ship .pc files on Ubuntu.
19- linux:!config_libcap:skipBuild("libcap appears to be missing")
20+ #linux:!config_libcap:skipBuild("libcap appears to be missing")
21 contains(QT_CONFIG, xcb) {
22 for(package, $$list("libdrm xcomposite xi xrandr")) {
23 !packagesExist($$package):skipBuild("Unmet dependency: $$package")
24--
252.3.1
26