pkgs/development/libraries/qt-5/5.3/0013-qtwebkit-glib-2.44.patch at v192

pyrox.dev / nixpkgs
fork
lol
fork
nixpkgs / pkgs / development / libraries / qt-5 / 5.3 / 0013-qtwebkit-glib-2.44.patch
at v192 232 lines 9.0 kB view raw
wrap content
Thomas Tuegel qt53: fix qtwebkit build with new glib 11y ago
7094ae27
  1From f8485382e319da57abea99797387ee9f6f94d32e Mon Sep 17 00:00:00 2001
  2From: Thomas Tuegel <ttuegel@gmail.com>
  3Date: Wed, 13 May 2015 12:42:07 -0500
  4Subject: [PATCH] glib mutexlocker
  5
  6---
  7 .../gstreamer/WebKitWebSourceGStreamer.cpp         | 48 +++++++++++-----------
  8 1 file changed, 24 insertions(+), 24 deletions(-)
  9
 10diff --git a/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
 11index 5625873..a6d961f 100644
 12--- a/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
 13+++ b/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
 14@@ -354,7 +354,7 @@ static void webKitWebSrcSetProperty(GObject* object, guint propID, const GValue*
 15 
 16     switch (propID) {
 17     case PROP_IRADIO_MODE: {
 18-        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 19+        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 20         priv->iradioMode = g_value_get_boolean(value);
 21         break;
 22     }
 23@@ -376,7 +376,7 @@ static void webKitWebSrcGetProperty(GObject* object, guint propID, GValue* value
 24     WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
 25     WebKitWebSrcPrivate* priv = src->priv;
 26 
 27-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 28+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 29     switch (propID) {
 30     case PROP_IRADIO_MODE:
 31         g_value_set_boolean(value, priv->iradioMode);
 32@@ -429,7 +429,7 @@ static gboolean webKitWebSrcStop(WebKitWebSrc* src)
 33 
 34     ASSERT(isMainThread());
 35 
 36-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 37+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 38 
 39     bool seeking = priv->seekID;
 40 
 41@@ -493,7 +493,7 @@ static gboolean webKitWebSrcStart(WebKitWebSrc* src)
 42 
 43     ASSERT(isMainThread());
 44 
 45-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 46+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 47 
 48     priv->startID = 0;
 49 
 50@@ -584,7 +584,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat
 51         return ret;
 52     }
 53 
 54-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 55+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 56     switch (transition) {
 57     case GST_STATE_CHANGE_READY_TO_PAUSED:
 58         GST_DEBUG_OBJECT(src, "READY->PAUSED");
 59@@ -615,7 +615,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ
 60         gst_query_parse_duration(query, &format, NULL);
 61 
 62         GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
 63-        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 64+        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 65         if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
 66             gst_query_set_duration(query, format, src->priv->size);
 67             result = TRUE;
 68@@ -623,7 +623,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ
 69         break;
 70     }
 71     case GST_QUERY_URI: {
 72-        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 73+        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 74         gst_query_set_uri(query, src->priv->uri);
 75         result = TRUE;
 76         break;
 77@@ -668,7 +668,7 @@ static gchar* webKitWebSrcGetUri(GstURIHandler* handler)
 78     WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
 79     gchar* ret;
 80 
 81-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 82+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 83     ret = g_strdup(src->priv->uri);
 84     return ret;
 85 }
 86@@ -683,7 +683,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri, GEr
 87         return FALSE;
 88     }
 89 
 90-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 91+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 92 
 93     g_free(priv->uri);
 94     priv->uri = 0;
 95@@ -719,7 +719,7 @@ static const gchar* webKitWebSrcGetUri(GstURIHandler* handler)
 96     WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
 97     gchar* ret;
 98 
 99-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
100+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
101     ret = g_strdup(src->priv->uri);
102     return ret;
103 }
104@@ -734,7 +734,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri)
105         return FALSE;
106     }
107 
108-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
109+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
110 
111     g_free(priv->uri);
112     priv->uri = 0;
113@@ -772,7 +772,7 @@ static gboolean webKitWebSrcNeedDataMainCb(WebKitWebSrc* src)
114 
115     ASSERT(isMainThread());
116 
117-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
118+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
119     // already stopped
120     if (!priv->needDataID)
121         return FALSE;
122@@ -793,7 +793,7 @@ static void webKitWebSrcNeedDataCb(GstAppSrc*, guint length, gpointer userData)
123 
124     GST_DEBUG_OBJECT(src, "Need more data: %u", length);
125 
126-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
127+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
128     if (priv->needDataID || !priv->paused) {
129         return;
130     }
131@@ -807,7 +807,7 @@ static gboolean webKitWebSrcEnoughDataMainCb(WebKitWebSrc* src)
132 
133     ASSERT(isMainThread());
134 
135-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
136+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
137     // already stopped
138     if (!priv->enoughDataID)
139         return FALSE;
140@@ -828,7 +828,7 @@ static void webKitWebSrcEnoughDataCb(GstAppSrc*, gpointer userData)
141 
142     GST_DEBUG_OBJECT(src, "Have enough data");
143 
144-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
145+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
146     if (priv->enoughDataID || priv->paused) {
147         return;
148     }
149@@ -842,7 +842,7 @@ static gboolean webKitWebSrcSeekMainCb(WebKitWebSrc* src)
150 
151     ASSERT(isMainThread());
152 
153-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
154+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
155     // already stopped
156     if (!priv->seekID)
157         return FALSE;
158@@ -860,7 +860,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user
159     WebKitWebSrcPrivate* priv = src->priv;
160 
161     GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
162-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
163+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
164     if (offset == priv->offset && priv->requestedOffset == priv->offset)
165         return TRUE;
166 
167@@ -879,7 +879,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user
168 void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
169 {
170     ASSERT(player);
171-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
172+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
173     src->priv->player = player;
174     s_cachedResourceLoader = player->cachedResourceLoader();
175 }
176@@ -906,7 +906,7 @@ char* StreamingClient::createReadBuffer(size_t requestedSize, size_t& actualSize
177     mapGstBuffer(buffer);
178 #endif
179 
180-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
181+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
182     priv->buffer = adoptGRef(buffer);
183     locker.unlock();
184 
185@@ -921,7 +921,7 @@ void StreamingClient::handleResponseReceived(const ResourceResponse& response)
186 
187     GST_DEBUG_OBJECT(src, "Received response: %d", response.httpStatusCode());
188 
189-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
190+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
191 
192     // If we seeked we need 206 == PARTIAL_CONTENT
193     if (priv->requestedOffset && response.httpStatusCode() != 206) {
194@@ -1020,7 +1020,7 @@ void StreamingClient::handleDataReceived(const char* data, int length)
195     WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get());
196     WebKitWebSrcPrivate* priv = src->priv;
197 
198-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
199+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
200 
201     GST_LOG_OBJECT(src, "Have %d bytes of data", priv->buffer ? getGstBufferSize(priv->buffer.get()) : length);
202 
203@@ -1074,7 +1074,7 @@ void StreamingClient::handleNotifyFinished()
204 
205     GST_DEBUG_OBJECT(src, "Have EOS");
206 
207-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
208+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
209     if (!priv->seekID) {
210         locker.unlock();
211         gst_app_src_end_of_stream(priv->appsrc);
212@@ -1210,7 +1210,7 @@ void ResourceHandleStreamingClient::wasBlocked(ResourceHandle*)
213 
214     GST_ERROR_OBJECT(src, "Request was blocked");
215 
216-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
217+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
218     uri.set(g_strdup(src->priv->uri));
219     locker.unlock();
220 
221@@ -1224,7 +1224,7 @@ void ResourceHandleStreamingClient::cannotShowURL(ResourceHandle*)
222 
223     GST_ERROR_OBJECT(src, "Cannot show URL");
224 
225-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
226+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
227     uri.set(g_strdup(src->priv->uri));
228     locker.unlock();
229 
230-- 
2312.3.6
232
Configure Feed

Configure Feed
