summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes-qt/qt5/qtwebkit.inc1
-rw-r--r--recipes-qt/qt5/qtwebkit/0003-Fix-building-with-glib-2.43.patch238
2 files changed, 239 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
index a575d86d..88df4c81 100644
--- a/recipes-qt/qt5/qtwebkit.inc
+++ b/recipes-qt/qt5/qtwebkit.inc
@@ -11,6 +11,7 @@ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt leveld
11SRC_URI += "\ 11SRC_URI += "\
12 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ 12 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
13 file://0002-Remove-TEXTREL-tag-in-x86.patch \ 13 file://0002-Remove-TEXTREL-tag-in-x86.patch \
14 file://0003-Fix-building-with-glib-2.43.patch \
14" 15"
15 16
16PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel" 17PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel"
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
new file mode 100644
index 00000000..12034704
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit/0003-Fix-building-with-glib-2.43.patch
@@ -0,0 +1,238 @@
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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-31 12:57:16 +0000