main/qt5-qtwebkit: upgrade to 5.4.2

2 files changed, 12 insertions, 234 deletions

diff --git a/main/qt5-qtwebkit/APKBUILD b/main/qt5-qtwebkit/APKBUILD
index cce6cd2833..26a9fc9302 100644
--- a/main/qt5-qtwebkit/APKBUILD
+++ b/main/qt5-qtwebkit/APKBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=qt5-qtwebkit
-pkgver=5.4.1
-pkgrel=1
+pkgver=5.4.2
+pkgrel=0
 pkgdesc="Qt5 - QtWebKit components"
 url="http://qt-project.org/"
 arch="all"
 license="LGPLv2 with exceptions or GPLv3 with exceptions"
 depends=""
-depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev gstreamer1-dev
-	gst-plugins-base1-dev libxslt-dev mesa-dev icu-dev libxext-dev
-	glib-dev libxcomposite-dev libxrender-dev
+depends_dev="qt5-qtdeclarative-dev gstreamer1-dev gst-plugins-base1-dev
+	libxslt-dev mesa-dev icu-dev libxext-dev glib-dev libxcomposite-dev
+	libxrender-dev
 	"
 makedepends="$depends_dev
 	bison
@@ -20,6 +20,7 @@ makedepends="$depends_dev
 	libpng-dev
 	libwebp-dev
 	pcre-dev
+	qt5-qtbase-dev
 	ruby
 	sqlite-dev
 	zlib-dev
@@ -40,7 +41,6 @@ source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/qt
 	pic.patch
 	fix-rpath.patch
 	fix-execinfo.patch
-	qtwebkit-opensource-src-5.4.0-mutexlocker.patch
 	"
 
 _builddir="$srcdir"/qtwebkit-opensource-src-$_V
