tpopela pushed to webkitgtk3 (master). "Update to 2.4.9"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed May 20 11:55:09 UTC 2015
From f13611ff0e60a07be75a656f704bbeb5144b43b1 Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela at redhat.com>
Date: Wed, 20 May 2015 13:54:24 +0200
Subject: Update to 2.4.9
diff --git a/sources b/sources
index a69c671..1f8355d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bcdcef8e1ba28dbd5bb05f86c79f76b8 webkitgtk-2.4.8.tar.xz
+312fd29eb7f5970660c6a64b8bf8420e webkitgtk-2.4.9.tar.xz
diff --git a/webkitgtk-2.4.8-g_object_destroyed.patch b/webkitgtk-2.4.8-g_object_destroyed.patch
deleted file mode 100644
index 479f1de..0000000
--- a/webkitgtk-2.4.8-g_object_destroyed.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/Source/WebCore/bindings/gobject/GObjectEventListener.cpp b/Source/WebCore/bindings/gobject/GObjectEventListener.cpp
-index 76cf279..9d1b881 100644
---- a/Source/WebCore/bindings/gobject/GObjectEventListener.cpp
-+++ b/Source/WebCore/bindings/gobject/GObjectEventListener.cpp
-@@ -52,12 +52,13 @@ void GObjectEventListener::gobjectDestroyed()
- {
- ASSERT(m_coreTarget);
-
-- // We must set m_coreTarget to null, because removeEventListener
-- // may call the destructor as a side effect and we must be in the
-- // proper state to prevent g_object_weak_unref.
-- EventTarget* target = m_coreTarget;
-+ // Protect 'this' class in case the 'm_coreTarget' holds the last reference,
-+ // which may cause, inside removeEventListener(), free of this object
-+ // and later use-after-free with the m_handler = 0; assignment.
-+ RefPtr<GObjectEventListener> protect(this);
-+
-+ m_coreTarget->removeEventListener(m_domEventName.data(), this, m_capture);
- m_coreTarget = 0;
-- target->removeEventListener(m_domEventName.data(), this, m_capture);
- m_handler = 0;
- }
-
diff --git a/webkitgtk-2.4.8-gcc5.patch b/webkitgtk-2.4.8-gcc5.patch
deleted file mode 100644
index 73f6855..0000000
--- a/webkitgtk-2.4.8-gcc5.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4.gcc5 webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4
---- webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4.gcc5 2015-01-07 10:45:43.000000000 +0100
-+++ webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4 2015-02-18 13:09:57.359888184 +0100
-@@ -87,12 +87,12 @@ AC_SYS_LARGEFILE
- c_compiler="unknown"
- AC_LANG_PUSH([C])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
--#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
-+#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
- #error Not a supported GCC compiler
- #endif
- ])], [c_compiler="gcc"], [])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
--#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3)
-+#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3)))))
- #error Not a supported Clang compiler
- #endif
- ])], [c_compiler="clang"], [])
-@@ -106,12 +106,12 @@ fi
- cxx_compiler="unknown"
- AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
--#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
-+#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
- #error Not a supported G++ compiler
- #endif
- ])], [cxx_compiler="g++"], [])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
--#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3)
-+#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3)))))
- #error Not a supported Clang++ compiler
- #endif
- ])], [cxx_compiler="clang++"], [])
diff --git a/webkitgtk-2.4.8-gmutexlocker.patch b/webkitgtk-2.4.8-gmutexlocker.patch
deleted file mode 100644
index 226da3d..0000000
--- a/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
diff --git a/webkitgtk-2.4.8-plugin_none.patch b/webkitgtk-2.4.8-plugin_none.patch
deleted file mode 100644
index 19ae387..0000000
--- a/webkitgtk-2.4.8-plugin_none.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -up webkitgtk-2.4.8/Source/WebCore/GNUmakefile.list.am.plugin_none webkitgtk-2.4.8/Source/WebCore/GNUmakefile.list.am
---- webkitgtk-2.4.8/Source/WebCore/GNUmakefile.list.am.plugin_none 2015-01-08 11:08:03.261853581 +0100
-+++ webkitgtk-2.4.8/Source/WebCore/GNUmakefile.list.am 2015-01-08 11:08:53.650619552 +0100
-@@ -6254,9 +6254,11 @@ endif # END USE_GLX
- endif # END TARGET_X11
-
- if TARGET_WAYLAND
-+if ENABLE_WEBKIT2
- webcore_sources += \
- Source/WebCore/plugins/PluginPackageNone.cpp \
- Source/WebCore/plugins/PluginViewNone.cpp
-+endif # END ENABLE_WEBKIT2
- endif # END TARGET_WAYLAND
-
- if TARGET_X11_OR_WAYLAND
-@@ -6305,9 +6307,11 @@ webcoregtk_sources += \
- endif # END TARGET_WIN32
-
- if TARGET_QUARTZ
-+if ENABLE_WEBKIT2
- webcore_sources += \
- Source/WebCore/plugins/PluginPackageNone.cpp \
- Source/WebCore/plugins/PluginViewNone.cpp
-+endif # END ENABLE_WEBKIT2
- platformgtk_sources += \
- Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
- Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
diff --git a/webkitgtk-aarch64.patch b/webkitgtk-aarch64.patch
index 7272bc1..6a82264 100644
--- a/webkitgtk-aarch64.patch
+++ b/webkitgtk-aarch64.patch
@@ -1,19 +1,19 @@
-diff -up webkitgtk-2.4.5/Source/WTF/wtf/dtoa/utils.h.aarch64 webkitgtk-2.4.5/Source/WTF/wtf/dtoa/utils.h
---- webkitgtk-2.4.5/Source/WTF/wtf/dtoa/utils.h.aarch64 2014-09-02 11:39:15.782812173 +0200
-+++ webkitgtk-2.4.5/Source/WTF/wtf/dtoa/utils.h 2014-09-02 11:41:23.022637099 +0200
+diff -up webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h.aarch64 webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h
+--- webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h.aarch64 2015-05-20 11:03:24.000000000 +0200
++++ webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h 2015-05-20 13:45:35.629023925 +0200
@@ -49,7 +49,7 @@
defined(__ARMEL__) || \
defined(_MIPS_ARCH_MIPS32R2)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
--#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
-+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(AARCH64) || CPU(HPPA)
+-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
++#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(AARCH64) || CPU(HPPA)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif defined(_M_IX86) || defined(__i386__)
#if defined(_WIN32)
-diff -up webkitgtk-2.4.5/Source/WTF/wtf/Platform.h.aarch64 webkitgtk-2.4.5/Source/WTF/wtf/Platform.h
---- webkitgtk-2.4.5/Source/WTF/wtf/Platform.h.aarch64 2014-08-25 14:50:32.000000000 +0200
-+++ webkitgtk-2.4.5/Source/WTF/wtf/Platform.h 2014-09-02 11:40:40.925033307 +0200
-@@ -331,6 +331,14 @@
+diff -up webkitgtk-2.4.9/Source/WTF/wtf/Platform.h.aarch64 webkitgtk-2.4.9/Source/WTF/wtf/Platform.h
+--- webkitgtk-2.4.9/Source/WTF/wtf/Platform.h.aarch64 2015-05-20 11:03:24.000000000 +0200
++++ webkitgtk-2.4.9/Source/WTF/wtf/Platform.h 2015-05-20 13:47:34.439861401 +0200
+@@ -334,6 +334,14 @@
#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
#endif
@@ -28,13 +28,12 @@ diff -up webkitgtk-2.4.5/Source/WTF/wtf/Platform.h.aarch64 webkitgtk-2.4.5/Sourc
/* ==== OS() - underlying operating system; only to be used for mandated low-level services like
virtual memory, not to choose a GUI toolkit ==== */
-@@ -656,7 +664,8 @@
- || CPU(ARM64) \
+@@ -654,7 +662,7 @@
+ #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
+ || (CPU(IA64) && !CPU(IA64_32)) \
+ || CPU(ALPHA) \
+- || CPU(ARM64) \
++ || CPU(AARCH64) \
|| CPU(S390X) \
+ || CPU(MIPS64) \
|| CPU(PPC64) \
-- || CPU(PPC64LE)
-+ || CPU(PPC64LE) \
-+ || CPU(AARCH64)
- #define WTF_USE_JSVALUE64 1
- #else
- #define WTF_USE_JSVALUE32_64 1
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index d221a88..ec12040 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -9,8 +9,8 @@
cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g')
Name: webkitgtk3
-Version: 2.4.8
-Release: 9%{?dist}
+Version: 2.4.9
+Release: 1%{?dist}
Summary: GTK+ Web content engine library
Group: Development/Libraries
@@ -24,16 +24,8 @@ Patch1: webkitgtk-aarch64.patch
Patch2: webkitgtk-2.4.1-cloop_fix.patch
Patch3: webkitgtk-2.4.5-cloop_fix_32.patch
Patch4: webkitgtk-2.4.1-ppc64_align.patch
-# https://bugs.webkit.org/show_bug.cgi?id=140241
-Patch5: webkitgtk-2.4.8-plugin_none.patch
-# https://bugs.webkit.org/show_bug.cgi?id=126324
-Patch6: webkitgtk-2.4.8-gcc5.patch
-# https://bugs.webkit.org/show_bug.cgi?id=141381
-Patch7: webkitgtk-2.4.8-gmutexlocker.patch
# https://bugs.webkit.org/show_bug.cgi?id=142074
-Patch8: webkitgtk-2.4.8-user-agent.patch
-#https://bugs.webkit.org/show_bug.cgi?id=127474
-Patch9: webkitgtk-2.4.8-g_object_destroyed.patch
+Patch5: webkitgtk-2.4.8-user-agent.patch
BuildRequires: at-spi2-core-devel
BuildRequires: bison
@@ -101,11 +93,7 @@ This package contains developer documentation for %{name}.
%patch0 -p1 -b .nspluginwrapper
%patch1 -p1 -b .aarch64
%patch2 -p1 -b .cloop_fix
-%patch5 -p1 -b .plugin_none
-%patch6 -p1 -b .gcc5
-%patch7 -p1 -b .gmutex_locker
-%patch8 -p1 -b .user_agent
-%patch9 -p1 -b .g_object_destroyed
+%patch5 -p1 -b .user_agent
%ifarch ppc s390
%patch3 -p1 -b .cloop_fix_32
%endif
@@ -113,11 +101,6 @@ This package contains developer documentation for %{name}.
%patch4 -p1 -b .ppc64_align
%endif
-# Remove when 2.4.9 will be released
-# Needed for https://bugs.webkit.org/show_bug.cgi?id=140241
-# Regenerate configure to pick up the gcc 5.0 changes
-autoreconf -v
-
%build
# Use linker flags to reduce memory consumption
%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
@@ -224,6 +207,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
%{_datadir}/gtk-doc/html/webkitdomgtk
%changelog
+* Wed May 20 2015 Tomas Popela <tpopela at redhat.com> - 2.4.9-1
+- Update to 2.4.9
+
* Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 2.4.8-9
- Rebuilt for GCC 5 C++11 ABI change
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/webkitgtk3.git/commit/?h=master&id=f13611ff0e60a07be75a656f704bbeb5144b43b1
More information about the scm-commits
mailing list