From 74803cd694376c2dcad8cb256d751f3aca1ca964 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 28 Aug 2013 12:36:15 -0500 Subject: [PATCH] 5.1.1 --- .gitignore | 1 + qt5-qtwebkit.spec | 26 ++--- ...memory.patch => qtwebkit-save_memory.patch | 10 +- sources | 2 +- webkit-commit-147345.patch | 105 ------------------ webkit-commit-147640.patch | 12 -- 6 files changed, 16 insertions(+), 140 deletions(-) rename qtwebkit-2.3-save_memory.patch => qtwebkit-save_memory.patch (53%) delete mode 100644 webkit-commit-147345.patch delete mode 100644 webkit-commit-147640.patch diff --git a/.gitignore b/.gitignore index 44a97fc..a5e99c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /qtwebkit-opensource-src-5.0.2.tar.xz +/qtwebkit-opensource-src-5.1.1.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index a586426..212fa0c 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -3,14 +3,14 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.0.2 -Release: 8%{?dist} +Version: 5.1.1 +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 License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://qt-project.org/ -Source0: http://releases.qt-project.org/qt5/%{version}%{?pre:-%{pre}}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +Source0: http://download.qt-project.org/official_releases/qt/5.1/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz # qt5-qtjsbackend (and qtdeclarative) supports only ix86, x86_64 and arm , and so do we here ExclusiveArch: %{ix86} x86_64 %{arm} @@ -22,10 +22,11 @@ Patch1: webkit-qtwebkit-2.2-tp1-pluginpath.patch Patch3: qtwebkit-opensource-src-5.0.1-debuginfo.patch # tweak linker flags to minimize memory usage on "small" platforms -Patch4: qtwebkit-2.3-save_memory.patch +Patch4: qtwebkit-save_memory.patch # use unbundled system angleproject library #define system_angle 1 +# NEEDS REBASE for 5.1 -- rex Patch5: qtwebkit-opensource-src-5.0.2-system_angle.patch # Fix compilation against latest ANGLE # https://bugs.webkit.org/show_bug.cgi?id=109127 @@ -34,15 +35,6 @@ Patch6: webkit-commit-142567.patch BuildRequires: angleproject-devel angleproject-static %endif -# Prevent flooding the logs with warnings about COMPILE_ASSERT -# https://bugs.webkit.org/show_bug.cgi?id=113147 -# Based on upstream commit r147640 -Patch7: webkit-commit-147640.patch - -# Prevent flooding the logs with warnings about HashMap -# https://bugs.webkit.org/show_bug.cgi?id=113454 -Patch9: webkit-commit-147345.patch - BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtdeclarative-devel >= %{version} @@ -93,13 +85,10 @@ Requires: qt5-qtdeclarative-devel%{?_isa} %patch3 -p1 -b .debuginfo %patch4 -p1 -b .save_memory %if 0%{?system_angle} -%patch5 -p1 -b .system_angle +#patch5 -p1 -b .system_angle %patch6 -p1 -b .svn142567 %endif -%patch7 -p1 -b .svn147640 -%patch9 -p1 -b .svn147345 - echo "nuke bundled code..." # nuke bundled code mkdir Source/ThirdParty/orig @@ -169,6 +158,9 @@ popd %changelog +* Wed Aug 28 2013 Rex Dieter 5.1.1-1 +- 5.1.1 + * Tue Aug 20 2013 Rex Dieter 5.0.2-8 - qt5-qtjsbackend only supports ix86, x86_64 and arm diff --git a/qtwebkit-2.3-save_memory.patch b/qtwebkit-save_memory.patch similarity index 53% rename from qtwebkit-2.3-save_memory.patch rename to qtwebkit-save_memory.patch index 6ccb158..0f5958b 100644 --- a/qtwebkit-2.3-save_memory.patch +++ b/qtwebkit-save_memory.patch @@ -1,7 +1,7 @@ -diff -up webkit-qtwebkit-23/Source/WebCore/WebCore.pri.save_memory webkit-qtwebkit-23/Source/WebCore/WebCore.pri ---- webkit-qtwebkit-23/Source/WebCore/WebCore.pri.save_memory 2013-02-15 09:46:12.000000000 -0600 -+++ webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-02-21 16:42:30.996634743 -0600 -@@ -336,6 +336,8 @@ mac { +diff -up qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri.save_memory qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri +--- qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri.save_memory 2013-08-28 11:11:19.218230963 -0500 ++++ qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri 2013-08-28 11:12:34.855410992 -0500 +@@ -296,6 +296,8 @@ mac { } unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections @@ -9,4 +9,4 @@ diff -up webkit-qtwebkit-23/Source/WebCore/WebCore.pri.save_memory webkit-qtwebk +unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--reduce-memory-overheads linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF - unix|win32-g++* { + contains(DEFINES, ENABLE_OPENCL=1) { diff --git a/sources b/sources index 84c2a5e..143a4f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -85aad9f287910c21c8464d7d1ea010a9 qtwebkit-opensource-src-5.0.2.tar.xz +70e956dafcee1969de53d4de7b4691ad qtwebkit-opensource-src-5.1.1.tar.xz diff --git a/webkit-commit-147345.patch b/webkit-commit-147345.patch deleted file mode 100644 index 6fa6a14..0000000 --- a/webkit-commit-147345.patch +++ /dev/null @@ -1,105 +0,0 @@ -Index: trunk/Source/WTF/wtf/HashMap.h -=================================================================== ---- trunk/Source/WTF/wtf/HashMap.h (revision 147344) -+++ trunk/Source/WTF/wtf/HashMap.h (revision 147345) -@@ -137,27 +137,33 @@ - AddResult inlineAdd(const KeyType&, MappedPassInReferenceType); - -- class HashMapKeysProxy : private HashMap { -+ HashTableType m_impl; -+ }; -+ -+ template -+ class HashMap::HashMapKeysProxy : -+ private HashMap { - public: -- typedef typename HashMap::iterator::Keys iterator; -- typedef typename HashMap::const_iterator::Keys const_iterator; -- -+ typedef HashMap HashMapType; -+ typedef typename HashMapType::iterator::Keys iterator; -+ typedef typename HashMapType::const_iterator::Keys const_iterator; -+ - iterator begin() - { -- return HashMap::begin().keys(); -- } -- -+ return HashMapType::begin().keys(); -+ } -+ - iterator end() - { -- return HashMap::end().keys(); -+ return HashMapType::end().keys(); - } - - const_iterator begin() const - { -- return HashMap::begin().keys(); -- } -- -+ return HashMapType::begin().keys(); -+ } -+ - const_iterator end() const - { -- return HashMap::end().keys(); -+ return HashMapType::end().keys(); - } - -@@ -170,29 +176,32 @@ - HashMapKeysProxy& operator=(const HashMapKeysProxy&); - ~HashMapKeysProxy(); -- }; -- -- class HashMapValuesProxy : private HashMap { -+ }; -+ -+ template -+ class HashMap::HashMapValuesProxy : -+ private HashMap { - public: -- typedef typename HashMap::iterator::Values iterator; -- typedef typename HashMap::const_iterator::Values const_iterator; -- -+ typedef HashMap HashMapType; -+ typedef typename HashMapType::iterator::Values iterator; -+ typedef typename HashMapType::const_iterator::Values const_iterator; -+ - iterator begin() - { -- return HashMap::begin().values(); -- } -- -+ return HashMapType::begin().values(); -+ } -+ - iterator end() - { -- return HashMap::end().values(); -+ return HashMapType::end().values(); - } - - const_iterator begin() const - { -- return HashMap::begin().values(); -- } -- -+ return HashMapType::begin().values(); -+ } -+ - const_iterator end() const - { -- return HashMap::end().values(); -+ return HashMapType::end().values(); - } - -@@ -205,7 +214,4 @@ - HashMapValuesProxy& operator=(const HashMapValuesProxy&); - ~HashMapValuesProxy(); -- }; -- -- HashTableType m_impl; - }; - diff --git a/webkit-commit-147640.patch b/webkit-commit-147640.patch deleted file mode 100644 index 3d6f704..0000000 --- a/webkit-commit-147640.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- qtwebkit-opensource-src-5.0.2/Source/WTF/wtf/Compiler.h.static_assert 2013-05-18 00:27:58.755311019 +0200 -+++ qtwebkit-opensource-src-5.0.2/Source/WTF/wtf/Compiler.h 2013-05-18 00:36:49.386262802 +0200 -@@ -122,6 +122,9 @@ - - /* Specific compiler features */ - #if COMPILER(GCC) && !COMPILER(CLANG) -+#if GCC_VERSION_AT_LEAST(4, 8, 0) -+#pragma GCC diagnostic ignored "-Wunused-local-typedefs" -+#endif - #if GCC_VERSION_AT_LEAST(4, 7, 0) && defined(__cplusplus) && __cplusplus >= 201103L - #define WTF_COMPILER_SUPPORTS_CXX_RVALUE_REFERENCES 1 - #define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1