diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-07 04:10:06 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-19 11:56:32 +0100 |
| commit | 4b7182a3be2b591e8190ff15b7a121191e4b201f (patch) | |
| tree | c518a426110cae5e5355dc5d02bdcf60a2cf2834 /recipes-qt/qt5/qtwebkit | |
| parent | 79944bda32a7e4799e7e73ea5b0dfc71ff1fc172 (diff) | |
qt5: Upgrade from 5.2.0 to 5.2.1
* qtwayland: Use default LICENSE and LIC_FILES_CHKSUM
* license texts were added in qtwayland commit 26bdc66fe6c4499332b2ead886a806d09aa07a8a
* qtdeclarative, qtserialport: Update QT_MODULE_BRANCH
* SHA-1 of v5.2.1 tag is only in release branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit')
| -rw-r--r-- | recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | 31 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebkit/fix-rpath.patch | 13 |
2 files changed, 31 insertions, 13 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch new file mode 100644 index 00000000..07e4436e --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch @@ -0,0 +1,31 @@ +From 89c132829d1a93d662f617c2a7be75c5e6eaa33a Mon Sep 17 00:00:00 2001 +From: Trevor Woerner <trevor.woerner@linaro.org> +Date: Fri, 7 Feb 2014 04:07:17 +0100 +Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) + +Building qtwebkit causes a QA issue such that QtWebPluginProcess and +QtWebProcess contain bad RPATHs which point into the build location. This fix +adds a patch to not include the rpath.prf which causes this problem. + +Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + Tools/qmake/mkspecs/features/unix/default_post.prf | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf +index 79b7208..6dff72b 100644 +--- a/Tools/qmake/mkspecs/features/unix/default_post.prf ++++ b/Tools/qmake/mkspecs/features/unix/default_post.prf +@@ -58,8 +58,6 @@ linux-*g++* { + QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions + } + +-contains(TEMPLATE, app): CONFIG += rpath +- + CONFIG(debug, debug|release)|force_debug_info|separate_debug_info { + # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. + !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory +-- +1.8.5.3 + diff --git a/recipes-qt/qt5/qtwebkit/fix-rpath.patch b/recipes-qt/qt5/qtwebkit/fix-rpath.patch deleted file mode 100644 index 5c205144..00000000 --- a/recipes-qt/qt5/qtwebkit/fix-rpath.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: qtwebkit-opensource-src-5.1.0/Tools/qmake/mkspecs/features/unix/default_post.prf -=================================================================== ---- qtwebkit-opensource-src-5.1.0.orig/Tools/qmake/mkspecs/features/unix/default_post.prf -+++ qtwebkit-opensource-src-5.1.0/Tools/qmake/mkspecs/features/unix/default_post.prf -@@ -32,8 +32,6 @@ linux-*g++* { - QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions - } - --contains(TEMPLATE, app): CONFIG += rpath -- - isEqual(QT_ARCH,i386):CONFIG(debug, debug|release) { - # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. - config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory |