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 | |
parent | a608ef4d63ddc58528eb7defa6a7f89c71ea7033 (diff) |
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')
3 files changed, 211 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 @@ +From f5c8e973f0a246691b71c256361bfa82619ee2ef Mon Sep 17 00:00:00 2001 +From: Simon Busch <morphis@gravedo.de> +Date: Fri, 20 Jun 2014 09:05:12 +0200 +Subject: [PATCH 1/2] Drop build time only dependency on x11 libraries + +Signed-off-by: Simon Busch <morphis@gravedo.de> +--- + src/3rdparty/chromium/build/linux/system.gyp | 114 --------------------------- + 1 file changed, 114 deletions(-) + +diff --git a/src/3rdparty/chromium/build/linux/system.gyp b/src/3rdparty/chromium/build/linux/system.gyp +index 9911317..85016b8 100644 +--- a/src/3rdparty/chromium/build/linux/system.gyp ++++ b/src/3rdparty/chromium/build/linux/system.gyp +@@ -786,119 +786,5 @@ + }], + ], + }, +- { +- 'target_name': 'x11', +- 'type': 'none', +- 'toolsets': ['host', 'target'], +- 'conditions': [ +- ['_toolset=="target"', { +- 'direct_dependent_settings': { +- 'cflags': [ +- '<!@(<(pkg-config) --cflags x11)', +- ], +- }, +- 'link_settings': { +- 'ldflags': [ +- '<!@(<(pkg-config) --libs-only-L --libs-only-other x11 xi)', +- ], +- 'libraries': [ +- '<!@(<(pkg-config) --libs-only-l x11 xi)', +- ], +- }, +- }, { +- 'direct_dependent_settings': { +- 'cflags': [ +- '<!@(pkg-config --cflags x11)', +- ], +- }, +- 'link_settings': { +- 'ldflags': [ +- '<!@(pkg-config --libs-only-L --libs-only-other x11 xi)', +- ], +- 'libraries': [ +- '<!@(pkg-config --libs-only-l x11 xi)', +- ], +- }, +- }], +- ], +- }, +- { +- 'target_name': 'xext', +- 'type': 'none', +- 'conditions': [ +- ['_toolset=="target"', { +- 'direct_dependent_settings': { +- 'cflags': [ +- '<!@(<(pkg-config) --cflags xext)', +- ], +- }, +- 'link_settings': { +- 'ldflags': [ +- '<!@(<(pkg-config) --libs-only-L --libs-only-other xext)', +- ], +- 'libraries': [ +- '<!@(<(pkg-config) --libs-only-l xext)', +- ], +- }, +- }], +- ], +- }, +- { +- 'target_name': 'xfixes', +- 'type': 'none', +- 'conditions': [ +- ['_toolset=="target"', { +- 'direct_dependent_settings': { +- 'cflags': [ +- '<!@(<(pkg-config) --cflags xfixes)', +- ], +- }, +- 'link_settings': { +- 'ldflags': [ +- '<!@(<(pkg-config) --libs-only-L --libs-only-other xfixes)', +- ], +- 'libraries': [ +- '<!@(<(pkg-config) --libs-only-l xfixes)', +- ], +- }, +- }], +- ], +- }, +- { +- 'target_name': 'xrandr', +- 'type': 'none', +- 'toolsets': ['host', 'target'], +- 'conditions': [ +- ['_toolset=="target"', { +- 'direct_dependent_settings': { +- 'cflags': [ +- '<!@(<(pkg-config) --cflags xrandr)', +- ], +- }, +- 'link_settings': { +- 'ldflags': [ +- '<!@(<(pkg-config) --libs-only-L --libs-only-other xrandr)', +- ], +- 'libraries': [ +- '<!@(<(pkg-config) --libs-only-l xrandr)', +- ], +- }, +- }, { +- 'direct_dependent_settings': { +- 'cflags': [ +- '<!@(pkg-config --cflags xrandr)', +- ], +- }, +- 'link_settings': { +- 'ldflags': [ +- '<!@(pkg-config --libs-only-L --libs-only-other xrandr)', +- ], +- 'libraries': [ +- '<!@(pkg-config --libs-only-l xrandr)', +- ], +- }, +- }], +- ], +- }, + ], + } +-- +1.9.1 + diff --git a/recipes-qt/qt5/qtwebengine/0001-Strip-unwanted-echo-compiling-prefix-from-CC.patch b/recipes-qt/qt5/qtwebengine/0001-Strip-unwanted-echo-compiling-prefix-from-CC.patch new file mode 100644 index 00000000..6b315985 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0001-Strip-unwanted-echo-compiling-prefix-from-CC.patch @@ -0,0 +1,38 @@ +From 7a3179fee9c88ce3dd018b2f159e1b5df74fc7cc Mon Sep 17 00:00:00 2001 +From: Simon Busch <morphis@gravedo.de> +Date: Fri, 20 Jun 2014 19:04:14 +0200 +Subject: [PATCH] Strip unwanted "@echo compiling &&" prefix from ${CC} + +Causes problems when called from a perl script: + +@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. +open2: 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 +Traceback (most recent call last): + File "../build/scripts/action_useragentstylesheets.py", line 124, in <module> + sys.exit(main(sys.argv)) + File "../build/scripts/action_useragentstylesheets.py", line 118, in main + assert returnCode == 0 +AssertionError + +Signed-off-by: Simon Busch <morphis@gravedo.de> +--- + .../WebKit/Source/build/scripts/action_useragentstylesheets.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --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 +index c0712b3..8460637 100644 +--- 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 +@@ -112,6 +112,9 @@ def main(args): + command.extend([outputH, outputCpp]) + command.extend(styleSheets) + ++ if os.environ["CC"].startswith("@echo"): ++ os.environ["CC"] = os.environ["CC"].replace("@echo compiling &&", "") ++ + # Do it. check_call is new in 2.5, so simulate its behavior with call and + # assert. + returnCode = subprocess.call(command) +-- +1.9.1 + diff --git a/recipes-qt/qt5/qtwebengine/0002-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch b/recipes-qt/qt5/qtwebengine/0002-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch new file mode 100644 index 00000000..c64b32a4 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0002-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch @@ -0,0 +1,36 @@ +From 2fe53c4c28f91941ee3b446e88f519feb2edc457 Mon Sep 17 00:00:00 2001 +From: Simon Busch <morphis@gravedo.de> +Date: Fri, 20 Jun 2014 09:09:12 +0200 +Subject: [PATCH 2/2] Use ninja supplied by environment variable NINJA_PATH + +Signed-off-by: Simon Busch <morphis@gravedo.de> +--- + tools/qmake/mkspecs/features/functions.prf | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) + +diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf +index 4dcd8ed..8725fd2 100644 +--- a/tools/qmake/mkspecs/features/functions.prf ++++ b/tools/qmake/mkspecs/features/functions.prf +@@ -84,16 +84,6 @@ defineReplace(which) { + } + + defineReplace(findOrBuildNinja) { +- git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir") +- # Fall back to the snapshot path if git does not know about chromium sources (i.e. init-repository.py has not been used) +- isEmpty(git_chromium_src_dir): git_chromium_src_dir = "src/3rdparty/chromium" +- +- out = $$absolute_path("$$git_chromium_src_dir/../ninja/ninja", "$$QTWEBENGINE_ROOT") +- win32: out = $$system_path($${out}.exe) +- +- # If we did not find ninja, then we bootstrap it. +- !exists($$out) { +- system("python $$dirname(out)/bootstrap.py") +- } +- return($$out) ++ message(Using ninja from path $$NINJA_PATH) ++ return($$NINJA_PATH) + } +-- +1.9.1 + |