@@ -74,18 +74,15 @@ package() {
 	sed -i -e 's:-L/home[^ ]\+::g' "$pkgdir"/usr/lib/pkgconfig/*.pc
 }
 
-md5sums="186627b1ea5b614811fbd0cfa9b4d073  qtwebkit-opensource-src-5.4.1.tar.xz
+md5sums="b711b3f32646d72cd281b3c17ab6d14e  qtwebkit-opensource-src-5.4.2.tar.xz
 676350288efff119bee8513d9d0b2047  pic.patch
 722c871b648adae302413159b12ada6b  fix-rpath.patch
-7a2a2592e64561fa0bc8c0552181bf00  fix-execinfo.patch
-b952e49286ff4fb101d6b78cc3ce419d  qtwebkit-opensource-src-5.4.0-mutexlocker.patch"
-sha256sums="6607211ef8a913dc778617bf4ba0970e34cc71e1da3abb477eabe0035e7119bf  qtwebkit-opensource-src-5.4.1.tar.xz
+7a2a2592e64561fa0bc8c0552181bf00  fix-execinfo.patch"
+sha256sums="3e4243e14001f47b8842f72287728b731f8b62b480bd72a1b0e2a9cfe25dce6d  qtwebkit-opensource-src-5.4.2.tar.xz
 51c0e843c5c6453526ee51ed69f2d4a7959767621da321f1082985dfe9f001ef  pic.patch
 b3e52d54fae9588d908289b53dda6042b59ab133cd8c301f4de23c0ee8dc2c01  fix-rpath.patch
-d8f6c84cf1a98174aa16660a422cd7b248a012e60bf37a9b5013f2bc61b6d63e  fix-execinfo.patch
-70a8f46cf88c2086afdb8a3c1fdb820210aa0611f2c3fbeca6da275a0701e0c3  qtwebkit-opensource-src-5.4.0-mutexlocker.patch"
-sha512sums="592a3ebccb4578eb0183d1ecd5aae69c7f03482aa09594fc06f58e2c2b82b5e916e1e951012fc1c8e0cea803c4d3e6db64fad41bbca70eb18b8d9d3ff2eab828  qtwebkit-opensource-src-5.4.1.tar.xz
+d8f6c84cf1a98174aa16660a422cd7b248a012e60bf37a9b5013f2bc61b6d63e  fix-execinfo.patch"
+sha512sums="edb0a8ad63f70d85324af08f46070cc386fd27ff858f590a592f71583cddade897b305527ec3bb8d7a4d491c9d141af04d783ea101e6c40f683df16297652ff3  qtwebkit-opensource-src-5.4.2.tar.xz
 9a62a5e7af91c44311b517608262f88b5bc607e75dc5878dd08b0a0872ec03fb7a566df0a41413f7e60beb1b9880e24f084b90c38ed50d4219ec2ad6af9bd62f  pic.patch
 00d59c0cdb58ae8e7cf6bc3d03f133697e74c267ccebe12238bcdc274d4c90210b82c2d8bdf0e949cd43da13a4fd8a4c35fb54a00ed5102a4ac4d23aa002d0fe  fix-rpath.patch
-f17c2f4b90090c8f12e4ba1f2cbd7a9f496c8de024ba6e0d55b98e5b89ab89298aff84f39e81905e0491fe6bd11544633a8b191403a866e16ed654d44cf8dc6f  fix-execinfo.patch
-e9b798bfd991eaa7247a92703467c581ee497602e630e5840d4306501f0e1195ed8ae4d20a76e5721ddae22c75c94fce2f1a96e49beae6e8bc865ad762950632  qtwebkit-opensource-src-5.4.0-mutexlocker.patch"
+f17c2f4b90090c8f12e4ba1f2cbd7a9f496c8de024ba6e0d55b98e5b89ab89298aff84f39e81905e0491fe6bd11544633a8b191403a866e16ed654d44cf8dc6f  fix-execinfo.patch"
diff --git a/main/qt5-qtwebkit/qtwebkit-opensource-src-5.4.0-mutexlocker.patch b/main/qt5-qtwebkit/qtwebkit-opensource-src-5.4.0-mutexlocker.patch
deleted file mode 100644
index 2ad951dc8b..0000000000
--- a/main/qt5-qtwebkit/qtwebkit-opensource-src-5.4.0-mutexlocker.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-diff -up qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.than qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
---- qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.than	2015-02-17 15:22:29.921309725 +0100
-+++ qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp	2015-02-17 15:26:05.340557547 +0100
-@@ -354,7 +354,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;
-     }
-@@ -376,7 +376,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);
-@@ -429,7 +429,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;
- 
-@@ -493,7 +493,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;
- 
-@@ -584,7 +584,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");
-@@ -615,7 +615,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;
-@@ -623,7 +623,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;
-@@ -668,7 +668,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;
- }
-@@ -683,7 +683,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;
-@@ -719,7 +719,7 @@ static const gchar* webKitWebSrcGetUri(G
-     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;
- }
-@@ -734,7 +734,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;
-@@ -772,7 +772,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;
-@@ -793,7 +793,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;
-     }
-@@ -807,7 +807,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;
-@@ -828,7 +828,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;
-     }
-@@ -842,7 +842,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;
-@@ -860,7 +860,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;
- 
-@@ -879,7 +879,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;
-     s_cachedResourceLoader = player->cachedResourceLoader();
- }
-@@ -906,7 +906,7 @@ char* StreamingClient::createReadBuffer(
-     mapGstBuffer(buffer);
- #endif
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     priv->buffer = adoptGRef(buffer);
-     locker.unlock();
- 
-@@ -921,7 +921,7 @@ void StreamingClient::handleResponseRece
- 
-     GST_DEBUG_OBJECT(src, "Received response: %d", response.httpStatusCode());
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- 
-     // If we seeked we need 206 == PARTIAL_CONTENT
-     if (priv->requestedOffset && response.httpStatusCode() != 206) {
-@@ -1020,7 +1020,7 @@ void StreamingClient::handleDataReceived
-     WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get());
-     WebKitWebSrcPrivate* priv = src->priv;
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- 
-     GST_LOG_OBJECT(src, "Have %d bytes of data", priv->buffer ? getGstBufferSize(priv->buffer.get()) : length);
- 
-@@ -1074,7 +1074,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);
-@@ -1210,7 +1210,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.set(g_strdup(src->priv->uri));
-     locker.unlock();
- 
-@@ -1224,7 +1224,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.set(g_strdup(src->priv->uri));
-     locker.unlock();
-