summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine-git
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtwebengine-git')
-rw-r--r--recipes-qt/qt5/qtwebengine-git/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch27
-rw-r--r--recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch8
-rw-r--r--recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch8
-rw-r--r--recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch12
-rw-r--r--recipes-qt/qt5/qtwebengine-git/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch26
5 files changed, 67 insertions, 14 deletions
diff --git a/recipes-qt/qt5/qtwebengine-git/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch b/recipes-qt/qt5/qtwebengine-git/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
new file mode 100644
index 00000000..b4a8852e
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine-git/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
@@ -0,0 +1,27 @@
1From 21d008c31a262ddcaeb3a8457de49061361ed882 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 3 Oct 2014 03:52:11 +0200
4Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc
5 when building for x64 arch
6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8---
9 chromium/base/base.gypi | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi
13index a5a990a..af30cfa 100644
14--- a/src/3rdparty/chromium/base/base.gypi
15+++ b/src/3rdparty/chromium/base/base.gypi
16@@ -745,7 +745,7 @@
17 ['include', '^nix/'],
18 ],
19 }],
20- ['use_qt==1 and target_arch=="ia32"', {
21+ ['use_qt==1 and target_arch=="ia32" or target_arch=="x64"', {
22 'sources/': [
23 ['include', 'atomicops_internals_x86_gcc.cc'],
24 ],
25--
262.3.1
27
diff --git a/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
index 4587219e..c07ada66 100644
--- a/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
+++ b/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
@@ -1,4 +1,4 @@
1From 41f9b2c1521950e1e3e1f01260f18e698d948814 Mon Sep 17 00:00:00 2001 1From 6e9a0fa4c1e3681deed659c2749223025637b38b Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 30 Jun 2014 20:08:17 +0200 3Date: Mon, 30 Jun 2014 20:08:17 +0200
4Subject: [PATCH 1/3] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H 4Subject: [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>
10 1 file changed, 2 insertions(+), 2 deletions(-) 10 1 file changed, 2 insertions(+), 2 deletions(-)
11 11
12diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf 12diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
13index acf15a8..08b2642 100644 13index 4c2547d..64c08ad 100644
14--- a/tools/qmake/mkspecs/features/functions.prf 14--- a/tools/qmake/mkspecs/features/functions.prf
15+++ b/tools/qmake/mkspecs/features/functions.prf 15+++ b/tools/qmake/mkspecs/features/functions.prf
16@@ -84,8 +84,8 @@ defineReplace(findIncludedMocFiles) { 16@@ -87,8 +87,8 @@ defineReplace(findIncludedMocFiles) {
17 defineReplace(mocOutput) { 17 defineReplace(mocOutput) {
18 out = $$1 18 out = $$1
19 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one 19 # 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
25 } 25 }
26 26
27-- 27--
282.1.3 282.3.1
29 29
diff --git a/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
index 58218a56..91f9724c 100644
--- a/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
+++ b/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
@@ -1,4 +1,4 @@
1From b36aeace50dc429cccbb9b84a6e538ebcd12ade9 Mon Sep 17 00:00:00 2001 1From 418d78e063a47c4a3085ad7761fa1b842775637b Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de> 2From: Simon Busch <morphis@gravedo.de>
3Date: Tue, 18 Nov 2014 10:38:18 +0100 3Date: Tue, 18 Nov 2014 10:38:18 +0100
4Subject: [PATCH 2/3] functions.prf: Make sure we only use the file name to 4Subject: [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>
11 1 file changed, 2 insertions(+), 1 deletion(-) 11 1 file changed, 2 insertions(+), 1 deletion(-)
12 12
13diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf 13diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
14index 08b2642..0123336 100644 14index 64c08ad..b46478b 100644
15--- a/tools/qmake/mkspecs/features/functions.prf 15--- a/tools/qmake/mkspecs/features/functions.prf
16+++ b/tools/qmake/mkspecs/features/functions.prf 16+++ b/tools/qmake/mkspecs/features/functions.prf
17@@ -82,7 +82,8 @@ defineReplace(findIncludedMocFiles) { 17@@ -85,7 +85,8 @@ defineReplace(findIncludedMocFiles) {
18 } 18 }
19 19
20 defineReplace(mocOutput) { 20 defineReplace(mocOutput) {
@@ -25,5 +25,5 @@ index 08b2642..0123336 100644
25 out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) 25 out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
26 out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) 26 out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)})
27-- 27--
282.1.3 282.3.1
29 29
diff --git a/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
index b19556ff..6e9def9f 100644
--- a/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
@@ -1,4 +1,4 @@
1From 69e05cdc9000a1962101b2859d0ae3d77bb751d7 Mon Sep 17 00:00:00 2001 1From 6c8d9e121920519a831ca09f747ed77dfc2bd135 Mon Sep 17 00:00:00 2001
2From: Frieder Schrempf <frieder.schrempf@online.de> 2From: Frieder Schrempf <frieder.schrempf@online.de>
3Date: Mon, 1 Dec 2014 14:34:40 +0000 3Date: Mon, 1 Dec 2014 14:34:40 +0000
4Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform 4Subject: [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>
12 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 1 insertion(+), 1 deletion(-)
13 13
14diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf 14diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
15index 0123336..5cea82a 100644 15index b46478b..6205bf4 100644
16--- a/tools/qmake/mkspecs/features/functions.prf 16--- a/tools/qmake/mkspecs/features/functions.prf
17+++ b/tools/qmake/mkspecs/features/functions.prf 17+++ b/tools/qmake/mkspecs/features/functions.prf
18@@ -7,7 +7,7 @@ defineTest(isPlatformSupported) { 18@@ -10,7 +10,7 @@ defineTest(isPlatformSupported) {
19 19
20 linux-g++*:!isGCCVersionSupported():return(false) 20 linux-g++*:!isGCCVersionSupported(): return(false)
21 !isPythonVersionSupported(): return(false) 21 !isPythonVersionSupported(): return(false)
22- linux-g++*|win32-msvc2013|macx-clang: return(true) 22- linux-g++*|win32-msvc2013|macx-clang: return(true)
23+ linux-g++*|linux-oe-g++*|win32-msvc2013|macx-clang: return(true) 23+ linux-g++*|linux-oe-g++*|win32-msvc2013|macx-clang: return(true)
24 boot2qt: return(true) 24 boot2qt: return(true)
25 25
26 warning("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation".) 26 skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.")
27-- 27--
282.1.3 282.3.1
29 29
diff --git a/recipes-qt/qt5/qtwebengine-git/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch b/recipes-qt/qt5/qtwebengine-git/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch
new file mode 100644
index 00000000..6a2162f4
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine-git/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch
@@ -0,0 +1,26 @@
1From 7d20d5e4584abce2353557c90e79ee0b3cdc330e 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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-15 01:15:41 +0000