rdieter pushed to qt5-qtwebkit (el6). "Merge branch 'master' into f22"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 10 19:44:37 UTC 2015
>From 0980ac063fe9c848f626d5ab5cfaa48282f4f96a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 20 Mar 2015 08:08:00 -0500
Subject: rename gcc5.patch
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<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(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-gcc5.patch b/qt5-qtwebkit-gcc5.patch
new file mode 100644
index 0000000..e00accd
--- /dev/null
+++ b/qt5-qtwebkit-gcc5.patch
@@ -0,0 +1,14 @@
+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<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(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 849bf11..716c1f7 100644
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -52,7 +52,7 @@ Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch
Patch9: qtwebkit-opensource-src-5.4.0-mutexlocker.patch
# fix gcc5 template issue
-Patch10: qt5-qtwebkit-gcc5-patch
+Patch10: qt5-qtwebkit-gcc5.patch
%if 0%{?system_angle}
BuildRequires: angleproject-devel angleproject-static
--
cgit v0.10.2
>From ae50d7df90edc20a9f7427879d39c5b176f17a56 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 23 Mar 2015 11:37:10 -0500
Subject: QtWebKit logs visited URLs to WebpageIcons.db in private browsing
mode (#1204795,#1204798)
diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index 716c1f7..7b89d15 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: 3%{?dist}
+Release: 4%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
# See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@@ -54,6 +54,10 @@ 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
@@ -132,6 +136,7 @@ BuildArch: noarch
%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
@@ -213,6 +218,9 @@ popd
%changelog
+* Mon Mar 23 2015 Rex Dieter <rdieter at fedoraproject.org> 5.4.1-4
+- QtWebKit logs visited URLs to WebpageIcons.db in private browsing mode (#1204795,#1204798)
+
* Wed Mar 18 2015 Than Ngo <than at redhat.com> - 5.4.1-3
- fix build failure with new gcc5
diff --git a/qtwebkit-opensource-src-5.4.1-private_browsing.patch b/qtwebkit-opensource-src-5.4.1-private_browsing.patch
new file mode 100644
index 0000000..5d70def
--- /dev/null
+++ b/qtwebkit-opensource-src-5.4.1-private_browsing.patch
@@ -0,0 +1,25 @@
+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 (<rdar://problem/9168605>) - 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 (<rdar://problem/9168605>) - 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());
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/qt5-qtwebkit.git/commit/?h=el6&id=dd1c688b60a40936cc815a8f4046b220ed2cc54a
More information about the scm-commits
mailing list