diff options
| author | Simon Busch <morphis@gravedo.de> | 2014-06-25 09:55:17 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-06 19:45:45 +0200 |
| commit | 0663bcdddf0311329e607416cd51ce55b9557240 (patch) | |
| tree | b2d30fcd83f064111addbe4e68020982f87a5c82 /recipes-qt/qt5/qtwebengine/0001-Drop-build-time-only-dependency-on-x11-libraries.patch | |
| parent | a608ef4d63ddc58528eb7defa6a7f89c71ea7033 (diff) | |
| download | meta-qt5-0663bcdddf0311329e607416cd51ce55b9557240.tar.gz | |
qtwebengine: add initial recipe for git version only
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0001-Drop-build-time-only-dependency-on-x11-libraries.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/0001-Drop-build-time-only-dependency-on-x11-libraries.patch | 137 |
1 files changed, 137 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-Drop-build-time-only-dependency-on-x11-libraries.patch b/recipes-qt/qt5/qtwebengine/0001-Drop-build-time-only-dependency-on-x11-libraries.patch new file mode 100644 index 00000000..7ee38d0c --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0001-Drop-build-time-only-dependency-on-x11-libraries.patch | |||
| @@ -0,0 +1,137 @@ | |||
| 1 | From f5c8e973f0a246691b71c256361bfa82619ee2ef 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] Drop build time only dependency on x11 libraries | ||
| 5 | |||
| 6 | Signed-off-by: Simon Busch <morphis@gravedo.de> | ||
| 7 | --- | ||
| 8 | src/3rdparty/chromium/build/linux/system.gyp | 114 --------------------------- | ||
| 9 | 1 file changed, 114 deletions(-) | ||
| 10 | |||
| 11 | diff --git a/src/3rdparty/chromium/build/linux/system.gyp b/src/3rdparty/chromium/build/linux/system.gyp | ||
| 12 | index 9911317..85016b8 100644 | ||
| 13 | --- a/src/3rdparty/chromium/build/linux/system.gyp | ||
| 14 | +++ b/src/3rdparty/chromium/build/linux/system.gyp | ||
| 15 | @@ -786,119 +786,5 @@ | ||
| 16 | }], | ||
| 17 | ], | ||
| 18 | }, | ||
| 19 | - { | ||
| 20 | - 'target_name': 'x11', | ||
| 21 | - 'type': 'none', | ||
| 22 | - 'toolsets': ['host', 'target'], | ||
| 23 | - 'conditions': [ | ||
| 24 | - ['_toolset=="target"', { | ||
| 25 | - 'direct_dependent_settings': { | ||
| 26 | - 'cflags': [ | ||
| 27 | - '<!@(<(pkg-config) --cflags x11)', | ||
| 28 | - ], | ||
| 29 | - }, | ||
| 30 | - 'link_settings': { | ||
| 31 | - 'ldflags': [ | ||
| 32 | - '<!@(<(pkg-config) --libs-only-L --libs-only-other x11 xi)', | ||
| 33 | - ], | ||
| 34 | - 'libraries': [ | ||
| 35 | - '<!@(<(pkg-config) --libs-only-l x11 xi)', | ||
| 36 | - ], | ||
| 37 | - }, | ||
| 38 | - }, { | ||
| 39 | - 'direct_dependent_settings': { | ||
| 40 | - 'cflags': [ | ||
| 41 | - '<!@(pkg-config --cflags x11)', | ||
| 42 | - ], | ||
| 43 | - }, | ||
| 44 | - 'link_settings': { | ||
| 45 | - 'ldflags': [ | ||
| 46 | - '<!@(pkg-config --libs-only-L --libs-only-other x11 xi)', | ||
| 47 | - ], | ||
| 48 | - 'libraries': [ | ||
| 49 | - '<!@(pkg-config --libs-only-l x11 xi)', | ||
| 50 | - ], | ||
| 51 | - }, | ||
| 52 | - }], | ||
| 53 | - ], | ||
| 54 | - }, | ||
| 55 | - { | ||
| 56 | - 'target_name': 'xext', | ||
| 57 | - 'type': 'none', | ||
| 58 | - 'conditions': [ | ||
| 59 | - ['_toolset=="target"', { | ||
| 60 | - 'direct_dependent_settings': { | ||
| 61 | - 'cflags': [ | ||
| 62 | - '<!@(<(pkg-config) --cflags xext)', | ||
| 63 | - ], | ||
| 64 | - }, | ||
| 65 | - 'link_settings': { | ||
| 66 | - 'ldflags': [ | ||
| 67 | - '<!@(<(pkg-config) --libs-only-L --libs-only-other xext)', | ||
| 68 | - ], | ||
| 69 | - 'libraries': [ | ||
| 70 | - '<!@(<(pkg-config) --libs-only-l xext)', | ||
| 71 | - ], | ||
| 72 | - }, | ||
| 73 | - }], | ||
| 74 | - ], | ||
| 75 | - }, | ||
| 76 | - { | ||
| 77 | - 'target_name': 'xfixes', | ||
| 78 | - 'type': 'none', | ||
| 79 | - 'conditions': [ | ||
| 80 | - ['_toolset=="target"', { | ||
| 81 | - 'direct_dependent_settings': { | ||
| 82 | - 'cflags': [ | ||
| 83 | - '<!@(<(pkg-config) --cflags xfixes)', | ||
| 84 | - ], | ||
| 85 | - }, | ||
| 86 | - 'link_settings': { | ||
| 87 | - 'ldflags': [ | ||
| 88 | - '<!@(<(pkg-config) --libs-only-L --libs-only-other xfixes)', | ||
| 89 | - ], | ||
| 90 | - 'libraries': [ | ||
| 91 | - '<!@(<(pkg-config) --libs-only-l xfixes)', | ||
| 92 | - ], | ||
| 93 | - }, | ||
| 94 | - }], | ||
| 95 | - ], | ||
| 96 | - }, | ||
| 97 | - { | ||
| 98 | - 'target_name': 'xrandr', | ||
| 99 | - 'type': 'none', | ||
| 100 | - 'toolsets': ['host', 'target'], | ||
| 101 | - 'conditions': [ | ||
| 102 | - ['_toolset=="target"', { | ||
| 103 | - 'direct_dependent_settings': { | ||
| 104 | - 'cflags': [ | ||
| 105 | - '<!@(<(pkg-config) --cflags xrandr)', | ||
| 106 | - ], | ||
| 107 | - }, | ||
| 108 | - 'link_settings': { | ||
| 109 | - 'ldflags': [ | ||
| 110 | - '<!@(<(pkg-config) --libs-only-L --libs-only-other xrandr)', | ||
| 111 | - ], | ||
| 112 | - 'libraries': [ | ||
| 113 | - '<!@(<(pkg-config) --libs-only-l xrandr)', | ||
| 114 | - ], | ||
| 115 | - }, | ||
| 116 | - }, { | ||
| 117 | - 'direct_dependent_settings': { | ||
| 118 | - 'cflags': [ | ||
| 119 | - '<!@(pkg-config --cflags xrandr)', | ||
| 120 | - ], | ||
| 121 | - }, | ||
| 122 | - 'link_settings': { | ||
| 123 | - 'ldflags': [ | ||
| 124 | - '<!@(pkg-config --libs-only-L --libs-only-other xrandr)', | ||
| 125 | - ], | ||
| 126 | - 'libraries': [ | ||
| 127 | - '<!@(pkg-config --libs-only-l xrandr)', | ||
| 128 | - ], | ||
| 129 | - }, | ||
| 130 | - }], | ||
| 131 | - ], | ||
| 132 | - }, | ||
| 133 | ], | ||
| 134 | } | ||
| 135 | -- | ||
| 136 | 1.9.1 | ||
| 137 | |||