From ee7a6c63d955f0f9b89a2031a1a33ef7e68d071d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 3 Apr 2015 07:53:58 -0500 Subject: [PATCH 1/3] doc: drop dep on main pkg, not strictly required --- qt5-qtwebkit.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 7b89d15..53cde69 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -13,7 +13,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.1 -Release: 4%{?dist} +Release: 5%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -113,7 +113,6 @@ Requires: qt5-qtdeclarative-devel%{?_isa} %if 0%{?docs} %package doc Summary: API documentation for %{name} -Requires: %{name} = %{version}-%{release} # for qhelpgenerator BuildRequires: qt5-qttools-devel BuildArch: noarch @@ -218,6 +217,9 @@ popd %changelog +* Fri Apr 03 2015 Rex Dieter 5.4.1-5 +- -doc: drop dep on main pkg, not strictly required + * Mon Mar 23 2015 Rex Dieter 5.4.1-4 - QtWebKit logs visited URLs to WebpageIcons.db in private browsing mode (#1204795,#1204798) From 3af6b564a32ff87432fb0af522dbbada83e1999c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 17:15:37 +0200 Subject: [PATCH 2/3] Rebuilt for GCC 5 C++11 ABI change --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 53cde69..26155cc 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -13,7 +13,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.1 -Release: 5%{?dist} +Release: 6%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -217,6 +217,9 @@ popd %changelog +* Sat May 02 2015 Kalev Lember - 5.4.1-6 +- Rebuilt for GCC 5 C++11 ABI change + * Fri Apr 03 2015 Rex Dieter 5.4.1-5 - -doc: drop dep on main pkg, not strictly required From 654bf6ca1fffb21d1679b6873938cab595d24dd1 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 3 Jun 2015 15:25:40 +0200 Subject: [PATCH 3/3] Update to 5.4.2 --- .gitignore | 1 + qt5-qtwebkit-gcc5.patch | 14 -- qt5-qtwebkit.spec | 20 +- ...kit-opensource-src-5.4.0-mutexlocker.patch | 219 ------------------ ...pensource-src-5.4.1-private_browsing.patch | 25 -- sources | 2 +- 6 files changed, 7 insertions(+), 274 deletions(-) delete mode 100644 qt5-qtwebkit-gcc5.patch delete mode 100644 qtwebkit-opensource-src-5.4.0-mutexlocker.patch delete mode 100644 qtwebkit-opensource-src-5.4.1-private_browsing.patch diff --git a/.gitignore b/.gitignore index 83fb7cc..9590011 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /qtwebkit-opensource-src-5.4.0.tar.xz /qtwebkit-opensource-src-5.4.1.tar.xz +/qtwebkit-opensource-src-5.4.2.tar.xz diff --git a/qt5-qtwebkit-gcc5.patch b/qt5-qtwebkit-gcc5.patch deleted file mode 100644 index e00accd..0000000 --- a/qt5-qtwebkit-gcc5.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp ---- qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than 2015-03-18 10:24:38.683352327 -0400 -+++ qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp 2015-03-18 10:25:21.953352327 -0400 -@@ -1909,6 +1909,10 @@ void JSObject::putByIndexBeyondVectorLen - } - } - -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); -+ - void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage) - { - VM& vm = exec->vm(); diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 26155cc..c99ad82 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -12,8 +12,8 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.4.1 -Release: 6%{?dist} +Version: 5.4.2 +Release: 1%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -48,16 +48,6 @@ Patch7: 0001-Add-ARM-64-support.patch # truly madly deeply no rpath please, kthxbye Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch -# fix GMutexLocker build issue -Patch9: qtwebkit-opensource-src-5.4.0-mutexlocker.patch - -# fix gcc5 template issue -Patch10: qt5-qtwebkit-gcc5.patch - -# https://bugzilla.redhat.com/show_bug.cgi?id=1204795 -# https://codereview.qt-project.org/#/c/108936/ -Patch11: qtwebkit-opensource-src-5.4.1-private_browsing.patch - %if 0%{?system_angle} BuildRequires: angleproject-devel angleproject-static %endif @@ -133,9 +123,6 @@ BuildArch: noarch %endif %patch7 -p1 -b .aarch64 %patch8 -p1 -b .no_rpath -%patch9 -p1 -b .MutexLocker -%patch10 -p1 -b .gcc5-template -%patch11 -p1 -b .private_browsing echo "nuke bundled code..." # nuke bundled code @@ -217,6 +204,9 @@ popd %changelog +* Wed Jun 03 2015 Jan Grulich - 5.4.2-1 +- 5.4.2 + * Sat May 02 2015 Kalev Lember - 5.4.1-6 - Rebuilt for GCC 5 C++11 ABI change diff --git a/qtwebkit-opensource-src-5.4.0-mutexlocker.patch b/qtwebkit-opensource-src-5.4.0-mutexlocker.patch deleted file mode 100644 index 2ad951d..0000000 --- a/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(); - diff --git a/qtwebkit-opensource-src-5.4.1-private_browsing.patch b/qtwebkit-opensource-src-5.4.1-private_browsing.patch deleted file mode 100644 index 5d70def..0000000 --- a/qtwebkit-opensource-src-5.4.1-private_browsing.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up qtwebkit-opensource-src-5.4.1/Source/WebCore/loader/icon/IconController.cpp.private_browsing qtwebkit-opensource-src-5.4.1/Source/WebCore/loader/icon/IconController.cpp ---- qtwebkit-opensource-src-5.4.1/Source/WebCore/loader/icon/IconController.cpp.private_browsing 2015-02-16 22:57:04.000000000 -0600 -+++ qtwebkit-opensource-src-5.4.1/Source/WebCore/loader/icon/IconController.cpp 2015-03-23 11:29:41.688034891 -0500 -@@ -159,6 +159,10 @@ void IconController::startLoader() - } - - if (iconDatabase().supportsAsynchronousMode()) { -+ // FIXME () - We should support in-memory-only private browsing icons in asynchronous icon database mode. -+ if (m_frame->page()->settings()->privateBrowsingEnabled()) -+ return; -+ - m_frame->loader()->documentLoader()->getIconLoadDecisionForIconURL(urlString); - // Commit the icon url mapping to the database just in case we don't end up loading later. - commitToDatabase(iconURL); -@@ -202,10 +206,6 @@ void IconController::continueLoadWithDec - { - ASSERT(iconLoadDecision != IconLoadUnknown); - -- // FIXME () - We should support in-memory-only private browsing icons in asynchronous icon database mode. -- if (iconDatabase().supportsAsynchronousMode() && m_frame->page()->settings()->privateBrowsingEnabled()) -- return; -- - if (iconLoadDecision == IconLoadNo) { - KURL iconURL(url()); - String urlString(iconURL.string()); diff --git a/sources b/sources index e4687e8..d886ed8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -186627b1ea5b614811fbd0cfa9b4d073 qtwebkit-opensource-src-5.4.1.tar.xz +b711b3f32646d72cd281b3c17ab6d14e qtwebkit-opensource-src-5.4.2.tar.xz