$ git diff --patch-with-stat --summary f166f4a10175a25895a92faa793a3db941f777c6..becfefa136eaff308f9f9e37a36b028792895f9b
.abf.yml | 2 +-
0001-Add-ARM-64-support.patch | 13 --
03_hide_std_symbols.diff | 28 ---
link-qtcore.patch | 16 --
qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch | 12 ++
qt5-qtwebkit.spec | 153 +++++++------
...212.0-alpha2-fix-null-pointer-dereference.patch | 15 ++
qtwebkit-5.212.0_cmake_cmp0071.patch | 32 +++
qtwebkit-5.212.0_fix_missing_sources.patch | 20 ++
qtwebkit-5.4.2-system-leveldb.patch | 25 ---
qtwebkit-5.5.1-lto.patch | 236 ---------------------
qtwebkit-opensource-src-5.0.1-debuginfo.patch | 80 -------
qtwebkit-opensource-src-5.2.0-save_memory.patch | 12 --
qtwebkit-opensource-src-5.2.1-no_rpath.patch | 12 --
14 files changed, 151 insertions(+), 505 deletions(-)
delete mode 100644 0001-Add-ARM-64-support.patch
delete mode 100644 03_hide_std_symbols.diff
delete mode 100644 link-qtcore.patch
create mode 100644 qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch
create mode 100644 qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch
create mode 100644 qtwebkit-5.212.0_cmake_cmp0071.patch
create mode 100644 qtwebkit-5.212.0_fix_missing_sources.patch
delete mode 100644 qtwebkit-5.4.2-system-leveldb.patch
delete mode 100644 qtwebkit-5.5.1-lto.patch
delete mode 100644 qtwebkit-opensource-src-5.0.1-debuginfo.patch
delete mode 100644 qtwebkit-opensource-src-5.2.0-save_memory.patch
delete mode 100644 qtwebkit-opensource-src-5.2.1-no_rpath.patch
diff --git a/.abf.yml b/.abf.yml
index 269ff55..42118a2 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- qtwebkit-opensource-src-5.8.0.tar.xz: 79d898f0e447039fb9f12b2f798a0aedf071ea82
+ qtwebkit-5.212.0-alpha2.tar.xz: 6a361cc3f3b7ab1d35955bafe20fbbae61bc80c8
diff --git a/0001-Add-ARM-64-support.patch b/0001-Add-ARM-64-support.patch
deleted file mode 100644
index 73f5c97..0000000
--- a/0001-Add-ARM-64-support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
-index 4594ec8..639f28f 100644
---- a/Source/WTF/wtf/Platform.h
-+++ b/Source/WTF/wtf/Platform.h
-@@ -342,7 +342,7 @@
- #endif
- #endif
-
--#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64)
-+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64) || CPU(AARCH64)
- #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
- #endif
-
diff --git a/03_hide_std_symbols.diff b/03_hide_std_symbols.diff
deleted file mode 100644
index b881ac7..0000000
--- a/03_hide_std_symbols.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Modestas Vainius <modax@debian.org>
-SUbject: Make hide_symbols to cover all QtWebKit portions
-Origin: vendor
-Author: Timo Jyrinki <timo@debian.org>
-Last-Update: 2013-01-28 (use a similar patch on Qt 5)
-Forwarded: no
-
-Almost everything in Source/WebCore/generated was not build with
--fvisibility=hidden resulting into redundantly polluted and huge dynamic symbol
-list in libQtWebKit.so.
-
-Therefore, move +hide_symbols configuration parameter upwards in order for it
-to cover everything including the offending Source/WebCore/CodeGenerators.pri
-
---- a/Source/QtWebKit.pro 2012-12-18 19:04:43.000000000 +0000
-+++ b/Source/QtWebKit.pro 2013-01-28 08:25:56.342911517 +0000
-@@ -7,6 +7,11 @@
- TEMPLATE = subdirs
- CONFIG += ordered
-
-+CONFIG(release):!CONFIG(standalone_package) {
-+ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-+ unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
-+}
-+
- api.file = api.pri
- SUBDIRS += api
-
diff --git a/link-qtcore.patch b/link-qtcore.patch
deleted file mode 100644
index 4fb73ef..0000000
--- a/link-qtcore.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- qtwebkit-opensource-src-5.6.0/Source/JavaScriptCore/LLIntOffsetsExtractor.pro.0005~ 2016-03-24 12:18:23.627303498 +0100
-+++ qtwebkit-opensource-src-5.6.0/Source/JavaScriptCore/LLIntOffsetsExtractor.pro 2016-03-24 12:19:28.706770081 +0100
-@@ -13,12 +13,7 @@ debug_and_release {
- CONFIG += build_all
- }
-
--# Don't try to link against any Qt libraries, but at least
--# pull in include paths as we include qglobal.h.
--INCLUDEPATH += $$QT.core.includes
--DEFINES += QT_NO_VERSION_TAGGING
--CONFIG += console
--CONFIG -= qt
-+QT = core # Needed for qglobal.h
-
- defineTest(addIncludePaths) {
- # Just needed for include paths
diff --git a/qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch b/qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch
new file mode 100644
index 0000000..0837b91
--- /dev/null
+++ b/qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch
@@ -0,0 +1,12 @@
+diff -Naur qtwebkit/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp qtwebkit.new/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
+--- qtwebkit/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp 2017-10-23 17:25:58.941518553 +0200
++++ qtwebkit.new/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp 2017-10-23 17:27:44.223917497 +0200
+@@ -961,6 +961,8 @@
+ FrameView* view = frame->view();
+ ASSERT(view);
+ view->resize(size);
++ if (view->needsLayout())
++ view->layout();
+ view->adjustViewSize();
+ }
+
diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index 5b56e58..6737cb7 100644
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -3,7 +3,7 @@
%define qtminor %(echo %{version} |cut -d. -f2)
%define qtsubminor %(echo %{version} |cut -d. -f3)
-%define beta %{nil}
+%define beta alpha2
%define major_private 1
@@ -20,43 +20,53 @@
%define _disable_lto 1
Name: qt5-qtwebkit
-Version: 5.8.0
+Version: 5.212.0
%if "%{beta}" != ""
Release: 0.%{beta}.1
-%define qttarballdir qtwebkit-opensource-src-%{version}-%{beta}
+%define qttarballdir qtwebkit-%{version}-%{beta}
+# qtwebkit-opensource-src-5.212.0-alpha2.tar.xz
+# qtwebkit-5.212.0-alpha2.tar.xz
Source0: http://download.qt.io/community_releases/%(echo %{version}|cut -d. -f1-2)/%{version}-%{beta}/%{qttarballdir}.tar.xz
%else
Release: 1
-%define qttarballdir qtwebkit-opensource-src-%{version}
+%define qttarballdir qtwebkit-%{version}
Source0: http://download.qt.io/community_releases/%(echo %{version}|cut -d. -f1-2)/%{version}-final/%{qttarballdir}.tar.xz
%endif
Summary: Qt GUI toolkit
Group: Development/KDE and Qt
License: LGPLv2 with exceptions or GPLv3 with exceptions and GFDL
URL: http://www.qt.io
-Patch0: 0001-Add-ARM-64-support.patch
-Patch1: qtwebkit-5.4.2-system-leveldb.patch
-Patch2: qtwebkit-opensource-src-5.0.1-debuginfo.patch
-# (tpg) -reduce-memory-overheads is ld.gold specific so remove it from below patch
-Patch3: qtwebkit-opensource-src-5.2.0-save_memory.patch
-Patch4: 03_hide_std_symbols.diff
-#Patch5: link-qtcore.patch
-# Still kept in the repository so we can re-enable it when we re-enable LTO
-#Patch6: qtwebkit-5.5.1-lto.patch
-Patch7: qtwebkit-opensource-src-5.2.1-no_rpath.patch
+
+# Upstream patch to fix pagewidth issue with trojita
+# https://github.com/annulen/webkit/issues/511
+# https://github.com/annulen/webkit/commit/6faf11215e1af27d35e921ae669aa0251a01a1ab
+# https://github.com/annulen/webkit/commit/76420459a13d9440b41864c93cb4ebb404bdab55
+Patch0: qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch
+
+# Patch from Kevin Kofler to fix https://github.com/annulen/webkit/issues/573
+Patch1: qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch
+
+# Patch for new CMake policy CMP0071 to explicitly use old behaviour.
+Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch
+
+# Patch to fix for missing source file.
+Patch3: qtwebkit-5.212.0_fix_missing_sources.patch
+
BuildRequires: qmake5
-BuildRequires: pkgconfig(Qt5Core) >= %{version}
-BuildRequires: pkgconfig(Qt5Gui) >= %{version}
-BuildRequires: pkgconfig(Qt5Network) >= %{version}
-BuildRequires: pkgconfig(Qt5Sql) >= %{version}
-BuildRequires: pkgconfig(Qt5Quick) >= %{version}
-BuildRequires: qt5-qtquick-private-devel >= %{version}
-BuildRequires: pkgconfig(Qt5Qml) >= %{version}
-BuildRequires: pkgconfig(Qt5OpenGL) >= %{version}
+BuildRequires: cmake
+BuildRequires: qt5-macros
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Network)
+BuildRequires: pkgconfig(Qt5Sql)
+BuildRequires: pkgconfig(Qt5Quick)
+BuildRequires: qt5-qtquick-private-devel
+BuildRequires: pkgconfig(Qt5Qml)
+BuildRequires: pkgconfig(Qt5OpenGL)
# fix me
-#BuildRequires: pkgconfig(Qt5Declarative) >= %{version}
-BuildRequires: pkgconfig(Qt5Widgets) >= %{version}
-BuildRequires: pkgconfig(Qt5PrintSupport) >= %{version}
+#BuildRequires: pkgconfig(Qt5Declarative)
+BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(gstreamer-app-1.0)
@@ -66,6 +76,12 @@ BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
BuildRequires: pkgconfig(gstreamer-video-1.0)
BuildRequires: pkgconfig(gstreamer-audio-1.0)
BuildRequires: pkgconfig(leveldb)
+BuildRequires: cmake(Qt5Test)
+BuildRequires: cmake(Qt5QuickTest)
+BuildRequires: cmake(Qt5Positioning)
+BuildRequires: cmake(Qt5Sensors)
+BuildRequires: cmake(Qt5WebChannel)
+BuildRequires: hyphen-devel
BuildRequires: bison
BuildRequires: flex
BuildRequires: gperf
@@ -84,8 +100,11 @@ BuildRequires: icu-devel
Qt WebKit library is an open source web browser engine.
%files
-%{_qt5_prefix}/libexec/QtWebProcess
-%{_qt5_prefix}/qml/QtWebKit
+%{_libdir}/libexec/QtWebProcess
+%{_libdir}/libexec/QtWebDatabaseProcess
+%{_libdir}/libexec/QtWebNetworkProcess
+%{_libdir}/libexec/QtWebPluginProcess
+%{_qt5_libdir}/qml/QtWebKit
#------------------------------------------------------------------------------
@@ -112,11 +131,10 @@ Devel files needed to build apps based on QtWebKitWidgets.
%files -n %{qtwebkitwidgetsd}
%{_qt5_libdir}/libQt5WebKitWidgets.so
-%{_qt5_libdir}/libQt5WebKitWidgets.prl
%{_qt5_libdir}/pkgconfig/Qt5WebKitWidgets.pc
-%{_qt5_includedir}/QtWebKitWidgets
-%exclude %{_qt5_includedir}/QtWebKitWidgets/%version
-%{_qt5_prefix}/mkspecs/modules/qt_lib_webkitwidgets.pri
+%{_includedir}/QtWebKitWidgets
+%exclude %{_includedir}/QtWebKitWidgets/%version
+%{_prefix}/mkspecs/modules/qt_lib_webkitwidgets.pri
%{_qt5_libdir}/cmake/Qt5WebKitWidgets
#------------------------------------------------------------------------------
@@ -130,8 +148,7 @@ Requires: %{qtwebkitwidgetsd} = %version
Devel files needed to build apps based on QtWebKitWidgets.
%files -n %{qtwebkitwidgets_p_d}
-%{_qt5_includedir}/QtWebKitWidgets/%version
-%{_qt5_prefix}/mkspecs/modules/qt_lib_webkitwidgets_private.pri
+%{_includedir}/QtWebKitWidgets/%version
#------------------------------------------------------------------------------
@@ -157,12 +174,11 @@ Devel files needed to build apps based on QtWebKitWidgets.
%files -n %{qtwebkitd}
%{_qt5_libdir}/libQt5WebKit.so
-%{_qt5_libdir}/libQt5WebKit.prl
%{_qt5_libdir}/pkgconfig/Qt5WebKit.pc
-%{_qt5_includedir}/QtWebKit
-%exclude %{_qt5_includedir}/QtWebKit/%version
-%{_qt5_prefix}/mkspecs/modules/qt_lib_webkit.pri
%{_qt5_libdir}/cmake/Qt5WebKit
+%{_includedir}/QtWebKit
+%exclude %{_includedir}/QtWebKit/%version
+%{_prefix}/mkspecs/modules/qt_lib_webkit.pri
#------------------------------------------------------------------------------
@@ -176,8 +192,8 @@ Provides: qt5-qtwebkit-private-devel = %version
Devel files needed to build apps based on QtWebKitWidgets.
%files -n %{qtwebkit_p_d}
-%{_qt5_includedir}/QtWebKit/%version
-%{_qt5_prefix}/mkspecs/modules/qt_lib_webkit_private.pri
+%{_includedir}/QtWebKit/%version
+
#------------------------------------------------------------------------------
@@ -187,37 +203,13 @@ Devel files needed to build apps based on QtWebKitWidgets.
export LDFLAGS="%{ldflags} -Wl,--as-needed"
-# disable it when building without LLVM/clang
-grep -rl "cruT" * | xargs sed -i 's/cruT/cru/g'
-
-# Build scripts aren't ready for python3
-grep -rl "env python" . |xargs sed -i -e "s,env python,env python2,g"
-grep -rl "/python$" . |xargs sed -i -e "s,/python$,/python2,g"
-grep -rl "'python'" . |xargs sed -i -e "s,'python','python2',g"
-sed -i -e "s,python,python2,g" Source/*/DerivedSources.pri
-
-# https://bugs.gentoo.org/show_bug.cgi?id=466216
-sed -i -e '/CONFIG +=/s/rpath//' \
- Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
- Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf
-
-# ensure bundled library cannot be used
-rm -r Source/ThirdParty/leveldb
-
-# remove rpath
-find ./ -type f -name \*.pr\* | \
-while read f; do
- sed -i 's|\(^CONFIG[[:space:]][[:space:]]*+=[[:space:]].*\)rpath|\1|' $f
- sed -i 's|\([[:space:]]CONFIG[[:space:]][[:space:]]*+=[[:space:]].*\)rpath|\1|' $f
-done
-
-# Fix up headers...
-[ -d include ] || %{_libdir}/qt5/bin/syncqt.pl -version %{version} Source/sync.profile
-
%build
-%qmake_qt5 \
-%ifarch %{armx}
- DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0
+%cmake_qt5 \
+ -DPORT=Qt \
+ -DENABLE_TOOLS=OFF \
+ -DCMAKE_BUILD_TYPE=Release \
+%ifarch %{arm}
+ -DENABLE_JIT=OFF
%endif
%ifarch %{arm}
@@ -229,19 +221,16 @@ done
#------------------------------------------------------------------------------
%install
-%makeinstall_std INSTALL_ROOT=%{buildroot}
-
-## .prl/.la file love
-# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
-pushd %{buildroot}%{_qt5_libdir}
-for prl_file in libQt5*.prl ; do
- sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file}
- if [ -f "$(basename ${prl_file} .prl).so" ]; then
- rm -fv "$(basename ${prl_file} .prl).la"
- sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file}
- fi
-done
-popd
+%makeinstall_std INSTALL_ROOT=%{buildroot} -C build
+
+# fix pkgconfig files
+sed -i '/Name/a Description: Qt5 WebKit module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc
+sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKit,Cflags: -I%{_qt5_headerdir}/QtWebKit,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc
+sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKit,Libs: -L%{_qt5_libdir} -lQt5WebKit ,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc
+
+sed -i '/Name/a Description: Qt5 WebKitWidgets module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc
+sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKitWidgets,Cflags: -I%{_qt5_headerdir}/QtWebKitWidgets,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc
+sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdir} -lQt5WebKitWidgets ,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc
# .la and .a files, die, die, die.
rm -f %{buildroot}%{_qt5_libdir}/lib*.la
diff --git a/qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch b/qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch
new file mode 100644
index 0000000..4cf7ae4
--- /dev/null
+++ b/qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch
@@ -0,0 +1,15 @@
+diff -ur qtwebkit-5.212.0-alpha2/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
+--- qtwebkit-5.212.0-alpha2/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp 2017-06-09 16:11:36.000000000 +0200
++++ qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp 2017-10-24 21:44:40.504943501 +0200
+@@ -390,7 +390,10 @@
+
+ QString QWebPageAdapter::selectedHtml() const
+ {
+- return page->focusController().focusedOrMainFrame().editor().selectedRange()->toHTML();
++ RefPtr<Range> range = page->focusController().focusedOrMainFrame().editor().selectedRange();
++ if (!range)
++ return QString();
++ return range->toHTML();
+ }
+
+ bool QWebPageAdapter::isContentEditable() const
diff --git a/qtwebkit-5.212.0_cmake_cmp0071.patch b/qtwebkit-5.212.0_cmake_cmp0071.patch
new file mode 100644
index 0000000..b42af57
--- /dev/null
+++ b/qtwebkit-5.212.0_cmake_cmp0071.patch
@@ -0,0 +1,32 @@
+Index: qtwebkit-5.212.0-alpha2/CMakeLists.txt
+===================================================================
+--- qtwebkit-5.212.0-alpha2.orig/CMakeLists.txt
++++ qtwebkit-5.212.0-alpha2/CMakeLists.txt
+@@ -6,6 +6,11 @@ if (POLICY CMP0058)
+ cmake_policy(SET CMP0058 NEW)
+ endif ()
+
++# Explicitly process generated files with AUTOMOC.
++if (POLICY CMP0071)
++ cmake_policy(SET CMP0071 NEW)
++endif ()
++
+ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
+
+ if (NOT DEFINED ENABLE_WEBKIT)
+Index: qtwebkit-5.212.0-alpha2/Source/WebKit/CMakeLists.txt
+===================================================================
+--- qtwebkit-5.212.0-alpha2.orig/Source/WebKit/CMakeLists.txt
++++ qtwebkit-5.212.0-alpha2/Source/WebKit/CMakeLists.txt
+@@ -1,6 +1,11 @@
+ cmake_minimum_required(VERSION 2.8.12)
+ include(WebKitCommon)
+
++# Explicitly process generated files with AUTOMOC.
++if (POLICY CMP0071)
++ cmake_policy(SET CMP0071 NEW)
++endif ()
++
+ set(WebKit_SOURCES
+ Storage/StorageAreaImpl.cpp
+ Storage/StorageAreaSync.cpp
diff --git a/qtwebkit-5.212.0_fix_missing_sources.patch b/qtwebkit-5.212.0_fix_missing_sources.patch
new file mode 100644
index 0000000..ca372a2
--- /dev/null
+++ b/qtwebkit-5.212.0_fix_missing_sources.patch
@@ -0,0 +1,20 @@
+Index: qtwebkit-5.212.0-alpha2/Source/WebKit/PlatformQt.cmake
+===================================================================
+--- qtwebkit-5.212.0-alpha2.orig/Source/WebKit/PlatformQt.cmake
++++ qtwebkit-5.212.0-alpha2/Source/WebKit/PlatformQt.cmake
+@@ -786,6 +786,7 @@ if (COMPILER_IS_GCC_OR_CLANG)
+ set_source_files_properties(
+ qt/Api/qwebdatabase.cpp
+ qt/Api/qwebelement.cpp
++ qt/Api/qwebfullscreenrequest.cpp
+ qt/Api/qwebhistory.cpp
+ qt/Api/qwebhistoryinterface.cpp
+ qt/Api/qwebpluginfactory.cpp
+@@ -795,7 +796,6 @@ if (COMPILER_IS_GCC_OR_CLANG)
+
+ qt/WidgetApi/qgraphicswebview.cpp
+ qt/WidgetApi/qwebframe.cpp
+- qt/WidgetApi/qwebfullscreenrequest.cpp
+ qt/WidgetApi/qwebinspector.cpp
+ qt/WidgetApi/qwebpage.cpp
+ qt/WidgetApi/qwebview.cpp
diff --git a/qtwebkit-5.4.2-system-leveldb.patch b/qtwebkit-5.4.2-system-leveldb.patch
deleted file mode 100644
index 1a657d7..0000000
--- a/qtwebkit-5.4.2-system-leveldb.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Correct header location so system dev-libs/leveldb can be detected.
-
---- qtwebkit-opensource-src-5.5.0/Tools/qmake/config.tests/leveldb/leveldb.cpp
-+++ qtwebkit-opensource-src-5.5.0/Tools/qmake/config.tests/leveldb/leveldb.cpp
-@@ -19,7 +19,7 @@
-
- #include <leveldb/db.h>
- #include <leveldb/env.h>
--#include <helpers/memenv/memenv.h>
-+#include <leveldb/helpers/memenv.h>
-
- int main(int, char**)
- {
-
---- qtwebkit-opensource-src-5.5.0/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
-+++ qtwebkit-opensource-src-5.5.0/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
-@@ -38,7 +38,7 @@
- #include <leveldb/comparator.h>
- #include <leveldb/db.h>
- #include <leveldb/env.h>
--#include <helpers/memenv/memenv.h>
-+#include <leveldb/helpers/memenv.h>
- #include <leveldb/slice.h>
- #include <string>
- #include <wtf/PassOwnPtr.h>
diff --git a/qtwebkit-5.5.1-lto.patch b/qtwebkit-5.5.1-lto.patch
deleted file mode 100644
index 484d08d..0000000
--- a/qtwebkit-5.5.1-lto.patch
+++ /dev/null
@@ -1,236 +0,0 @@
---- qtwebkit-opensource-src-5.5.1/Source/JavaScriptCore/llint/LLIntSlowPaths.h.omv~ 2015-10-18 00:07:49.881809933 +0200
-+++ qtwebkit-opensource-src-5.5.1/Source/JavaScriptCore/llint/LLIntSlowPaths.h 2015-10-18 00:29:22.182993016 +0200
-@@ -92,120 +92,123 @@ inline void decodeResult(SlowPathReturnT
- extern "C" SlowPathReturnType llint_trace_operand(ExecState*, Instruction*, int fromWhere, int operand);
- extern "C" SlowPathReturnType llint_trace_value(ExecState*, Instruction*, int fromWhere, int operand);
-
--#define LLINT_SLOW_PATH_DECL(name) \
-+#define LLINT_SLOW_PATH_DECL_COMMON(name) \
- extern "C" SlowPathReturnType llint_##name(ExecState* exec, Instruction* pc)
-
-+#define LLINT_SLOW_PATH_DECL(name) \
-+ __attribute__((visibility("default"))) __attribute__((used)) LLINT_SLOW_PATH_DECL_COMMON(name)
-+
- #define LLINT_SLOW_PATH_HIDDEN_DECL(name) \
-- LLINT_SLOW_PATH_DECL(name) WTF_INTERNAL
-+ LLINT_SLOW_PATH_DECL_COMMON(name) WTF_INTERNAL
-
--LLINT_SLOW_PATH_HIDDEN_DECL(trace_prologue);
--LLINT_SLOW_PATH_HIDDEN_DECL(trace_prologue_function_for_call);
--LLINT_SLOW_PATH_HIDDEN_DECL(trace_prologue_function_for_construct);
--LLINT_SLOW_PATH_HIDDEN_DECL(trace_arityCheck_for_call);
--LLINT_SLOW_PATH_HIDDEN_DECL(trace_arityCheck_for_construct);
--LLINT_SLOW_PATH_HIDDEN_DECL(trace);
--LLINT_SLOW_PATH_HIDDEN_DECL(special_trace);
--LLINT_SLOW_PATH_HIDDEN_DECL(entry_osr);
--LLINT_SLOW_PATH_HIDDEN_DECL(entry_osr_function_for_call);
--LLINT_SLOW_PATH_HIDDEN_DECL(entry_osr_function_for_construct);
--LLINT_SLOW_PATH_HIDDEN_DECL(entry_osr_function_for_call_arityCheck);
--LLINT_SLOW_PATH_HIDDEN_DECL(entry_osr_function_for_construct_arityCheck);
--LLINT_SLOW_PATH_HIDDEN_DECL(loop_osr);
--LLINT_SLOW_PATH_HIDDEN_DECL(replace);
--LLINT_SLOW_PATH_HIDDEN_DECL(stack_check);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_call_arityCheck);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_construct_arityCheck);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_create_activation);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_create_arguments);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_create_this);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_convert_this);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_object);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_array);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_array_with_size);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_array_buffer);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_regexp);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_not);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_eq);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_neq);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_stricteq);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_nstricteq);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_less);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_lesseq);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_greater);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_greatereq);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_pre_inc);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_pre_dec);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_to_number);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_negate);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_add);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_mul);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_sub);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_div);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_mod);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_lshift);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_rshift);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_urshift);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_bitand);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_bitor);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_bitxor);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_check_has_instance);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_instanceof);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_typeof);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_is_object);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_is_function);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_in);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_resolve);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_put_to_base);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_resolve_base);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_resolve_with_base);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_resolve_with_this);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_init_global_const_check);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_get_by_id);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_get_arguments_length);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_put_by_id);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_del_by_id);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_get_by_val);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_get_argument_by_val);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_get_by_pname);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_put_by_val);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_del_by_val);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_put_by_index);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_put_getter_setter);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_jtrue);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_jfalse);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_jless);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_jnless);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_jgreater);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_jngreater);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_jlesseq);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_jnlesseq);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_jgreatereq);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_jngreatereq);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_switch_imm);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_switch_char);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_switch_string);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_func);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_func_exp);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_call);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_construct);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_call_varargs);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_call_eval);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_tear_off_activation);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_tear_off_arguments);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_strcat);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_to_primitive);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_get_pnames);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_next_pname);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_push_with_scope);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_pop_scope);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_push_name_scope);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_throw);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_throw_static_error);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_handle_watchdog_timer);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_debug);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_profile_will_call);
--LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_profile_did_call);
--LLINT_SLOW_PATH_HIDDEN_DECL(throw_from_native_call);
-+LLINT_SLOW_PATH_DECL(trace_prologue);
-+LLINT_SLOW_PATH_DECL(trace_prologue_function_for_call);
-+LLINT_SLOW_PATH_DECL(trace_prologue_function_for_construct);
-+LLINT_SLOW_PATH_DECL(trace_arityCheck_for_call);
-+LLINT_SLOW_PATH_DECL(trace_arityCheck_for_construct);
-+LLINT_SLOW_PATH_DECL(trace);
-+LLINT_SLOW_PATH_DECL(special_trace);
-+LLINT_SLOW_PATH_DECL(entry_osr);
-+LLINT_SLOW_PATH_DECL(entry_osr_function_for_call);
-+LLINT_SLOW_PATH_DECL(entry_osr_function_for_construct);
-+LLINT_SLOW_PATH_DECL(entry_osr_function_for_call_arityCheck);
-+LLINT_SLOW_PATH_DECL(entry_osr_function_for_construct_arityCheck);
-+LLINT_SLOW_PATH_DECL(loop_osr);
-+LLINT_SLOW_PATH_DECL(replace);
-+LLINT_SLOW_PATH_DECL(stack_check);
-+LLINT_SLOW_PATH_DECL(slow_path_call_arityCheck);
-+LLINT_SLOW_PATH_DECL(slow_path_construct_arityCheck);
-+LLINT_SLOW_PATH_DECL(slow_path_create_activation);
-+LLINT_SLOW_PATH_DECL(slow_path_create_arguments);
-+LLINT_SLOW_PATH_DECL(slow_path_create_this);
-+LLINT_SLOW_PATH_DECL(slow_path_convert_this);
-+LLINT_SLOW_PATH_DECL(slow_path_new_object);
-+LLINT_SLOW_PATH_DECL(slow_path_new_array);
-+LLINT_SLOW_PATH_DECL(slow_path_new_array_with_size);
-+LLINT_SLOW_PATH_DECL(slow_path_new_array_buffer);
-+LLINT_SLOW_PATH_DECL(slow_path_new_regexp);
-+LLINT_SLOW_PATH_DECL(slow_path_not);
-+LLINT_SLOW_PATH_DECL(slow_path_eq);
-+LLINT_SLOW_PATH_DECL(slow_path_neq);
-+LLINT_SLOW_PATH_DECL(slow_path_stricteq);
-+LLINT_SLOW_PATH_DECL(slow_path_nstricteq);
-+LLINT_SLOW_PATH_DECL(slow_path_less);
-+LLINT_SLOW_PATH_DECL(slow_path_lesseq);
-+LLINT_SLOW_PATH_DECL(slow_path_greater);
-+LLINT_SLOW_PATH_DECL(slow_path_greatereq);
-+LLINT_SLOW_PATH_DECL(slow_path_pre_inc);
-+LLINT_SLOW_PATH_DECL(slow_path_pre_dec);
-+LLINT_SLOW_PATH_DECL(slow_path_to_number);
-+LLINT_SLOW_PATH_DECL(slow_path_negate);
-+LLINT_SLOW_PATH_DECL(slow_path_add);
-+LLINT_SLOW_PATH_DECL(slow_path_mul);
-+LLINT_SLOW_PATH_DECL(slow_path_sub);
-+LLINT_SLOW_PATH_DECL(slow_path_div);
-+LLINT_SLOW_PATH_DECL(slow_path_mod);
-+LLINT_SLOW_PATH_DECL(slow_path_lshift);
-+LLINT_SLOW_PATH_DECL(slow_path_rshift);
-+LLINT_SLOW_PATH_DECL(slow_path_urshift);
-+LLINT_SLOW_PATH_DECL(slow_path_bitand);
-+LLINT_SLOW_PATH_DECL(slow_path_bitor);
-+LLINT_SLOW_PATH_DECL(slow_path_bitxor);
-+LLINT_SLOW_PATH_DECL(slow_path_check_has_instance);
-+LLINT_SLOW_PATH_DECL(slow_path_instanceof);
-+LLINT_SLOW_PATH_DECL(slow_path_typeof);
-+LLINT_SLOW_PATH_DECL(slow_path_is_object);
-+LLINT_SLOW_PATH_DECL(slow_path_is_function);
-+LLINT_SLOW_PATH_DECL(slow_path_in);
-+LLINT_SLOW_PATH_DECL(slow_path_resolve);
-+LLINT_SLOW_PATH_DECL(slow_path_put_to_base);
-+LLINT_SLOW_PATH_DECL(slow_path_resolve_base);
-+LLINT_SLOW_PATH_DECL(slow_path_resolve_with_base);
-+LLINT_SLOW_PATH_DECL(slow_path_resolve_with_this);
-+LLINT_SLOW_PATH_DECL(slow_path_init_global_const_check);
-+LLINT_SLOW_PATH_DECL(slow_path_get_by_id);
-+LLINT_SLOW_PATH_DECL(slow_path_get_arguments_length);
-+LLINT_SLOW_PATH_DECL(slow_path_put_by_id);
-+LLINT_SLOW_PATH_DECL(slow_path_del_by_id);
-+LLINT_SLOW_PATH_DECL(slow_path_get_by_val);
-+LLINT_SLOW_PATH_DECL(slow_path_get_argument_by_val);
-+LLINT_SLOW_PATH_DECL(slow_path_get_by_pname);
-+LLINT_SLOW_PATH_DECL(slow_path_put_by_val);
-+LLINT_SLOW_PATH_DECL(slow_path_del_by_val);
-+LLINT_SLOW_PATH_DECL(slow_path_put_by_index);
-+LLINT_SLOW_PATH_DECL(slow_path_put_getter_setter);
-+LLINT_SLOW_PATH_DECL(slow_path_jtrue);
-+LLINT_SLOW_PATH_DECL(slow_path_jfalse);
-+LLINT_SLOW_PATH_DECL(slow_path_jless);
-+LLINT_SLOW_PATH_DECL(slow_path_jnless);
-+LLINT_SLOW_PATH_DECL(slow_path_jgreater);
-+LLINT_SLOW_PATH_DECL(slow_path_jngreater);
-+LLINT_SLOW_PATH_DECL(slow_path_jlesseq);
-+LLINT_SLOW_PATH_DECL(slow_path_jnlesseq);
-+LLINT_SLOW_PATH_DECL(slow_path_jgreatereq);
-+LLINT_SLOW_PATH_DECL(slow_path_jngreatereq);
-+LLINT_SLOW_PATH_DECL(slow_path_switch_imm);
-+LLINT_SLOW_PATH_DECL(slow_path_switch_char);
-+LLINT_SLOW_PATH_DECL(slow_path_switch_string);
-+LLINT_SLOW_PATH_DECL(slow_path_new_func);
-+LLINT_SLOW_PATH_DECL(slow_path_new_func_exp);
-+LLINT_SLOW_PATH_DECL(slow_path_call);
-+LLINT_SLOW_PATH_DECL(slow_path_construct);
-+LLINT_SLOW_PATH_DECL(slow_path_call_varargs);
-+LLINT_SLOW_PATH_DECL(slow_path_call_eval);
-+LLINT_SLOW_PATH_DECL(slow_path_tear_off_activation);
-+LLINT_SLOW_PATH_DECL(slow_path_tear_off_arguments);
-+LLINT_SLOW_PATH_DECL(slow_path_strcat);
-+LLINT_SLOW_PATH_DECL(slow_path_to_primitive);
-+LLINT_SLOW_PATH_DECL(slow_path_get_pnames);
-+LLINT_SLOW_PATH_DECL(slow_path_next_pname);
-+LLINT_SLOW_PATH_DECL(slow_path_push_with_scope);
-+LLINT_SLOW_PATH_DECL(slow_path_pop_scope);
-+LLINT_SLOW_PATH_DECL(slow_path_push_name_scope);
-+LLINT_SLOW_PATH_DECL(slow_path_throw);
-+LLINT_SLOW_PATH_DECL(slow_path_throw_static_error);
-+LLINT_SLOW_PATH_DECL(slow_path_handle_watchdog_timer);
-+LLINT_SLOW_PATH_DECL(slow_path_debug);
-+LLINT_SLOW_PATH_DECL(slow_path_profile_will_call);
-+LLINT_SLOW_PATH_DECL(slow_path_profile_did_call);
-+LLINT_SLOW_PATH_DECL(throw_from_native_call);
-
- } } // namespace JSC::LLInt
-
diff --git a/qtwebkit-opensource-src-5.0.1-debuginfo.patch b/qtwebkit-opensource-src-5.0.1-debuginfo.patch
deleted file mode 100644
index b9224a9..0000000
--- a/qtwebkit-opensource-src-5.0.1-debuginfo.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -up qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri
---- qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri.debuginfo 2013-01-29 13:03:49.000000000 -0600
-+++ qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri 2013-02-23 13:54:22.578460045 -0600
-@@ -7,6 +7,12 @@
-
- SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/JavaScriptCore
-
-+#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) {
-+# message("JavaScriptCore workaround for QtWebkit: do not build with -g, but with -g1")
-+# QMAKE_CXXFLAGS_RELEASE -= -g
-+# QMAKE_CXXFLAGS_RELEASE += -g1
-+#}
-+
- JAVASCRIPTCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/JavaScriptCore/$${GENERATED_SOURCES_DESTDIR}
-
- INCLUDEPATH += \
-diff -up qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri
---- qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri.debuginfo 2013-01-29 13:03:41.000000000 -0600
-+++ qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri 2013-02-23 13:57:16.984279672 -0600
-@@ -7,6 +7,12 @@
-
- SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebCore
-
-+equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) {
-+ message("WebCore workaround for QtWebkit: do not build with -g, but with -g1")
-+ QMAKE_CXXFLAGS_RELEASE -= -g
-+ QMAKE_CXXFLAGS_RELEASE += -g1
-+}
-+
- QT *= network sql core-private gui-private
-
- WEBCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebCore/$${GENERATED_SOURCES_DESTDIR}
-diff -up qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri
---- qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri.debuginfo 2013-01-29 13:03:39.000000000 -0600
-+++ qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri 2013-02-23 13:54:22.579460033 -0600
-@@ -9,6 +9,12 @@ SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/
-
- WEBKIT2_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebKit2/$${GENERATED_SOURCES_DESTDIR}
-
-+#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) {
-+# message("WebKit2 workaround for QtWebkit: do not build with -g, but with -g1")
-+# QMAKE_CXXFLAGS_RELEASE -= -g
-+# QMAKE_CXXFLAGS_RELEASE += -g1
-+#}
-+
- INCLUDEPATH += \
- $$SOURCE_DIR \
- $$SOURCE_DIR/Platform \
-diff -up qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri
---- qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri.debuginfo 2013-01-29 13:03:54.000000000 -0600
-+++ qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri 2013-02-23 13:54:22.579460033 -0600
-@@ -7,6 +7,12 @@
-
- SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebKit
-
-+#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) {
-+# message("WebKit workaround for QtWebkit: do not build with -g, but with -g1")
-+# QMAKE_CXXFLAGS_RELEASE -= -g
-+# QMAKE_CXXFLAGS_RELEASE += -g1
-+#}
-+
- INCLUDEPATH += \
- $$SOURCE_DIR/qt/Api \
- $$SOURCE_DIR/qt/WebCoreSupport \
-diff -up qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri
---- qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri.debuginfo 2013-01-29 13:03:38.000000000 -0600
-+++ qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri 2013-02-23 13:56:23.584947256 -0600
-@@ -8,6 +8,12 @@
- # All external modules should include WTF headers by prefixing with "wtf" (#include <wtf/some/thing.h>).
- INCLUDEPATH += $$PWD
-
-+#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) {
-+# message("WTF workaround for QtWebkit: do not build with -g, but with -g1")
-+# QMAKE_CXXFLAGS_RELEASE -= -g
-+# QMAKE_CXXFLAGS_RELEASE += -g1
-+#}
-+
- mac {
- # Mac OS does ship libicu but not the associated header files.
- # Therefore WebKit provides adequate header files.
diff --git a/qtwebkit-opensource-src-5.2.0-save_memory.patch b/qtwebkit-opensource-src-5.2.0-save_memory.patch
deleted file mode 100644
index 24e1060..0000000
--- a/qtwebkit-opensource-src-5.2.0-save_memory.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/WebCore.pri.save_memory qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/WebCore.pri
---- qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/WebCore.pri.save_memory 2013-12-02 11:15:56.417351604 -0600
-+++ qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/WebCore.pri 2013-12-02 11:15:56.421351563 -0600
-@@ -306,6 +306,8 @@ mac {
- }
- unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections
- unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
-+unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--no-keep-memory
-+#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
-
- enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1
diff --git a/qtwebkit-opensource-src-5.2.1-no_rpath.patch b/qtwebkit-opensource-src-5.2.1-no_rpath.patch
deleted file mode 100644
index 0871fa7..0000000
--- a/qtwebkit-opensource-src-5.2.1-no_rpath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up qtwebkit-opensource-src-5.2.1/Tools/qmake/mkspecs/features/rpath.prf.no_rpath qtwebkit-opensource-src-5.2.1/Tools/qmake/mkspecs/features/rpath.prf
---- qtwebkit-opensource-src-5.2.1/Tools/qmake/mkspecs/features/rpath.prf.no_rpath 2014-02-01 14:37:41.000000000 -0600
-+++ qtwebkit-opensource-src-5.2.1/Tools/qmake/mkspecs/features/rpath.prf 2014-05-02 18:47:26.789051711 -0500
-@@ -6,7 +6,7 @@
-
- equals(ROOT_BUILD_DIR, $$dirname(DESTDIR)): RPATHDIR_RELATIVE_TO_DESTDIR = ../lib
-
--linux-*:!isEmpty(RPATHDIR_RELATIVE_TO_DESTDIR) {
-+linux-rpath_me_harder_no_no_no:!isEmpty(RPATHDIR_RELATIVE_TO_DESTDIR) {
- # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
- # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var.
- QMAKE_RPATHDIR = \$\$ORIGIN/$${RPATHDIR_RELATIVE_TO_DESTDIR} $${QMAKE_RPATHDIR}