summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-05-28 14:50:37 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-05-28 14:50:37 +0200
commit3fa7bb148ed40bd018ce51b5f20c0c8792638568 (patch)
treedc7b2847822189d5c0cbc7195fbca3556d6aa6a2 /recipes-qt/qt5/qtwebkit
parent17eb158c6d2cd290b054b5bd54311aa44a02d04d (diff)
downloadmeta-qt5-3fa7bb148ed40bd018ce51b5f20c0c8792638568.tar.gz
qt5: drop recipes for 5.4.1 version
* we don't plan to keep 2 versions, one from tarballs and one from git now there is 5.4.2 in git recipes and 5.4.1 tarballs aren't very useful anymore 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.patch30
-rw-r--r--recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch79
-rw-r--r--recipes-qt/qt5/qtwebkit/0003-Fix-building-with-glib-2.43.patch238
-rw-r--r--recipes-qt/qt5/qtwebkit/0004-gcc5-qtbug-44829.patch36
4 files changed, 0 insertions, 383 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
deleted file mode 100644
index f1b9bdb7..00000000
--- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 97d4af4ea8708829d6df276ae741c2076cb472e8 Mon Sep 17 00:00:00 2001
2From: Trevor Woerner <trevor.woerner@linaro.org>
3Date: Fri, 7 Feb 2014 04:07:17 +0100
4Subject: [PATCH 1/2] qtwebkit: fix QA issue (bad RPATH)
5
6Building qtwebkit causes a QA issue such that QtWebPluginProcess and
7QtWebProcess contain bad RPATHs which point into the build location. This fix
8adds a patch to not include the rpath.prf which causes this problem.
9
10Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 Tools/qmake/mkspecs/features/unix/default_post.prf | 1 -
14 1 file changed, 1 deletion(-)
15
16diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf
17index fd66af6..ef754c3 100644
18--- a/Tools/qmake/mkspecs/features/unix/default_post.prf
19+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf
20@@ -61,7 +61,6 @@ linux-*g++* {
21 }
22 }
23
24-contains(TEMPLATE, app): CONFIG += rpath
25
26 CONFIG(debug, debug|release)|force_debug_info {
27 # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
28--
292.3.1
30
diff --git a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
deleted file mode 100644
index 64bfa3e7..00000000
--- a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
+++ /dev/null
@@ -1,79 +0,0 @@
1From ecb13fa1c9fa45b7e307232b24331c040c88330b Mon Sep 17 00:00:00 2001
2From: Magnus Granberg <zorry@gentoo.org>
3Date: Fri, 27 Feb 2015 11:55:09 +0100
4Subject: [PATCH 2/2] Remove TEXTREL tag in x86
5
6Fix textrel QA warnings when building qtwebkit for x86:
7
8 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]
9
10Patch from upstream webkit:
11
12 https://bugs.webkit.org/show_bug.cgi?id=70610
13
14Minor refresh required to apply cleanly to the older webkit sources used
15by qtwebkit. Specifically, the patch needed to be modified to account
16for PLATFORM(MAC) -> OS(DARWIN) renaming in recent webkit which is not
17part of qtwebkit yet ( https://bugs.webkit.org/show_bug.cgi?id=99683 ).
18
19Upstream status [webkit] : backport
20Upstream status [qtwebkit] : unclear
21
22Bug: https://bugs.webkit.org/show_bug.cgi?id=70610
23Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
24---
25 Source/JavaScriptCore/jit/ThunkGenerators.cpp | 24 ++++++++++++++++++++++++
26 Source/WTF/wtf/InlineASM.h | 2 ++
27 2 files changed, 26 insertions(+)
28
29diff --git a/Source/JavaScriptCore/jit/ThunkGenerators.cpp b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
30index 9684df2..8af82d8 100644
31--- a/Source/JavaScriptCore/jit/ThunkGenerators.cpp
32+++ b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
33@@ -524,6 +524,30 @@ double jsRound(double d)
34 } \
35 static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk;
36
37+#elif CPU(X86) && COMPILER(GCC) && OS(LINUX) && defined(__PIC__)
38+#define defineUnaryDoubleOpWrapper(function) \
39+ asm( \
40+ ".text\n" \
41+ ".globl " SYMBOL_STRING(function##Thunk) "\n" \
42+ HIDE_SYMBOL(function##Thunk) "\n" \
43+ SYMBOL_STRING(function##Thunk) ":" "\n" \
44+ "pushl %ebx\n" \
45+ "subl $20, %esp\n" \
46+ "movsd %xmm0, (%esp) \n" \
47+ "call __x86.get_pc_thunk.bx\n" \
48+ "addl $_GLOBAL_OFFSET_TABLE_, %ebx\n" \
49+ "call " GLOBAL_REFERENCE(function) "\n" \
50+ "fstpl (%esp) \n" \
51+ "movsd (%esp), %xmm0 \n" \
52+ "addl $20, %esp\n" \
53+ "popl %ebx\n" \
54+ "ret\n" \
55+ );\
56+ extern "C" { \
57+ MathThunkCallingConvention function##Thunk(MathThunkCallingConvention); \
58+ } \
59+ static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk;
60+
61 #elif CPU(X86) && COMPILER(GCC) && (PLATFORM(MAC) || OS(LINUX))
62 #define defineUnaryDoubleOpWrapper(function) \
63 asm( \
64diff --git a/Source/WTF/wtf/InlineASM.h b/Source/WTF/wtf/InlineASM.h
65index 0a2fe78..2dc40ef 100644
66--- a/Source/WTF/wtf/InlineASM.h
67+++ b/Source/WTF/wtf/InlineASM.h
68@@ -46,6 +46,8 @@
69 #define GLOBAL_REFERENCE(name) #name "@plt"
70 #elif CPU(X86) && COMPILER(MINGW)
71 #define GLOBAL_REFERENCE(name) "@" #name "@4"
72+#elif OS(LINUX) && CPU(X86) && defined(__PIC__)
73+#define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) "@plt"
74 #else
75 #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name)
76 #endif
77--
782.3.1
79
diff --git a/recipes-qt/qt5/qtwebkit/0003-Fix-building-with-glib-2.43.patch b/recipes-qt/qt5/qtwebkit/0003-Fix-building-with-glib-2.43.patch
deleted file mode 100644
index 12034704..00000000
--- a/recipes-qt/qt5/qtwebkit/0003-Fix-building-with-glib-2.43.patch
+++ /dev/null
@@ -1,238 +0,0 @@
1From ef94c178a7ba0bd43a677ec90fde334ce2c90810 Mon Sep 17 00:00:00 2001
2From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
3Date: Fri, 27 Feb 2015 14:14:44 +0100
4Subject: [PATCH 3/3] Fix building with glib 2.43+
5
6The newest version of glib have introduced their own GMutexLocker
7conflicting with the one defined in WebCore.
8
9Task-number: QTBUG-44714
10Change-Id: Ibdd1646e129eaed84c65dc0d96bebe80f2a61f4b
11Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
12---
13 .../gstreamer/WebKitWebSourceGStreamer.cpp | 48 +++++++++++-----------
14 1 file changed, 24 insertions(+), 24 deletions(-)
15
16diff --git a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
17index 5625873..a6d961f 100644
18--- a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
19+++ b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
20@@ -354,7 +354,7 @@ static void webKitWebSrcSetProperty(GObject* object, guint propID, const GValue*
21
22 switch (propID) {
23 case PROP_IRADIO_MODE: {
24- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
25+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
26 priv->iradioMode = g_value_get_boolean(value);
27 break;
28 }
29@@ -376,7 +376,7 @@ static void webKitWebSrcGetProperty(GObject* object, guint propID, GValue* value
30 WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
31 WebKitWebSrcPrivate* priv = src->priv;
32
33- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
34+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
35 switch (propID) {
36 case PROP_IRADIO_MODE:
37 g_value_set_boolean(value, priv->iradioMode);
38@@ -429,7 +429,7 @@ static gboolean webKitWebSrcStop(WebKitWebSrc* src)
39
40 ASSERT(isMainThread());
41
42- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
43+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
44
45 bool seeking = priv->seekID;
46
47@@ -493,7 +493,7 @@ static gboolean webKitWebSrcStart(WebKitWebSrc* src)
48
49 ASSERT(isMainThread());
50
51- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
52+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
53
54 priv->startID = 0;
55
56@@ -584,7 +584,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat
57 return ret;
58 }
59
60- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
61+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
62 switch (transition) {
63 case GST_STATE_CHANGE_READY_TO_PAUSED:
64 GST_DEBUG_OBJECT(src, "READY->PAUSED");
65@@ -615,7 +615,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ
66 gst_query_parse_duration(query, &format, NULL);
67
68 GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
69- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
70+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
71 if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
72 gst_query_set_duration(query, format, src->priv->size);
73 result = TRUE;
74@@ -623,7 +623,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ
75 break;
76 }
77 case GST_QUERY_URI: {
78- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
79+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
80 gst_query_set_uri(query, src->priv->uri);
81 result = TRUE;
82 break;
83@@ -668,7 +668,7 @@ static gchar* webKitWebSrcGetUri(GstURIHandler* handler)
84 WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
85 gchar* ret;
86
87- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
88+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
89 ret = g_strdup(src->priv->uri);
90 return ret;
91 }
92@@ -683,7 +683,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri, GEr
93 return FALSE;
94 }
95
96- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
97+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
98
99 g_free(priv->uri);
100 priv->uri = 0;
101@@ -719,7 +719,7 @@ static const gchar* webKitWebSrcGetUri(GstURIHandler* handler)
102 WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
103 gchar* ret;
104
105- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
106+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
107 ret = g_strdup(src->priv->uri);
108 return ret;
109 }
110@@ -734,7 +734,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri)
111 return FALSE;
112 }
113
114- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
115+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
116
117 g_free(priv->uri);
118 priv->uri = 0;
119@@ -772,7 +772,7 @@ static gboolean webKitWebSrcNeedDataMainCb(WebKitWebSrc* src)
120
121 ASSERT(isMainThread());
122
123- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
124+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
125 // already stopped
126 if (!priv->needDataID)
127 return FALSE;
128@@ -793,7 +793,7 @@ static void webKitWebSrcNeedDataCb(GstAppSrc*, guint length, gpointer userData)
129
130 GST_DEBUG_OBJECT(src, "Need more data: %u", length);
131
132- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
133+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
134 if (priv->needDataID || !priv->paused) {
135 return;
136 }
137@@ -807,7 +807,7 @@ static gboolean webKitWebSrcEnoughDataMainCb(WebKitWebSrc* src)
138
139 ASSERT(isMainThread());
140
141- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
142+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
143 // already stopped
144 if (!priv->enoughDataID)
145 return FALSE;
146@@ -828,7 +828,7 @@ static void webKitWebSrcEnoughDataCb(GstAppSrc*, gpointer userData)
147
148 GST_DEBUG_OBJECT(src, "Have enough data");
149
150- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
151+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
152 if (priv->enoughDataID || priv->paused) {
153 return;
154 }
155@@ -842,7 +842,7 @@ static gboolean webKitWebSrcSeekMainCb(WebKitWebSrc* src)
156
157 ASSERT(isMainThread());
158
159- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
160+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
161 // already stopped
162 if (!priv->seekID)
163 return FALSE;
164@@ -860,7 +860,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user
165 WebKitWebSrcPrivate* priv = src->priv;
166
167 GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
168- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
169+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
170 if (offset == priv->offset && priv->requestedOffset == priv->offset)
171 return TRUE;
172
173@@ -879,7 +879,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user
174 void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
175 {
176 ASSERT(player);
177- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
178+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
179 src->priv->player = player;
180 s_cachedResourceLoader = player->cachedResourceLoader();
181 }
182@@ -906,7 +906,7 @@ char* StreamingClient::createReadBuffer(size_t requestedSize, size_t& actualSize
183 mapGstBuffer(buffer);
184 #endif
185
186- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
187+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
188 priv->buffer = adoptGRef(buffer);
189 locker.unlock();
190
191@@ -921,7 +921,7 @@ void StreamingClient::handleResponseReceived(const ResourceResponse& response)
192
193 GST_DEBUG_OBJECT(src, "Received response: %d", response.httpStatusCode());
194
195- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
196+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
197
198 // If we seeked we need 206 == PARTIAL_CONTENT
199 if (priv->requestedOffset && response.httpStatusCode() != 206) {
200@@ -1020,7 +1020,7 @@ void StreamingClient::handleDataReceived(const char* data, int length)
201 WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get());
202 WebKitWebSrcPrivate* priv = src->priv;
203
204- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
205+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
206
207 GST_LOG_OBJECT(src, "Have %d bytes of data", priv->buffer ? getGstBufferSize(priv->buffer.get()) : length);
208
209@@ -1074,7 +1074,7 @@ void StreamingClient::handleNotifyFinished()
210
211 GST_DEBUG_OBJECT(src, "Have EOS");
212
213- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
214+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
215 if (!priv->seekID) {
216 locker.unlock();
217 gst_app_src_end_of_stream(priv->appsrc);
218@@ -1210,7 +1210,7 @@ void ResourceHandleStreamingClient::wasBlocked(ResourceHandle*)
219
220 GST_ERROR_OBJECT(src, "Request was blocked");
221
222- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
223+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
224 uri.set(g_strdup(src->priv->uri));
225 locker.unlock();
226
227@@ -1224,7 +1224,7 @@ void ResourceHandleStreamingClient::cannotShowURL(ResourceHandle*)
228
229 GST_ERROR_OBJECT(src, "Cannot show URL");
230
231- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
232+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
233 uri.set(g_strdup(src->priv->uri));
234 locker.unlock();
235
236--
2372.3.5
238
diff --git a/recipes-qt/qt5/qtwebkit/0004-gcc5-qtbug-44829.patch b/recipes-qt/qt5/qtwebkit/0004-gcc5-qtbug-44829.patch
deleted file mode 100644
index 81295d1c..00000000
--- a/recipes-qt/qt5/qtwebkit/0004-gcc5-qtbug-44829.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 650c6ee8e76bb574d3a1bea09e2494992d8f070e Mon Sep 17 00:00:00 2001
2From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
3Date: Fri, 6 Mar 2015 11:20:13 +0100
4Subject: Fix g++ 5.0 build
5
6A non-inline template needs to be explicitly instantiated if used
7outside the object where it is declared.
8
9Patch suggested by Khem Raj.
10
11Task-number: QTBUG-44829
12Change-Id: Ib0adbd9273bd1cef01e5863bc8aaa9c373022792
13Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
14---
15 Source/JavaScriptCore/runtime/JSObject.cpp | 5 +++++
16 1 file changed, 5 insertions(+)
17
18diff --git a/Source/JavaScriptCore/runtime/JSObject.cpp b/Source/JavaScriptCore/runtime/JSObject.cpp
19index 5637e20..bd55919 100644
20--- a/Source/JavaScriptCore/runtime/JSObject.cpp
21+++ b/Source/JavaScriptCore/runtime/JSObject.cpp
22@@ -1909,6 +1909,11 @@ void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, un
23 }
24 }
25
26+// Used in JSArray.cpp so we must instantiate explicit
27+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
28+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
29+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
30+
31 void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
32 {
33 VM& vm = exec->vm();
34--
35cgit v0.11.0
36
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-26 09:59:54 +0000