rpms/qt5-qtwebkit
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

5.1.1

Browse Source
This commit is contained in:
Rex Dieter 2013-08-28 12:36:15 -05:00
parent 8a33448ee0
commit 74803cd694
6 changed files with 16 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
/qtwebkit-opensource-src-5.0.2.tar.xz /qtwebkit-opensource-src-5.0.2.tar.xz
/qtwebkit-opensource-src-5.1.1.tar.xz

26
qt5-qtwebkit.spec
View File

@ -3,14 +3,14 @@
Summary: Qt5 - QtWebKit components Summary: Qt5 - QtWebKit components
Name: qt5-qtwebkit Name: qt5-qtwebkit
Version: 5.0.2 Version: 5.1.1
Release: 8%{?dist} Release: 1%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
# See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://qt-project.org/ 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 # qt5-qtjsbackend (and qtdeclarative) supports only ix86, x86_64 and arm , and so do we here
ExclusiveArch: %{ix86} x86_64 %{arm} 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 Patch3: qtwebkit-opensource-src-5.0.1-debuginfo.patch
# tweak linker flags to minimize memory usage on "small" platforms # 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 # use unbundled system angleproject library
#define system_angle 1 #define system_angle 1
# NEEDS REBASE for 5.1 -- rex
Patch5: qtwebkit-opensource-src-5.0.2-system_angle.patch Patch5: qtwebkit-opensource-src-5.0.2-system_angle.patch
# Fix compilation against latest ANGLE # Fix compilation against latest ANGLE
# https://bugs.webkit.org/show_bug.cgi?id=109127 # https://bugs.webkit.org/show_bug.cgi?id=109127
@ -34,15 +35,6 @@ Patch6: webkit-commit-142567.patch
BuildRequires: angleproject-devel angleproject-static BuildRequires: angleproject-devel angleproject-static
%endif %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-qtbase-devel >= %{version}
BuildRequires: qt5-qtdeclarative-devel >= %{version} BuildRequires: qt5-qtdeclarative-devel >= %{version}
@ -93,13 +85,10 @@ Requires: qt5-qtdeclarative-devel%{?_isa}
%patch3 -p1 -b .debuginfo %patch3 -p1 -b .debuginfo
%patch4 -p1 -b .save_memory %patch4 -p1 -b .save_memory
%if 0%{?system_angle} %if 0%{?system_angle}
%patch5 -p1 -b .system_angle #patch5 -p1 -b .system_angle
%patch6 -p1 -b .svn142567 %patch6 -p1 -b .svn142567
%endif %endif
%patch7 -p1 -b .svn147640
%patch9 -p1 -b .svn147345
echo "nuke bundled code..." echo "nuke bundled code..."
# nuke bundled code # nuke bundled code
mkdir Source/ThirdParty/orig mkdir Source/ThirdParty/orig
@ -169,6 +158,9 @@ popd
%changelog %changelog
* Wed Aug 28 2013 Rex Dieter <rdieter@fedoraproject.org> 5.1.1-1
- 5.1.1
* Tue Aug 20 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.2-8 * Tue Aug 20 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.2-8
- qt5-qtjsbackend only supports ix86, x86_64 and arm - qt5-qtjsbackend only supports ix86, x86_64 and arm

10
qtwebkit-2.3-save_memory.patch → qtwebkit-save_memory.patch
View File

@ -1,7 +1,7 @@
diff -up webkit-qtwebkit-23/Source/WebCore/WebCore.pri.save_memory webkit-qtwebkit-23/Source/WebCore/WebCore.pri diff -up qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri.save_memory qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri
--- webkit-qtwebkit-23/Source/WebCore/WebCore.pri.save_memory 2013-02-15 09:46:12.000000000 -0600 --- qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri.save_memory 2013-08-28 11:11:19.218230963 -0500
+++ webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-02-21 16:42:30.996634743 -0600 +++ qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri 2013-08-28 11:12:34.855410992 -0500
@@ -336,6 +336,8 @@ mac { @@ -296,6 +296,8 @@ mac {
} }
unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections
unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-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 +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 linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
unix|win32-g++* { contains(DEFINES, ENABLE_OPENCL=1) {

2
sources
View File

@ -1 +1 @@
85aad9f287910c21c8464d7d1ea010a9 qtwebkit-opensource-src-5.0.2.tar.xz 70e956dafcee1969de53d4de7b4691ad qtwebkit-opensource-src-5.1.1.tar.xz

105
webkit-commit-147345.patch
View File

@ -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<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg>
+ class HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>::HashMapKeysProxy :
+ private HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg> {
public:
- typedef typename HashMap::iterator::Keys iterator;
- typedef typename HashMap::const_iterator::Keys const_iterator;
-
+ typedef HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg> 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<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg>
+ class HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>::HashMapValuesProxy :
+ private HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg> {
public:
- typedef typename HashMap::iterator::Values iterator;
- typedef typename HashMap::const_iterator::Values const_iterator;
-
+ typedef HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg> 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;
};

12
webkit-commit-147640.patch
View File

@ -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