summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main/webkitgtk/APKBUILD20
-rw-r--r--main/webkitgtk/webkitgtk-2.4.8-gmutexlocker.patch281
2 files changed, 8 insertions, 293 deletions
diff --git a/main/webkitgtk/APKBUILD b/main/webkitgtk/APKBUILD
index 92b891105..f1e8ca135 100644
--- a/main/webkitgtk/APKBUILD
+++ b/main/webkitgtk/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=webkitgtk
-pkgver=2.4.8
-pkgrel=1
+pkgver=2.4.9
+pkgrel=0
pkgdesc="portable web rendering engine WebKit for GTK+"
url="http://webkitgtk.org/"
arch="all"
@@ -51,7 +51,6 @@ source="http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz
harfbuzz.patch
fix-execinfo.patch
disallow-ctype.patch
- webkitgtk-2.4.8-gmutexlocker.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -143,24 +142,21 @@ webkitgtk2() {
"$subpkgdir"/usr/bin/ || return 1
}
-md5sums="bcdcef8e1ba28dbd5bb05f86c79f76b8 webkitgtk-2.4.8.tar.xz
+md5sums="312fd29eb7f5970660c6a64b8bf8420e webkitgtk-2.4.9.tar.xz
de77a3e7e61753e7f1cce3f4bd00a3f6 webkit-gtk-1.7.90-parallel-make-hack.patch
9ace721086b25f0f32d7f76b29789f67 webkitgtk-1.10-textrels.patch
b1f455b3ea4db1598b60f5aa59f27fd5 harfbuzz.patch
c114751c30cdcaede5a7ed5568b2b0d4 fix-execinfo.patch
-f5b41e756d2dfdc2bbee034d4f2d2e66 disallow-ctype.patch
-6f9adcee0c28708575bde0ee8e8cb340 webkitgtk-2.4.8-gmutexlocker.patch"
-sha256sums="68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23 webkitgtk-2.4.8.tar.xz
+f5b41e756d2dfdc2bbee034d4f2d2e66 disallow-ctype.patch"
+sha256sums="afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 webkitgtk-2.4.9.tar.xz
e20d7d45e6230308f7d4a7aac1095cb1fe8d9c7eb0f3e65b061acf8bc4bbaf73 webkit-gtk-1.7.90-parallel-make-hack.patch
754bbf13c7a6c9bd745f642367ff884156020dd2ea7611c3d20a509c6685c836 webkitgtk-1.10-textrels.patch
0b7c1ce7e0e8548507eed8911c73d4a06434e5ca3b84275e785013f8b04433a2 harfbuzz.patch
b2bc9e03fd5d968d6df4531a7d102496139120e666e6fed397a19ae4026751c6 fix-execinfo.patch
-6e972b5cb3f1101be646d1a018ff61c0e6614310a971eb392c4fd0fee5623455 disallow-ctype.patch
-6d960f4e73fdac121ab7b7e5acf60e5bf788e920247189ad43b24cdf6c9d6759 webkitgtk-2.4.8-gmutexlocker.patch"
-sha512sums="31b8b87142730aa27e5bd4fe85b0de2116fd492ef469592512c185d60df428a9913d6c2738ce57439bf9db10864ed9c121ddbc2a4da2f715818a70885c81c0de webkitgtk-2.4.8.tar.xz
+6e972b5cb3f1101be646d1a018ff61c0e6614310a971eb392c4fd0fee5623455 disallow-ctype.patch"
+sha512sums="5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 webkitgtk-2.4.9.tar.xz
907356faab08ebf65da8760ad11ee8ecd4e97274b1c00c1e207fd52e479d64a0545ba66859b1a79bd150a95da4a9e8724b3c461a24f803fb341b8242566b5cc0 webkit-gtk-1.7.90-parallel-make-hack.patch
c3502a11ce4777abc164209c0087ec7cb6c28b376056bee52651b4e4bd2d49f2d6e4a74422f21d9bce848479a4a1b02052935b3c9397f1d43a59b3de22ef2758 webkitgtk-1.10-textrels.patch
8eb77ed1a1c60aac44fb00cfa6ddd46a23c4701fd6a24eac901d07eb49e0191080f7410fa3801115da5448b514e5d2095a4c4072a8c1e9f8c668eebb78afe6a1 harfbuzz.patch
602630468ee80b9f9bb53ee7808f4b2f2c86d1d4db14ac9c244b3e2e79a245510a289eb321cb7dbefd3b7a2dde13cf444b8ecf7cd46f23eaa5c0f04670914e42 fix-execinfo.patch
-40a213548d4f76152d2cae57c15c6fb079b64a681a2b033b0c8265c5dbe2653818c898d1ac76ae59298cbf568dc4b811f86c3913e9d2c3d3f33e5cb8c1bd217e disallow-ctype.patch
-4fb83ac95ca8eea21469d3f1ab222df0287d4088e231dcf3b38d21dfe84af973f4af34e7754fe4be50c82d07d853c280ad6695cbebc0a7f007cdabf20c3ad932 webkitgtk-2.4.8-gmutexlocker.patch"
+40a213548d4f76152d2cae57c15c6fb079b64a681a2b033b0c8265c5dbe2653818c898d1ac76ae59298cbf568dc4b811f86c3913e9d2c3d3f33e5cb8c1bd217e disallow-ctype.patch"
diff --git a/main/webkitgtk/webkitgtk-2.4.8-gmutexlocker.patch b/main/webkitgtk/webkitgtk-2.4.8-gmutexlocker.patch
deleted file mode 100644
index 226da3d2b..000000000
--- a/main/webkitgtk/webkitgtk-2.4.8-gmutexlocker.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-diff -up webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.gmutexlocker webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
---- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.gmutexlocker 2015-02-18 15:40:21.851816374 +0100
-+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-02-18 15:45:58.560092191 +0100
-@@ -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;
-
-diff -up webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp.gmutexlocker webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
-diff -up webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.gmutexlocker webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
---- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.gmutexlocker 2015-02-18 15:16:11.995228731 +0100
-+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-02-18 15:45:42.686843477 +0100
-@@ -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;
- }
-diff -up webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.gmutexlocker webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
---- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.gmutexlocker 2015-02-18 15:16:40.954678407 +0100
-+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-02-18 15:45:19.567481225 +0100
-@@ -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();
-
-diff -up webkitgtk-2.4.8/Source/WTF/wtf/gobject/GMutexLocker.h.gmutexlocker webkitgtk-2.4.8/Source/WTF/wtf/gobject/GMutexLocker.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 09:26:28 +0000