[SCM] QtWebKit packaging branch, master, updated. debian/2.2.1-5-7-gae0d7d3

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=c1792db

The following commit has been merged in the master branch:
commit c1792dbdaf53f0e792a3957b772742ca2df3ddc3
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Jun 27 13:20:57 2013 +0200

    New patch: upstream_Build-fixes-for-glib-2.31.diff.
---
 debian/changelog                                   |    1 +
 debian/patches/series                              |    1 +
 .../upstream_Build-fixes-for-glib-2.31.diff        |   69 ++++++++++++++++++++
 3 files changed, 71 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 44ed1d6..47da435 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtwebkit (2.2.1-6) UNRELEASED; urgency=low
 
   * Avoid auto_clean error when building with --git-overlay.
   * New patch: ignore-unused-local-typedefs_error.diff.
+  * New patch: upstream_Build-fixes-for-glib-2.31.diff.
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 20 Jun 2013 16:17:23 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index a943cdb..683ab26 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@
 Fix_build_with_GLib_2.31_changeset_r97269.patch
 upstream_changeset_r93631.diff
 upstream_changeset_r113848.diff
+upstream_Build-fixes-for-glib-2.31.diff
 
 # debian patches
 01_lflags_as-needed.diff
diff --git a/debian/patches/upstream_Build-fixes-for-glib-2.31.diff b/debian/patches/upstream_Build-fixes-for-glib-2.31.diff
new file mode 100644
index 0000000..110798b
--- /dev/null
+++ b/debian/patches/upstream_Build-fixes-for-glib-2.31.diff
@@ -0,0 +1,69 @@
+commit d5512e599772f87146ba9b33d9d3fec0d0629853
+Author: Philippe Normand <pnormand at igalia.com>
+Date:   Fri Oct 28 16:47:14 2011 +0000
+
+    [GTK] Build fixes for glib 2.31 (current master)
+    https://bugs.webkit.org/show_bug.cgi?id=70679
+    
+    Reviewed by Martin Robinson.
+    
+    g_cond_new and g_mutex_new have been replaced by _init
+    functions. Same for _free, replaced by _clear.
+    
+    * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
+    (webkit_video_sink_init):
+    (webkit_video_sink_dispose):
+    
+    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@98731 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+Index: qtwebkit-2.2.1/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
+===================================================================
+--- qtwebkit-2.2.1.orig/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp	2013-06-26 13:32:58.941707781 +0200
++++ qtwebkit-2.2.1/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp	2013-06-26 13:32:58.913708927 +0200
+@@ -33,6 +33,7 @@
+ #include <glib.h>
+ #include <gst/gst.h>
+ #include <gst/video/video.h>
++#include <wtf/FastAllocBase.h>
+ 
+ static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE("sink",
+                                                                    GST_PAD_SINK, GST_PAD_ALWAYS,
+@@ -104,8 +105,15 @@
+     WebKitVideoSinkPrivate* priv;
+ 
+     sink->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE(sink, WEBKIT_TYPE_VIDEO_SINK, WebKitVideoSinkPrivate);
++#if GLIB_CHECK_VERSION(2, 31, 0)
++    priv->data_cond = WTF::fastNew<GCond>();
++    g_cond_init(priv->data_cond);
++    priv->buffer_mutex = WTF::fastNew<GMutex>();
++    g_mutex_init(priv->buffer_mutex);
++#else
+     priv->data_cond = g_cond_new();
+     priv->buffer_mutex = g_mutex_new();
++#endif
+ }
+ 
+ static gboolean
+@@ -234,12 +242,22 @@
+     WebKitVideoSinkPrivate* priv = sink->priv;
+ 
+     if (priv->data_cond) {
++#if GLIB_CHECK_VERSION(2, 31, 0)
++        g_cond_clear(priv->data_cond);
++        WTF::fastDelete(priv->data_cond);
++#else
+         g_cond_free(priv->data_cond);
++#endif
+         priv->data_cond = 0;
+     }
+ 
+     if (priv->buffer_mutex) {
++#if GLIB_CHECK_VERSION(2, 31, 0)
++        g_mutex_clear(priv->buffer_mutex);
++        WTF::fastDelete(priv->buffer_mutex);
++#else
+         g_mutex_free(priv->buffer_mutex);
++#endif
+         priv->buffer_mutex = 0;
+     }
+ 

-- 
QtWebKit packaging