Hello community,
here is the log from the commit of package webkitgtk for openSUSE:Factory
checked in at 2015-03-30 19:13:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/webkitgtk (Old)
and /work/SRC/openSUSE:Factory/.webkitgtk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "webkitgtk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/webkitgtk/webkitgtk.changes 2015-01-25
21:14:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.webkitgtk.new/webkitgtk.changes 2015-03-30
19:13:11.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Feb 23 09:29:15 UTC 2015 - dims...@opensuse.org
+
+- Add webkitgtk-WTF-GMutexLocker.patch: Fix build with GLib 2.43.4.
+ WebKit and GLib both have a GMutexLock in tree, which conflict.
+ Ensure WebKit uses its own WTF::GMutexLocker implementation.
+
+-------------------------------------------------------------------
webkitgtk3.changes: same change
New:
----
webkitgtk-WTF-GMutexLocker.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ webkitgtk.spec ++++++
--- /var/tmp/diff_new_pack.wrrbxV/_old 2015-03-30 19:13:12.000000000 +0200
+++ /var/tmp/diff_new_pack.wrrbxV/_new 2015-03-30 19:13:12.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package webkitgtk
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -73,6 +73,8 @@
Patch10: webkitgtk-ppc32.patch
# PATCH-FIX-UPSTREAM webkitgtk-compile-when-WK2-disabled.patch webkit#140241
zai...@opensuse.org -- Cannot compile 2.4.8 when WK2 is disabled
Patch11: webkitgtk-compile-when-WK2-disabled.patch
+# PATCH-FIX-UPSTREAM webkitgtk-WTF-GMutexLocker.patch webkit#141381
dims...@opensuse.org -- Fix build with GLib 2.43.4, solve conflict on
GMutexLock name
+Patch12: webkitgtk-WTF-GMutexLocker.patch
BuildRequires: Mesa-devel
BuildRequires: bison
BuildRequires: chrpath
@@ -333,6 +335,7 @@
%patch10 -p1
%endif
%patch11 -p1
+%patch12 -p1
# FIXME: workaround needed in > 1.7.90 to fix build
mkdir -p DerivedSources/webkit
mkdir -p DerivedSources/WebCore
++++++ webkitgtk3.spec ++++++
--- /var/tmp/diff_new_pack.wrrbxV/_old 2015-03-30 19:13:12.000000000 +0200
+++ /var/tmp/diff_new_pack.wrrbxV/_new 2015-03-30 19:13:12.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package webkitgtk3
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -73,6 +73,8 @@
Patch10: webkitgtk-ppc32.patch
# PATCH-FIX-UPSTREAM webkitgtk-compile-when-WK2-disabled.patch webkit#140241
zai...@opensuse.org -- Cannot compile 2.4.8 when WK2 is disabled
Patch11: webkitgtk-compile-when-WK2-disabled.patch
+# PATCH-FIX-UPSTREAM webkitgtk-WTF-GMutexLocker.patch webkit#141381
dims...@opensuse.org -- Fix build with GLib 2.43.4, solve conflict on
GMutexLock name
+Patch12: webkitgtk-WTF-GMutexLocker.patch
BuildRequires: Mesa-devel
BuildRequires: bison
BuildRequires: chrpath
@@ -333,6 +335,7 @@
%patch10 -p1
%endif
%patch11 -p1
+%patch12 -p1
# FIXME: workaround needed in > 1.7.90 to fix build
mkdir -p DerivedSources/webkit
mkdir -p DerivedSources/WebCore
++++++ webkitgtk-WTF-GMutexLocker.patch ++++++
Index:
webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
===================================================================
---
webkitgtk-2.4.8.orig/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
+++
webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
@@ -316,7 +316,7 @@ void MediaPlayerPrivateGStreamerBase::mu
#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) &&
!USE(COORDINATED_GRAPHICS)
PassRefPtr<BitmapTexture>
MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
{
- GMutexLocker lock(m_bufferMutex);
+ WebCore::GMutexLocker lock(m_bufferMutex);
if (!m_buffer)
return nullptr;
@@ -366,7 +366,7 @@ void MediaPlayerPrivateGStreamerBase::tr
g_return_if_fail(GST_IS_BUFFER(buffer));
{
- GMutexLocker lock(m_bufferMutex);
+ WebCore::GMutexLocker lock(m_bufferMutex);
gst_buffer_replace(&m_buffer, buffer);
}
@@ -398,7 +398,7 @@ void MediaPlayerPrivateGStreamerBase::pa
if (!m_player->visible())
return;
- GMutexLocker lock(m_bufferMutex);
+ WebCore::GMutexLocker lock(m_bufferMutex);
if (!m_buffer)
return;
Index:
webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
===================================================================
---
webkitgtk-2.4.8.orig/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
+++
webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
@@ -118,7 +118,7 @@ static gboolean webkitVideoSinkTimeoutCa
WebKitVideoSink* sink = reinterpret_cast<WebKitVideoSink*>(data);
WebKitVideoSinkPrivate* priv = sink->priv;
- GMutexLocker lock(priv->bufferMutex);
+ WebCore::GMutexLocker lock(priv->bufferMutex);
GstBuffer* buffer = priv->buffer;
priv->buffer = 0;
priv->timeoutId = 0;
@@ -140,7 +140,7 @@ static GstFlowReturn webkitVideoSinkRend
WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
WebKitVideoSinkPrivate* priv = sink->priv;
- GMutexLocker lock(priv->bufferMutex);
+ WebCore::GMutexLocker lock(priv->bufferMutex);
if (priv->unlocked)
return GST_FLOW_OK;
@@ -279,7 +279,7 @@ static void webkitVideoSinkGetProperty(G
static void unlockBufferMutex(WebKitVideoSinkPrivate* priv)
{
- GMutexLocker lock(priv->bufferMutex);
+ WebCore::GMutexLocker lock(priv->bufferMutex);
if (priv->buffer) {
gst_buffer_unref(priv->buffer);
@@ -305,7 +305,7 @@ static gboolean webkitVideoSinkUnlockSto
WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
{
- GMutexLocker lock(priv->bufferMutex);
+ WebCore::GMutexLocker lock(priv->bufferMutex);
priv->unlocked = false;
}
@@ -330,7 +330,7 @@ static gboolean webkitVideoSinkStart(Gst
{
WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
- GMutexLocker lock(priv->bufferMutex);
+ WebCore::GMutexLocker lock(priv->bufferMutex);
priv->unlocked = false;
return TRUE;
}
Index:
webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
===================================================================
---
webkitgtk-2.4.8.orig/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
+++
webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
@@ -346,7 +346,7 @@ static void webKitWebSrcSetProperty(GObj
switch (propID) {
case PROP_IRADIO_MODE: {
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
priv->iradioMode = g_value_get_boolean(value);
break;
}
@@ -364,7 +364,7 @@ static void webKitWebSrcGetProperty(GObj
WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
WebKitWebSrcPrivate* priv = src->priv;
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
switch (propID) {
case PROP_IRADIO_MODE:
g_value_set_boolean(value, priv->iradioMode);
@@ -417,7 +417,7 @@ static gboolean webKitWebSrcStop(WebKitW
ASSERT(isMainThread());
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
bool seeking = priv->seekID;
@@ -476,7 +476,7 @@ static gboolean webKitWebSrcStart(WebKit
ASSERT(isMainThread());
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
priv->startID = 0;
priv->corsAccessCheck = CORSNoCheck;
@@ -573,7 +573,7 @@ static GstStateChangeReturn webKitWebSrc
return ret;
}
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED:
GST_DEBUG_OBJECT(src, "READY->PAUSED");
@@ -604,7 +604,7 @@ static gboolean webKitWebSrcQueryWithPar
gst_query_parse_duration(query, &format, NULL);
GST_DEBUG_OBJECT(src, "duration query in format %s",
gst_format_get_name(format));
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
gst_query_set_duration(query, format, src->priv->size);
result = TRUE;
@@ -612,7 +612,7 @@ static gboolean webKitWebSrcQueryWithPar
break;
}
case GST_QUERY_URI: {
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
gst_query_set_uri(query, src->priv->uri);
result = TRUE;
break;
@@ -653,7 +653,7 @@ static gchar* webKitWebSrcGetUri(GstURIH
WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
gchar* ret;
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
ret = g_strdup(src->priv->uri);
return ret;
}
@@ -668,7 +668,7 @@ static gboolean webKitWebSrcSetUri(GstUR
return FALSE;
}
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
g_free(priv->uri);
priv->uri = 0;
@@ -704,7 +704,7 @@ static gboolean webKitWebSrcNeedDataMain
ASSERT(isMainThread());
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
// already stopped
if (!priv->needDataID)
return FALSE;
@@ -725,7 +725,7 @@ static void webKitWebSrcNeedDataCb(GstAp
GST_DEBUG_OBJECT(src, "Need more data: %u", length);
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
if (priv->needDataID || !priv->paused) {
return;
}
@@ -739,7 +739,7 @@ static gboolean webKitWebSrcEnoughDataMa
ASSERT(isMainThread());
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
// already stopped
if (!priv->enoughDataID)
return FALSE;
@@ -760,7 +760,7 @@ static void webKitWebSrcEnoughDataCb(Gst
GST_DEBUG_OBJECT(src, "Have enough data");
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
if (priv->enoughDataID || priv->paused) {
return;
}
@@ -774,7 +774,7 @@ static gboolean webKitWebSrcSeekMainCb(W
ASSERT(isMainThread());
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
// already stopped
if (!priv->seekID)
return FALSE;
@@ -792,7 +792,7 @@ static gboolean webKitWebSrcSeekDataCb(G
WebKitWebSrcPrivate* priv = src->priv;
GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
if (offset == priv->offset && priv->requestedOffset == priv->offset)
return TRUE;
@@ -811,7 +811,7 @@ static gboolean webKitWebSrcSeekDataCb(G
void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer*
player)
{
ASSERT(player);
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
src->priv->player = player;
}
@@ -841,7 +841,7 @@ char* StreamingClient::createReadBuffer(
mapGstBuffer(buffer);
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
priv->buffer = adoptGRef(buffer);
locker.unlock();
@@ -867,7 +867,7 @@ void StreamingClient::handleResponseRece
return;
}
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
priv->corsAccessCheck = corsAccessCheck;
@@ -966,7 +966,7 @@ void StreamingClient::handleDataReceived
WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src);
WebKitWebSrcPrivate* priv = src->priv;
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ?
static_cast<long long>(gst_buffer_get_size(priv->buffer.get())) : length);
@@ -1035,7 +1035,7 @@ void StreamingClient::handleNotifyFinish
GST_DEBUG_OBJECT(src, "Have EOS");
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
if (!priv->seekID) {
locker.unlock();
gst_app_src_end_of_stream(priv->appsrc);
@@ -1194,7 +1194,7 @@ void ResourceHandleStreamingClient::wasB
GST_ERROR_OBJECT(src, "Request was blocked");
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
uri.reset(g_strdup(src->priv->uri));
locker.unlock();
@@ -1208,7 +1208,7 @@ void ResourceHandleStreamingClient::cann
GST_ERROR_OBJECT(src, "Cannot show URL");
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
uri.reset(g_strdup(src->priv->uri));
locker.unlock();
