2 files changed, 41 insertions, 29 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
index 9324da9a..f1b9bdb7 100644
--- 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
@@ -1,7 +1,7 @@
-From fe714df9641286e3f005e0021e1c6462fb0b061e Mon Sep 17 00:00:00 2001
+From 97d4af4ea8708829d6df276ae741c2076cb472e8 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)
+Subject: [PATCH 1/2] 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
@@ -9,21 +9,22 @@ 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>
-Signed-off-by: Jonathan Liu <net147@gmail.com>
 ---
- Tools/qmake/mkspecs/features/unix/default_post.prf | 2 --
- 1 file changed, 2 deletions(-)
+ Tools/qmake/mkspecs/features/unix/default_post.prf | 1 -
+ 1 file changed, 1 deletion(-)
 
 diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf
-index 9c52406..7ece013 100644
+index fd66af6..ef754c3 100644
 --- a/Tools/qmake/mkspecs/features/unix/default_post.prf
 +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf
-@@ -59,8 +59,6 @@ linux-*g++* {
+@@ -61,7 +61,6 @@ linux-*g++* {
      }
  }
  
 -contains(TEMPLATE, app): CONFIG += rpath
--
+ 
  CONFIG(debug, debug|release)|force_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
+-- 
+2.3.1
+
diff --git a/recipes-qt/qt5/qtwebkit/0002-qtwebkit-fix-textrel-x86.patch b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
index e5f1538d..64bfa3e7 100644
--- a/recipes-qt/qt5/qtwebkit/0002-qtwebkit-fix-textrel-x86.patch
+++ b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
@@ -1,3 +1,8 @@
+From ecb13fa1c9fa45b7e307232b24331c040c88330b Mon Sep 17 00:00:00 2001
+From: Magnus Granberg <zorry@gentoo.org>
+Date: Fri, 27 Feb 2015 11:55:09 +0100
+Subject: [PATCH 2/2] Remove TEXTREL tag in x86
+
 Fix textrel QA warnings when building qtwebkit for x86:
 
   WARNING: QA Issue: ELF binary '/home/andre/rdk/rdk-master/build-vbox32/tmp/work/core2-32-rdk-linux/qtwebkit/5.4.0-r0/packages-split/qtwebkit/usr/lib/libQt5WebKit.so.5.4.0' has relocations in .text [textrel]
@@ -14,27 +19,17 @@ part of qtwebkit yet ( https://bugs.webkit.org/show_bug.cgi?id=99683 ).
 Upstream status [webkit] : backport
 Upstream status [qtwebkit] : unclear
 
-
-From: Magnus Granberg <zorry@gentoo.org>
-Subject: Remove TEXTREL tag in x86
 Bug: https://bugs.webkit.org/show_bug.cgi?id=70610
-Index: webkitgtk/Source/WTF/wtf/InlineASM.h
-===================================================================
---- webkitgtk.orig/Source/WTF/wtf/InlineASM.h
-+++ webkitgtk/Source/WTF/wtf/InlineASM.h
-@@ -46,6 +46,8 @@
- #define GLOBAL_REFERENCE(name) #name "@plt"
- #elif CPU(X86) && COMPILER(MINGW)
- #define GLOBAL_REFERENCE(name) "@" #name "@4"
-+#elif OS(LINUX) && CPU(X86) && defined(__PIC__)
-+#define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) "@plt"
- #else
- #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name)
- #endif
-Index: webkitgtk/Source/JavaScriptCore/jit/ThunkGenerators.cpp
-===================================================================
---- webkitgtk.orig/Source/JavaScriptCore/jit/ThunkGenerators.cpp
-+++ webkitgtk/Source/JavaScriptCore/jit/ThunkGenerators.cpp
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ Source/JavaScriptCore/jit/ThunkGenerators.cpp | 24 ++++++++++++++++++++++++
+ Source/WTF/wtf/InlineASM.h                    |  2 ++
+ 2 files changed, 26 insertions(+)
+
+diff --git a/Source/JavaScriptCore/jit/ThunkGenerators.cpp b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
+index 9684df2..8af82d8 100644
+--- a/Source/JavaScriptCore/jit/ThunkGenerators.cpp
++++ b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
 @@ -524,6 +524,30 @@ double jsRound(double d)
      } \
      static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk;
@@ -66,3 +61,19 @@ Index: webkitgtk/Source/JavaScriptCore/jit/ThunkGenerators.cpp
  #elif CPU(X86) && COMPILER(GCC) && (PLATFORM(MAC) || OS(LINUX))
  #define defineUnaryDoubleOpWrapper(function) \
      asm( \
+diff --git a/Source/WTF/wtf/InlineASM.h b/Source/WTF/wtf/InlineASM.h
+index 0a2fe78..2dc40ef 100644
+--- a/Source/WTF/wtf/InlineASM.h
++++ b/Source/WTF/wtf/InlineASM.h
+@@ -46,6 +46,8 @@
+ #define GLOBAL_REFERENCE(name) #name "@plt"
+ #elif CPU(X86) && COMPILER(MINGW)
+ #define GLOBAL_REFERENCE(name) "@" #name "@4"
++#elif OS(LINUX) && CPU(X86) && defined(__PIC__)
++#define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) "@plt"
+ #else
+ #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name)
+ #endif
+-- 
+2.3.1
+