summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2014-12-11 15:52:18 +1100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-12-11 13:24:22 +0100
commit6566f728ab3d14a4908516fb13ad555dbfe04471 (patch)
treed73319dd12e71d434c01b25d04f9b5c84a5c83cc /recipes-qt/qt5/qtwebengine
parentc9a1041cb956d94c04cbf635b00ca19725ffc129 (diff)
downloadmeta-qt5-6566f728ab3d14a4908516fb13ad555dbfe04471.tar.gz
recipes: upgrade from 5.3.2 to 5.4.0
MJ: nativesdk-qtbase, nativesdk-qttools, qtbase-native: Drop unnecessary LICENSE/LIC_FILES_CHKSUM MJ: qtwebkit: move leveldb dependency to .inc Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Jonathan Liu <net147@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch36
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch139
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch (renamed from recipes-qt/qt5/qtwebengine/0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch)12
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch40
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch29
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch27
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-functions.prf-Try-to-add-_moc-suffix.patch34
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch29
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-Set-arm_tune-to-empty-string-if-mtune-flag-is-not-se.patch34
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-Fix-ARM-NEON-detection-for-mfpu-neon-vfpv4.patch30
-rw-r--r--recipes-qt/qt5/qtwebengine/0006-Include-QMAKE_CC-when-extracting-C-compiler-flags.patch34
11 files changed, 64 insertions, 380 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch b/recipes-qt/qt5/qtwebengine/0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch
deleted file mode 100644
index 915d3e82..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From a6802bc4528205a9d3839a1f22d4fca32154f5f0 Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de>
3Date: Fri, 20 Jun 2014 09:09:12 +0200
4Subject: [PATCH 1/6] Use ninja supplied by environment variable NINJA_PATH
5
6Signed-off-by: Simon Busch <morphis@gravedo.de>
7---
8 tools/qmake/mkspecs/features/functions.prf | 14 ++------------
9 1 file changed, 2 insertions(+), 12 deletions(-)
10
11diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
12index 4dcd8ed..8725fd2 100644
13--- a/tools/qmake/mkspecs/features/functions.prf
14+++ b/tools/qmake/mkspecs/features/functions.prf
15@@ -84,16 +84,6 @@ defineReplace(which) {
16 }
17
18 defineReplace(findOrBuildNinja) {
19- git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir")
20- # Fall back to the snapshot path if git does not know about chromium sources (i.e. init-repository.py has not been used)
21- isEmpty(git_chromium_src_dir): git_chromium_src_dir = "src/3rdparty/chromium"
22-
23- out = $$absolute_path("$$git_chromium_src_dir/../ninja/ninja", "$$QTWEBENGINE_ROOT")
24- win32: out = $$system_path($${out}.exe)
25-
26- # If we did not find ninja, then we bootstrap it.
27- !exists($$out) {
28- system("python $$dirname(out)/bootstrap.py")
29- }
30- return($$out)
31+ message(Using ninja from path $$NINJA_PATH)
32+ return($$NINJA_PATH)
33 }
34--
352.1.1
36
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch
deleted file mode 100644
index abd351a6..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch
+++ /dev/null
@@ -1,139 +0,0 @@
1From 0c59430e6b919d4ffec80bfa6b50b9ce9953ac21 Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de>
3Date: Fri, 20 Jun 2014 09:05:12 +0200
4Subject: [PATCH 1/2] <chromium> Drop build time only dependency on x11
5 libraries
6
7Signed-off-by: Simon Busch <morphis@gravedo.de>
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 chromium/build/linux/system.gyp | 114 ----------------------------------------
11 1 file changed, 114 deletions(-)
12
13diff --git a/src/3rdparty/chromium/build/linux/system.gyp b/src/3rdparty/chromium/build/linux/system.gyp
14index 9911317..85016b8 100644
15--- a/src/3rdparty/chromium/build/linux/system.gyp
16+++ b/src/3rdparty/chromium/build/linux/system.gyp
17@@ -786,119 +786,5 @@
18 }],
19 ],
20 },
21- {
22- 'target_name': 'x11',
23- 'type': 'none',
24- 'toolsets': ['host', 'target'],
25- 'conditions': [
26- ['_toolset=="target"', {
27- 'direct_dependent_settings': {
28- 'cflags': [
29- '<!@(<(pkg-config) --cflags x11)',
30- ],
31- },
32- 'link_settings': {
33- 'ldflags': [
34- '<!@(<(pkg-config) --libs-only-L --libs-only-other x11 xi)',
35- ],
36- 'libraries': [
37- '<!@(<(pkg-config) --libs-only-l x11 xi)',
38- ],
39- },
40- }, {
41- 'direct_dependent_settings': {
42- 'cflags': [
43- '<!@(pkg-config --cflags x11)',
44- ],
45- },
46- 'link_settings': {
47- 'ldflags': [
48- '<!@(pkg-config --libs-only-L --libs-only-other x11 xi)',
49- ],
50- 'libraries': [
51- '<!@(pkg-config --libs-only-l x11 xi)',
52- ],
53- },
54- }],
55- ],
56- },
57- {
58- 'target_name': 'xext',
59- 'type': 'none',
60- 'conditions': [
61- ['_toolset=="target"', {
62- 'direct_dependent_settings': {
63- 'cflags': [
64- '<!@(<(pkg-config) --cflags xext)',
65- ],
66- },
67- 'link_settings': {
68- 'ldflags': [
69- '<!@(<(pkg-config) --libs-only-L --libs-only-other xext)',
70- ],
71- 'libraries': [
72- '<!@(<(pkg-config) --libs-only-l xext)',
73- ],
74- },
75- }],
76- ],
77- },
78- {
79- 'target_name': 'xfixes',
80- 'type': 'none',
81- 'conditions': [
82- ['_toolset=="target"', {
83- 'direct_dependent_settings': {
84- 'cflags': [
85- '<!@(<(pkg-config) --cflags xfixes)',
86- ],
87- },
88- 'link_settings': {
89- 'ldflags': [
90- '<!@(<(pkg-config) --libs-only-L --libs-only-other xfixes)',
91- ],
92- 'libraries': [
93- '<!@(<(pkg-config) --libs-only-l xfixes)',
94- ],
95- },
96- }],
97- ],
98- },
99- {
100- 'target_name': 'xrandr',
101- 'type': 'none',
102- 'toolsets': ['host', 'target'],
103- 'conditions': [
104- ['_toolset=="target"', {
105- 'direct_dependent_settings': {
106- 'cflags': [
107- '<!@(<(pkg-config) --cflags xrandr)',
108- ],
109- },
110- 'link_settings': {
111- 'ldflags': [
112- '<!@(<(pkg-config) --libs-only-L --libs-only-other xrandr)',
113- ],
114- 'libraries': [
115- '<!@(<(pkg-config) --libs-only-l xrandr)',
116- ],
117- },
118- }, {
119- 'direct_dependent_settings': {
120- 'cflags': [
121- '<!@(pkg-config --cflags xrandr)',
122- ],
123- },
124- 'link_settings': {
125- 'ldflags': [
126- '<!@(pkg-config --libs-only-L --libs-only-other xrandr)',
127- ],
128- 'libraries': [
129- '<!@(pkg-config --libs-only-l xrandr)',
130- ],
131- },
132- }],
133- ],
134- },
135 ],
136 }
137--
1382.0.0
139
diff --git a/recipes-qt/qt5/qtwebengine/0002-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 d0437147..4587219e 100644
--- a/recipes-qt/qt5/qtwebengine/0002-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,8 +1,8 @@
1From 7266e333c6568fec1e2ebbf0c2d68c4025397b2d Mon Sep 17 00:00:00 2001 1From 41f9b2c1521950e1e3e1f01260f18e698d948814 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 2/6] 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
5 anywhere in patch, but at the end 5 anywhere in path, but at the end
6 6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8--- 8---
@@ -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 8725fd2..15c2941 100644 13index acf15a8..08b2642 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@@ -40,8 +40,8 @@ defineReplace(findIncludedMocFiles) { 16@@ -84,8 +84,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 8725fd2..15c2941 100644
25 } 25 }
26 26
27-- 27--
282.1.1 282.1.3
29 29
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch
deleted file mode 100644
index 0cbe7aa4..00000000
--- a/recipes-qt/qt5/qtwebengine/0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From faaba972642f1966b4e38394b022d79de114c71e Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de>
3Date: Fri, 20 Jun 2014 19:04:14 +0200
4Subject: [PATCH 2/2] <chromium> Strip unwanted "@echo compiling &&" prefix
5 from ${CC}
6
7Causes problems when called from a perl script:
8
9@echo compiling && arm-webos-linux-gnueabi-gcc -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon --sysroot=/home/morphis/work/wop/webos-ports/tmp-eglibc/sysroots/tenderloinCan't exec "@echo": No such file or directory at /home/morphis/work/wop/webos-ports/tmp-eglibc/sysroots/x86_64-linux/usr/lib/perl-native/perl/5.14.3/IPC/Open3.pm line 288.
10open2: exec of @echo compiling && arm-webos-linux-gnueabi-gcc -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon --sysroot=/home/morphis/work/wop/webos-ports/tmp-eglibc/sysroots/tenderloin -E -P -x c++ -DENABLE_CUSTOM_SCHEME_HANDLER=0 -DENABLE_SVG_FONTS=1 -DENABLE_GDI_FONTS_ON_WINDOWS=0 -DENABLE_HARFBUZZ_ON_WINDOWS=1 -DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1 -DENABLE_INPUT_SPEECH=1 -DENABLE_INPUT_MULTIPLE_FIELDS_UI=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_MEDIA_CAPTURE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=1 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_WEB_AUDIO=1 -DWTF_USE_WEBAUDIO_FFMPEG=1 -DENABLE_OPENTYPE_VERTICAL=1 -DWTF_USE_DEFAULT_RENDER_THEME=1 css/html.css failed at ../build/scripts/preprocessor.pm line 81
11Traceback (most recent call last):
12 File "../build/scripts/action_useragentstylesheets.py", line 124, in <module>
13 sys.exit(main(sys.argv))
14 File "../build/scripts/action_useragentstylesheets.py", line 118, in main
15 assert returnCode == 0
16AssertionError
17
18Signed-off-by: Simon Busch <morphis@gravedo.de>
19Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
20---
21 .../WebKit/Source/build/scripts/action_useragentstylesheets.py | 3 +++
22 1 file changed, 3 insertions(+)
23
24diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/action_useragentstylesheets.py b/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/action_useragentstylesheets.py
25index c0712b3..8460637 100644
26--- a/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/action_useragentstylesheets.py
27+++ b/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/action_useragentstylesheets.py
28@@ -112,6 +112,9 @@ def main(args):
29 command.extend([outputH, outputCpp])
30 command.extend(styleSheets)
31
32+ if os.environ["CC"].startswith("@echo"):
33+ os.environ["CC"] = os.environ["CC"].replace("@echo compiling &&", "")
34+
35 # Do it. check_call is new in 2.5, so simulate its behavior with call and
36 # assert.
37 returnCode = subprocess.call(command)
38--
392.0.0
40
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
new file mode 100644
index 00000000..58218a56
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
@@ -0,0 +1,29 @@
1From b36aeace50dc429cccbb9b84a6e538ebcd12ade9 Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de>
3Date: Tue, 18 Nov 2014 10:38:18 +0100
4Subject: [PATCH 2/3] functions.prf: Make sure we only use the file name to
5 generate it's moc'ed abbreviation
6
7Signed-off-by: Simon Busch <morphis@gravedo.de>
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 tools/qmake/mkspecs/features/functions.prf | 3 ++-
11 1 file changed, 2 insertions(+), 1 deletion(-)
12
13diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
14index 08b2642..0123336 100644
15--- a/tools/qmake/mkspecs/features/functions.prf
16+++ b/tools/qmake/mkspecs/features/functions.prf
17@@ -82,7 +82,8 @@ defineReplace(findIncludedMocFiles) {
18 }
19
20 defineReplace(mocOutput) {
21- out = $$1
22+ in = $$1
23+ out = $$basename(in)
24 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
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)})
27--
282.1.3
29
diff --git a/recipes-qt/qt5/qtwebengine/0003-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch b/recipes-qt/qt5/qtwebengine/0003-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch
deleted file mode 100644
index 1cf12424..00000000
--- a/recipes-qt/qt5/qtwebengine/0003-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 9ad77853050ccd2102fe4c9ad0671b82554ce4c1 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] base.gypi: include atomicops_internals_x86_gcc.cc when
5 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.1.1
27
diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-Try-to-add-_moc-suffix.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-Try-to-add-_moc-suffix.patch
deleted file mode 100644
index 2e2c177e..00000000
--- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-Try-to-add-_moc-suffix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 8e540a678a796d78ff9a98986d747afbca7f63be Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 1 Jul 2014 15:58:16 +0200
4Subject: [PATCH 3/6] functions.prf: Try to add _moc suffix
5
6* otherwise moc generated files have the same basename and do_configure fails with:
7 core_generated.gyp:QtWebEngineCore#target has several files with the same basename:
8 | javascript_dialog_controller: javascript_dialog_controller.cpp
9 | /OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOINC+21f6ce84ec-r0/git/src/core/.moc/moc_/OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOI.moc+21f6ce84ec-r0/git/src/core/javascript_dialog_controller.cpp
10 ...
11
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 tools/qmake/mkspecs/features/functions.prf | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
18index 15c2941..78b1190 100644
19--- a/tools/qmake/mkspecs/features/functions.prf
20+++ b/tools/qmake/mkspecs/features/functions.prf
21@@ -40,8 +40,8 @@ defineReplace(findIncludedMocFiles) {
22 defineReplace(mocOutput) {
23 out = $$1
24 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
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)})
27+ out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1_moc$${QMAKE_EXT_CPP_MOC})
28+ out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1_moc$${first(QMAKE_EXT_CPP)})
29 return($$out)
30 }
31
32--
332.1.1
34
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
new file mode 100644
index 00000000..b19556ff
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
@@ -0,0 +1,29 @@
1From 69e05cdc9000a1962101b2859d0ae3d77bb751d7 Mon Sep 17 00:00:00 2001
2From: Frieder Schrempf <frieder.schrempf@online.de>
3Date: Mon, 1 Dec 2014 14:34:40 +0000
4Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform
5
6Upstream-Status: Inappropriate [OE specific]
7
8Signed-off-by: Frieder Schrempf <frieder.schrempf@online.de>
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 tools/qmake/mkspecs/features/functions.prf | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
15index 0123336..5cea82a 100644
16--- a/tools/qmake/mkspecs/features/functions.prf
17+++ b/tools/qmake/mkspecs/features/functions.prf
18@@ -7,7 +7,7 @@ defineTest(isPlatformSupported) {
19
20 linux-g++*:!isGCCVersionSupported():return(false)
21 !isPythonVersionSupported(): return(false)
22- linux-g++*|win32-msvc2013|macx-clang: return(true)
23+ linux-g++*|linux-oe-g++*|win32-msvc2013|macx-clang: return(true)
24 boot2qt: return(true)
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".)
27--
282.1.3
29
diff --git a/recipes-qt/qt5/qtwebengine/0004-Set-arm_tune-to-empty-string-if-mtune-flag-is-not-se.patch b/recipes-qt/qt5/qtwebengine/0004-Set-arm_tune-to-empty-string-if-mtune-flag-is-not-se.patch
deleted file mode 100644
index a3842ecd..00000000
--- a/recipes-qt/qt5/qtwebengine/0004-Set-arm_tune-to-empty-string-if-mtune-flag-is-not-se.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From c99aed6ef28c4ac9c00024a40222331c0e682d28 Mon Sep 17 00:00:00 2001
2From: Andras Becsi <andras.becsi@digia.com>
3Date: Thu, 18 Sep 2014 18:22:37 +0200
4Subject: [PATCH 4/6] Set arm_tune to empty string if mtune flag is not set by
5 toolchain
6
7Since the default arm_tune option applied by chromium is not
8recognized by our gcc toolchain set arm_tune to empty string
9to prevent chromium from setting a default. Our toolchains
10set the arm version which already implies the corresponding
11mtune option anyway.
12
13Change-Id: I0291bd4f0e5706597d37f914e4eeefbd75397bbf
14Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
15---
16 src/core/gyp_run.pro | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
20index ed592e1..4845af2 100644
21--- a/src/core/gyp_run.pro
22+++ b/src/core/gyp_run.pro
23@@ -47,7 +47,7 @@ cross_compile {
24 !isEmpty(MARCH): GYP_ARGS += "-D arm_arch=\"$$MARCH\""
25
26 MTUNE = $$extractCFlag("-mtune=.*")
27- !isEmpty(MTUNE): GYP_ARGS += "-D arm_tune=\"$$MTUNE\""
28+ GYP_ARGS += "-D arm_tune=\"$$MTUNE\""
29
30 MFLOAT = $$extractCFlag("-mfloat-abi=.*")
31 !isEmpty(MFLOAT): GYP_ARGS += "-D arm_float_abi=\"$$MFLOAT\""
32--
332.1.1
34
diff --git a/recipes-qt/qt5/qtwebengine/0005-Fix-ARM-NEON-detection-for-mfpu-neon-vfpv4.patch b/recipes-qt/qt5/qtwebengine/0005-Fix-ARM-NEON-detection-for-mfpu-neon-vfpv4.patch
deleted file mode 100644
index 943f6715..00000000
--- a/recipes-qt/qt5/qtwebengine/0005-Fix-ARM-NEON-detection-for-mfpu-neon-vfpv4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 1331c66c937f1c3e10e193932db2037dc38434e9 Mon Sep 17 00:00:00 2001
2From: Jonathan Liu <net147@gmail.com>
3Date: Wed, 15 Oct 2014 17:02:16 +1100
4Subject: [PATCH 5/6] Fix ARM NEON detection for -mfpu=neon-vfpv4
5
6Upstream-Status: Backport
7
8Change-Id: I972d3560d6aa2640a2702f219cf802d2476b1c6e
9Reviewed-by: Andras Becsi <andras.becsi@digia.com>
10Signed-off-by: Jonathan Liu <net147@gmail.com>
11---
12 src/core/gyp_run.pro | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
16index 4845af2..66e97f4 100644
17--- a/src/core/gyp_run.pro
18+++ b/src/core/gyp_run.pro
19@@ -64,7 +64,7 @@ cross_compile {
20 # If the toolchain does not explicitly specify to use NEON instructions
21 # we use arm_neon_optional for ARMv7 and newer and let chromium decide
22 # about the mfpu option.
23- contains(MFPU, "neon"): GYP_ARGS += "-D arm_fpu=\"$$MFPU\" -D arm_neon=1"
24+ contains(MFPU, "neon")|contains(MFPU, "neon-vfpv4"): GYP_ARGS += "-D arm_fpu=\"$$MFPU\" -D arm_neon=1"
25 else:!lessThan(MARMV, 7): GYP_ARGS += "-D arm_neon=0 -D arm_neon_optional=1"
26 else: GYP_ARGS += "-D arm_fpu=\"$$MFPU\" -D arm_neon=0 -D arm_neon_optional=0"
27 }
28--
292.1.1
30
diff --git a/recipes-qt/qt5/qtwebengine/0006-Include-QMAKE_CC-when-extracting-C-compiler-flags.patch b/recipes-qt/qt5/qtwebengine/0006-Include-QMAKE_CC-when-extracting-C-compiler-flags.patch
deleted file mode 100644
index 920dd91b..00000000
--- a/recipes-qt/qt5/qtwebengine/0006-Include-QMAKE_CC-when-extracting-C-compiler-flags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From d242c15eb961fbdee69c0a0989cd100d174a25db Mon Sep 17 00:00:00 2001
2From: Jonathan Liu <net147@gmail.com>
3Date: Wed, 15 Oct 2014 17:01:06 +1100
4Subject: [PATCH 6/6] Include QMAKE_CC when extracting C compiler flags
5
6This fixes cross-compile settings detection for cross-compilation
7environments where the C compiler cross-compilation flags are set in
8CC/QMAKE_CC instead of CFLAGS/QMAKE_CFLAGS (e.g. OpenEmbedded).
9
10Upstream-Status: Backport
11
12Change-Id: I0a7b0f6c47a00775ec18073a16359c8351363285
13Reviewed-by: Andras Becsi <andras.becsi@digia.com>
14Signed-off-by: Jonathan Liu <net147@gmail.com>
15---
16 tools/qmake/mkspecs/features/functions.prf | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
20index 78b1190..37dd615 100644
21--- a/tools/qmake/mkspecs/features/functions.prf
22+++ b/tools/qmake/mkspecs/features/functions.prf
23@@ -14,7 +14,7 @@ defineReplace(getConfigDir) {
24 }
25
26 defineReplace(extractCFlag) {
27- CFLAGS = $$QMAKE_CFLAGS
28+ CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS
29 !isEmpty(ANDROID_TARGET_CFLAGS): CFLAGS = $$ANDROID_TARGET_CFLAGS
30 OPTION = $$find(CFLAGS, $$1)
31 OPTION = $$split(OPTION, =)
32--
332.1.1
34
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-14 00:27:09 +0000