diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-01 17:36:38 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-06 19:45:45 +0200 |
commit | 26b7fee65a3c23a9c2447d549668f373bfa76bae (patch) | |
tree | fca7565930f8d7705cb5d96c5bc5ce6d7e561a0c /recipes-qt/qt5/qtwebengine/0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch | |
parent | 0663bcdddf0311329e607416cd51ce55b9557240 (diff) | |
download | meta-qt5-26b7fee65a3c23a9c2447d549668f373bfa76bae.tar.gz |
qtwebengine: Add 2 more patches to fix do_configure and fix QA warning
* otherwise moc generated files have the same basename and do_configure fails with:
core_generated.gyp:QtWebEngineCore#target has several files with the same basename:
| javascript_dialog_controller: javascript_dialog_controller.cpp
| /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
...
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch | 139 |
1 files changed, 139 insertions, 0 deletions
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 new file mode 100644 index 00000000..abd351a6 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch | |||
@@ -0,0 +1,139 @@ | |||
1 | From 0c59430e6b919d4ffec80bfa6b50b9ce9953ac21 Mon Sep 17 00:00:00 2001 | ||
2 | From: Simon Busch <morphis@gravedo.de> | ||
3 | Date: Fri, 20 Jun 2014 09:05:12 +0200 | ||
4 | Subject: [PATCH 1/2] <chromium> Drop build time only dependency on x11 | ||
5 | libraries | ||
6 | |||
7 | Signed-off-by: Simon Busch <morphis@gravedo.de> | ||
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
9 | --- | ||
10 | chromium/build/linux/system.gyp | 114 ---------------------------------------- | ||
11 | 1 file changed, 114 deletions(-) | ||
12 | |||
13 | diff --git a/src/3rdparty/chromium/build/linux/system.gyp b/src/3rdparty/chromium/build/linux/system.gyp | ||
14 | index 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 | -- | ||
138 | 2.0.0 | ||
139 | |||