Update to 2.4.7.

Sync some changes from the webkit-gtk3 port.
The 2.4.x series is the last webkitgtk version that will have WebKit1.

18 files changed, 19 insertions, 781 deletions

diff --git a/www/webkit-gtk2/files/patch-GNUmakefile.in b/www/webkit-gtk2/files/patch-GNUmakefile.in
deleted file mode 100644
index 6a03d0216437..000000000000
--- a/www/webkit-gtk2/files/patch-GNUmakefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- GNUmakefile.in.orig	2012-07-13 11:41:16.000000000 +0200
-+++ GNUmakefile.in	2012-07-13 11:46:05.000000000 +0200
-@@ -73545,7 +73545,7 @@
- 
- info-am:
- 
--install-data-am: install-audioDATA install-data-local \
-+install-data-am: install-audioDATA po-install-data-local \
- 	install-dist_audioDATA install-dist_resourcesDATA \
- 	install-dist_webinspectorDATA \
- 	install-dist_webinspectorimagesDATA \
-@@ -74192,7 +74192,7 @@
- 	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
- 	exit 1
- 
--po-install-data-local: all
-+po-install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(datadir)
- 	@catalogs='$(MOFILES)'; \
- 	for cat in $$catalogs; do \
diff --git a/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_Atomics.h b/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_Atomics.h
deleted file mode 100644
index 99977d0283e5..000000000000
--- a/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_Atomics.h
+++ /dev/null
@@ -1,45 +0,0 @@
---- Source/JavaScriptCore/wtf/Atomics.h.orig	2013-09-06 13:54:07.000000000 +0200
-+++ Source/JavaScriptCore/wtf/Atomics.h	2013-09-06 13:55:58.000000000 +0200
-@@ -65,18 +65,10 @@
- 
- #if OS(WINDOWS)
- #include <windows.h>
--#elif OS(DARWIN)
--#include <libkern/OSAtomic.h>
- #elif OS(QNX)
- #include <atomic.h>
- #elif OS(ANDROID)
- #include <sys/atomics.h>
--#elif COMPILER(GCC)
--#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
--#include <ext/atomicity.h>
--#else
--#include <bits/atomicity.h>
--#endif
- #endif
- 
- namespace WTF {
-@@ -92,12 +84,6 @@ inline int atomicIncrement(int volatile*
- inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(reinterpret_cast<long volatile*>(addend)); }
- #endif
- 
--#elif OS(DARWIN)
--#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
--
--inline int atomicIncrement(int volatile* addend) { return OSAtomicIncrement32Barrier(const_cast<int*>(addend)); }
--inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Barrier(const_cast<int*>(addend)); }
--
- #elif OS(QNX)
- #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
- 
-@@ -113,8 +99,8 @@ inline int atomicDecrement(int volatile*
- #elif COMPILER(GCC) && !CPU(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
- #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
- 
--inline int atomicIncrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, 1) + 1; }
--inline int atomicDecrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
-+inline int atomicIncrement(int volatile* addend) { return __sync_add_and_fetch(addend, 1); }
-+inline int atomicDecrement(int volatile* addend) { return __sync_sub_and_fetch(addend, 1); }
- 
- #endif
- 
diff --git a/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_DisallowCType.h b/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_DisallowCType.h
deleted file mode 100644
index 4c0f8c8786af..000000000000
--- a/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_DisallowCType.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- Source/JavaScriptCore/wtf/DisallowCType.h.orig	2012-08-20 18:26:04.000000000 +0200
-+++ Source/JavaScriptCore/wtf/DisallowCType.h	2013-09-11 12:41:07.000000000 +0200
-@@ -35,6 +35,13 @@
- // ASCII-specific functions instead. This header makes sure we get a compile-time
- // error if we use one of the <ctype.h> functions by accident.
- 
-+// Include inlined functions using <ctype.h> first to avoid compilation errors
-+#ifdef __cplusplus
-+#include <cwchar>
-+#include <cwctype>
-+#include <string>
-+#endif
-+
- #include <ctype.h>
- 
- #undef isalnum
diff --git a/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_NumberOfCores.cpp b/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_NumberOfCores.cpp
deleted file mode 100644
index 82d5f90df2a2..000000000000
--- a/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_NumberOfCores.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- Source/JavaScriptCore/wtf/NumberOfCores.cpp.orig	2012-05-16 10:42:39.000000000 +0200
-+++ Source/JavaScriptCore/wtf/NumberOfCores.cpp	2012-05-16 10:43:06.000000000 +0200
-@@ -27,8 +27,8 @@
- #include "NumberOfCores.h"
- 
- #if OS(DARWIN) || OS(OPENBSD) || OS(NETBSD) || OS(FREEBSD)
--#include <sys/sysctl.h>
- #include <sys/types.h>
-+#include <sys/sysctl.h>
- #elif OS(LINUX) || OS(AIX) || OS(SOLARIS)
- #include <unistd.h>
- #elif OS(WINDOWS)
diff --git a/www/webkit-gtk2/files/patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y b/www/webkit-gtk2/files/patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y
deleted file mode 100644
index 99d78abc05c6..000000000000
--- a/www/webkit-gtk2/files/patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y
+++ /dev/null
@@ -1,13 +0,0 @@
-Allow building with bison 3
-Obtained from http://trac.webkit.org/changeset/154109/trunk/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-
---- Source/ThirdParty/ANGLE/src/compiler/glslang.y.orig	2012-08-20 16:26:06 UTC
-+++ Source/ThirdParty/ANGLE/src/compiler/glslang.y
-@@ -32,6 +32,7 @@ WHICH GENERATES THE GLSL ES PARSER (glsl
- %expect 1 /* One shift reduce conflict because of if | else */
- %pure-parser
- %parse-param {TParseContext* context}
-+%lex-param {YYLEX_PARAM}
- 
- %union {
-     struct {
diff --git a/www/webkit-gtk2/files/patch-Source_WebCore_css_CSSGrammar.y b/www/webkit-gtk2/files/patch-Source_WebCore_css_CSSGrammar.y
deleted file mode 100644
index e96254f9b0e0..000000000000
--- a/www/webkit-gtk2/files/patch-Source_WebCore_css_CSSGrammar.y
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: Source/WebCore/css/CSSGrammar.y
-===================================================================
---- Source/WebCore/css/CSSGrammar.y	(revision 124098)
-+++ Source/WebCore/css/CSSGrammar.y	(revision 124099)
-@@ -54,11 +54,10 @@
- #define YYDEBUG 0
-
--// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x
--#define YYPARSE_PARAM parser
--#define YYLEX_PARAM parser
--
- %}
-
- %pure_parser
-+
-+%parse-param { CSSParser* parser }
-+%lex-param { CSSParser* parser }
-
- %union {
-@@ -90,5 +89,5 @@
- %{
-
--static inline int cssyyerror(const char*)
-+static inline int cssyyerror(void*, const char*)
- {
-     return 1;
diff --git a/www/webkit-gtk2/files/patch-Source_WebCore_css_CSSParser.cpp b/www/webkit-gtk2/files/patch-Source_WebCore_css_CSSParser.cpp
deleted file mode 100644
index a45f74d0f056..000000000000
--- a/www/webkit-gtk2/files/patch-Source_WebCore_css_CSSParser.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: Source/WebCore/css/CSSParser.cpp
-===================================================================
---- Source/WebCore/css/CSSParser.cpp	(revision 124098)
-+++ Source/WebCore/css/CSSParser.cpp	(revision 124099)
-@@ -115,5 +115,5 @@
- #endif
-
--extern int cssyyparse(void* parser);
-+extern int cssyyparse(WebCore::CSSParser*);
-
- using namespace std;
-
diff --git a/www/webkit-gtk2/files/patch-Source_WebCore_editing_Editor.h b/www/webkit-gtk2/files/patch-Source_WebCore_editing_Editor.h
deleted file mode 100644
index 61bbe65867e0..000000000000
--- a/www/webkit-gtk2/files/patch-Source_WebCore_editing_Editor.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Source/WebCore/editing/Editor.h.orig	2012-08-04 16:33:45.000000000 +0200
-+++ ./Source/WebCore/editing/Editor.h	2012-08-04 16:34:06.000000000 +0200
-@@ -385,7 +385,7 @@
-     void deviceScaleFactorChanged();
- 
- private:
--    virtual void willDetachPage() OVERRIDE;
-+    virtual void willDetachPage();
- 
-     OwnPtr<DeleteButtonController> m_deleteButtonController;
-     RefPtr<CompositeEditCommand> m_lastEditCommand;
diff --git a/www/webkit-gtk2/files/patch-Source_WebCore_plugins_gtk_PluginViewGtk.cpp b/www/webkit-gtk2/files/patch-Source_WebCore_plugins_gtk_PluginViewGtk.cpp
deleted file mode 100644
index 424dcc034db5..000000000000
--- a/www/webkit-gtk2/files/patch-Source_WebCore_plugins_gtk_PluginViewGtk.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- Source/WebCore/plugins/gtk/PluginViewGtk.cpp.orig	2011-08-29 22:19:17.000000000 +0200
-+++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp	2011-10-14 13:45:50.000000000 +0200
-@@ -68,6 +68,7 @@
- #endif
- #include <gtk/gtk.h>
- 
-+#define String XtStringType
- #if defined(XP_UNIX)
- #include "RefPtrCairo.h"
- #include "gtk2xtbin.h"
-@@ -80,6 +81,7 @@
- #include "PluginMessageThrottlerWin.h"
- #include <gdk/gdkwin32.h>
- #endif
-+#undef String
- 
- using JSC::ExecState;
- using JSC::Interpreter;
diff --git a/www/webkit-gtk2/files/patch-Source_WebCore_xml_XPathGrammer.y b/www/webkit-gtk2/files/patch-Source_WebCore_xml_XPathGrammer.y
deleted file mode 100644
index a0213c8ac494..000000000000
--- a/www/webkit-gtk2/files/patch-Source_WebCore_xml_XPathGrammer.y
+++ /dev/null
@@ -1,467 +0,0 @@
---- Source/WebCore/xml/XPathGrammar.y.orig	2011-08-06 10:38:59.000000000 +0000
-+++ Source/WebCore/xml/XPathGrammar.y	2013-02-26 10:32:32.000000000 +0000
-@@ -36,6 +36,7 @@
- #include "XPathParser.h"
- #include "XPathPath.h"
- #include "XPathPredicate.h"
-+#include "XPathStep.h"
- #include "XPathVariableReference.h"
- #include <wtf/FastMalloc.h>
- 
-@@ -46,8 +47,6 @@
- #define YYLTYPE_IS_TRIVIAL 1
- #define YYDEBUG 0
- #define YYMAXDEPTH 10000
--#define YYPARSE_PARAM parserParameter
--#define PARSER static_cast<Parser*>(parserParameter)
- 
- using namespace WebCore;
- using namespace XPath;
-@@ -55,6 +54,7 @@
- %}
- 
- %pure_parser
-+%parse-param { WebCore::XPath::Parser* parser }
- 
- %union
- {
-@@ -73,7 +73,7 @@
- %{
- 
- static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
--static void xpathyyerror(const char*) { }
-+static void xpathyyerror(void*, const char*) { }
-     
- %}
- 
-@@ -120,7 +120,7 @@
- Expr:
-     OrExpr
-     {
--        PARSER->m_topExpr = $1;
-+        parser->m_topExpr = $1;
-     }
-     ;
- 
-@@ -140,7 +140,7 @@
-     '/'
-     {
-         $$ = new LocationPath;
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     |
-     '/' RelativeLocationPath
-@@ -152,7 +152,7 @@
-     {
-         $$ = $2;
-         $$->insertFirstStep($1);
--        PARSER->unregisterParseNode($1);
-+        parser->unregisterParseNode($1);
-     }
-     ;
- 
-@@ -161,22 +161,22 @@
-     {
-         $$ = new LocationPath;
-         $$->appendStep($1);
--        PARSER->unregisterParseNode($1);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     RelativeLocationPath '/' Step
-     {
-         $$->appendStep($3);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($3);
-     }
-     |
-     RelativeLocationPath DescendantOrSelf Step
-     {
-         $$->appendStep($2);
-         $$->appendStep($3);
--        PARSER->unregisterParseNode($2);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($2);
-+        parser->unregisterParseNode($3);
-     }
-     ;
- 
-@@ -185,58 +185,58 @@
-     {
-         if ($2) {
-             $$ = new Step(Step::ChildAxis, *$1, *$2);
--            PARSER->deletePredicateVector($2);
-+            parser->deletePredicateVector($2);
-         } else
-             $$ = new Step(Step::ChildAxis, *$1);
--        PARSER->deleteNodeTest($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteNodeTest($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     NAMETEST OptionalPredicateList
-     {
-         String localName;
-         String namespaceURI;
--        if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
--            PARSER->m_gotNamespaceError = true;
-+        if (!parser->expandQName(*$1, localName, namespaceURI)) {
-+            parser->m_gotNamespaceError = true;
-             YYABORT;
-         }
-         
-         if ($2) {
-             $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
--            PARSER->deletePredicateVector($2);
-+            parser->deletePredicateVector($2);
-         } else
-             $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     AxisSpecifier NodeTest OptionalPredicateList
-     {
-         if ($3) {
-             $$ = new Step($1, *$2, *$3);
--            PARSER->deletePredicateVector($3);
-+            parser->deletePredicateVector($3);
-         } else
-             $$ = new Step($1, *$2);
--        PARSER->deleteNodeTest($2);
--        PARSER->registerParseNode($$);
-+        parser->deleteNodeTest($2);
-+        parser->registerParseNode($$);
-     }
-     |
-     AxisSpecifier NAMETEST OptionalPredicateList
-     {
-         String localName;
-         String namespaceURI;
--        if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
--            PARSER->m_gotNamespaceError = true;
-+        if (!parser->expandQName(*$2, localName, namespaceURI)) {
-+            parser->m_gotNamespaceError = true;
-             YYABORT;
-         }
- 
-         if ($3) {
-             $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
--            PARSER->deletePredicateVector($3);
-+            parser->deletePredicateVector($3);
-         } else
-             $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
--        PARSER->deleteString($2);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($2);
-+        parser->registerParseNode($$);
-     }
-     |
-     AbbreviatedStep
-@@ -261,23 +261,23 @@
-         else if (*$1 == "comment")
-             $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
- 
--        PARSER->deleteString($1);
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->registerNodeTest($$);
-     }
-     |
-     PI '(' ')'
-     {
-         $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
--        PARSER->deleteString($1);        
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);        
-+        parser->registerNodeTest($$);
-     }
-     |
-     PI '(' LITERAL ')'
-     {
-         $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
--        PARSER->deleteString($1);        
--        PARSER->deleteString($3);
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);        
-+        parser->deleteString($3);
-+        parser->registerNodeTest($$);
-     }
-     ;
- 
-@@ -295,14 +295,14 @@
-     {
-         $$ = new Vector<Predicate*>;
-         $$->append(new Predicate($1));
--        PARSER->unregisterParseNode($1);
--        PARSER->registerPredicateVector($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerPredicateVector($$);
-     }
-     |
-     PredicateList Predicate
-     {
-         $$->append(new Predicate($2));
--        PARSER->unregisterParseNode($2);
-+        parser->unregisterParseNode($2);
-     }
-     ;
- 
-@@ -317,7 +317,7 @@
-     SLASHSLASH
-     {
-         $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -325,13 +325,13 @@
-     '.'
-     {
-         $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     |
-     DOTDOT
-     {
-         $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -339,8 +339,8 @@
-     VARIABLEREFERENCE
-     {
-         $$ = new VariableReference(*$1);
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     '(' Expr ')'
-@@ -351,15 +351,15 @@
-     LITERAL
-     {
-         $$ = new StringExpression(*$1);
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     NUMBER
-     {
-         $$ = new Number($1->toDouble());
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     FunctionCall
-@@ -371,8 +371,8 @@
-         $$ = createFunction(*$1);
-         if (!$$)
-             YYABORT;
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     FUNCTIONNAME '(' ArgumentList ')'
-@@ -380,9 +380,9 @@
-         $$ = createFunction(*$1, *$3);
-         if (!$$)
-             YYABORT;
--        PARSER->deleteString($1);
--        PARSER->deleteExpressionVector($3);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->deleteExpressionVector($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -391,14 +391,14 @@
-     {
-         $$ = new Vector<Expression*>;
-         $$->append($1);
--        PARSER->unregisterParseNode($1);
--        PARSER->registerExpressionVector($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerExpressionVector($$);
-     }
-     |
-     ArgumentList ',' Argument
-     {
-         $$->append($3);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($3);
-     }
-     ;
- 
-@@ -414,9 +414,9 @@
-         $$ = new Union;
-         $$->addSubExpression($1);
-         $$->addSubExpression($3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -432,9 +432,9 @@
-     {
-         $3->setAbsolute(true);
-         $$ = new Path(static_cast<Filter*>($1), $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     |
-     FilterExpr DescendantOrSelf RelativeLocationPath
-@@ -442,10 +442,10 @@
-         $3->insertFirstStep($2);
-         $3->setAbsolute(true);
-         $$ = new Path(static_cast<Filter*>($1), $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($2);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($2);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -455,9 +455,9 @@
-     PrimaryExpr PredicateList
-     {
-         $$ = new Filter($1, *$2);
--        PARSER->unregisterParseNode($1);
--        PARSER->deletePredicateVector($2);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->deletePredicateVector($2);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -467,9 +467,9 @@
-     OrExpr OR AndExpr
-     {
-         $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -479,9 +479,9 @@
-     AndExpr AND EqualityExpr
-     {
-         $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -491,9 +491,9 @@
-     EqualityExpr EQOP RelationalExpr
-     {
-         $$ = new EqTestOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -503,9 +503,9 @@
-     RelationalExpr RELOP AdditiveExpr
-     {
-         $$ = new EqTestOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -515,17 +515,17 @@
-     AdditiveExpr PLUS MultiplicativeExpr
-     {
-         $$ = new NumericOp(NumericOp::OP_Add, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     |
-     AdditiveExpr MINUS MultiplicativeExpr
-     {
-         $$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -535,9 +535,9 @@
-     MultiplicativeExpr MULOP UnaryExpr
-     {
-         $$ = new NumericOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -548,8 +548,8 @@
-     {
-         $$ = new Negative;
-         $$->addSubExpression($2);
--        PARSER->unregisterParseNode($2);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($2);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
diff --git a/www/webkit-gtk2/files/patch-Source_WebCore_xml_XPathParser.cpp b/www/webkit-gtk2/files/patch-Source_WebCore_xml_XPathParser.cpp
deleted file mode 100644
index bacafcf9212d..000000000000
--- a/www/webkit-gtk2/files/patch-Source_WebCore_xml_XPathParser.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
---- Source/WebCore/xml/XPathParser.cpp.orig	2011-08-06 10:38:59.000000000 +0000
-+++ Source/WebCore/xml/XPathParser.cpp	2013-02-26 10:11:22.000000000 +0000
-@@ -34,24 +34,21 @@
- #include "XPathEvaluator.h"
- #include "XPathException.h"
- #include "XPathNSResolver.h"
-+#include "XPathPath.h"
- #include "XPathStep.h"
- #include <wtf/StdLibExtras.h>
- #include <wtf/text/StringHash.h>
- 
--int xpathyyparse(void*);
--
-+using namespace WebCore;
- using namespace WTF;
- using namespace Unicode;
-+using namespace XPath;
- 
--namespace WebCore {
--namespace XPath {
--
--class LocationPath;
--
--#include "XPathGrammar.h"    
-+extern int xpathyyparse(WebCore::XPath::Parser*);
-+#include "XPathGrammar.h"
- 
- Parser* Parser::currentParser = 0;
--    
-+
- enum XMLCat { NameStart, NameCont, NotPartOfName };
- 
- typedef HashMap<String, Step::Axis> AxisNamesMap;
-@@ -632,7 +629,5 @@
-     delete t;
- }
- 
--}
--}
- 
- #endif // ENABLE(XPATH)
-
diff --git a/www/webkit-gtk2/files/patch-Source_WebKit_gtk_resources_error.html b/www/webkit-gtk2/files/patch-Source_WebKit_gtk_resources_error.html
deleted file mode 100644
index 07e04aafbe81..000000000000
--- a/www/webkit-gtk2/files/patch-Source_WebKit_gtk_resources_error.html
+++ /dev/null
@@ -1,17 +0,0 @@
---- Source/WebKit/gtk/resources/error.html.orig
-+++ Source/WebKit/gtk/resources/error.html
-@@ -21,12 +21,12 @@
- }
- 
- #errorTitleText {
-- font-size: 120%;
-+ font-size: 120%%;
-  font-weight: bold;
- }
- 
- #errorMessageText {
-- font-size: 80%;
-+ font-size: 80%%;
- }
- 
- </style>
diff --git a/www/webkit-gtk2/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp b/www/webkit-gtk2/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp
deleted file mode 100644
index 958014e4e0bd..000000000000
--- a/www/webkit-gtk2/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=50173
-
---- Source/WebKit/gtk/webkit/webkitwebview.cpp.orig	2011-06-14 02:10:55.000000000 +0200
-+++ Source/WebKit/gtk/webkit/webkitwebview.cpp	2011-08-27 10:48:52.000000000 +0200
-@@ -4939,6 +4939,8 @@
- 
-     priv->mainResource = adoptGRef(webResource);
-     priv->mainResourceIdentifier = identifier;
-+
-+    g_object_ref(webView);
- }
- 
- void webkit_web_view_add_resource(WebKitWebView* webView, const char* identifier, WebKitWebResource* webResource)
-@@ -4955,6 +4957,8 @@
-         priv->mainResource = 0;
-     } else
-       g_hash_table_remove(priv->subResources.get(), identifier);
-+
-+      g_object_unref(webView);
- }
- 
- WebKitWebResource* webkit_web_view_get_resource(WebKitWebView* webView, char* identifier)
diff --git a/www/webkit-gtk2/files/patch-Source__JavaScriptCore__jit__ExecutableAllocator.h b/www/webkit-gtk2/files/patch-Source__JavaScriptCore__jit__ExecutableAllocator.h
index 952e29b48dfe..f943398981cf 100644
--- a/www/webkit-gtk2/files/patch-Source__JavaScriptCore__jit__ExecutableAllocator.h
+++ b/www/webkit-gtk2/files/patch-Source__JavaScriptCore__jit__ExecutableAllocator.h
@@ -1,8 +1,20 @@
---- Source/JavaScriptCore/jit/ExecutableAllocator.h.orig	2014-10-15 14:25:58 UTC
-+++ Source/JavaScriptCore/jit/ExecutableAllocator.h
-@@ -223,6 +223,11 @@
-         UNUSED_PARAM(size);
- #endif
+
+
+--- Source/JavaScriptCore/jit/ExecutableAllocator.h.orig	2014-12-25 12:52:32.786521149 +0100
++++ Source/JavaScriptCore/jit/ExecutableAllocator.h	2014-12-25 12:52:41.921520911 +0100
+@@ -104,7 +104,8 @@
+ #if ENABLE(EXECUTABLE_ALLOCATOR_FIXED)
+ #if CPU(ARM) || CPU(ARM64)
+ static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024;
+-#elif CPU(X86_64)
++// We don't want an initial allocation of 1GB, it's above the default ulimit
++#elif CPU(X86_64) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
+ static const size_t fixedExecutableMemoryPoolSize = 1024 * 1024 * 1024;
+ #else
+ static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024;
+@@ -146,6 +147,11 @@
+     {
+         reprotectRegion(start, size, Executable);
      }
 +#elif CPU(ARM_TRADITIONAL) && OS(FREEBSD) && COMPILER(CLANG)
 +    static void cacheFlush(void* code, size_t size)
@@ -10,5 +22,5 @@
 +        __clear_cache(code, reinterpret_cast<char*>(code) + size);
 +    }
  #else
-     #error "The cacheFlush support is missing on this platform."
- #endif
+     static void makeWritable(void*, size_t) {}
+     static void makeExecutable(void*, size_t) {}
diff --git a/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp b/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp
deleted file mode 100644
index 8a5b916f3f69..000000000000
--- a/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- Tools/DumpRenderTree/gtk/DumpRenderTree.cpp.orig	2012-08-20 18:26:18.000000000 +0200
-+++ Tools/DumpRenderTree/gtk/DumpRenderTree.cpp	2013-09-11 12:28:29.000000000 +0200
-@@ -48,6 +48,7 @@
- #include "WorkQueueItem.h"
- #include <JavaScriptCore/JavaScript.h>
- #include <cassert>
-+#include <clocale>
- #include <cstdlib>
- #include <cstring>
- #include <getopt.h>
diff --git a/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp b/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp
deleted file mode 100644
index 0d037286a3c6..000000000000
--- a/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- Tools/DumpRenderTree/gtk/ImageDiff.cpp.orig	2013-09-11 12:29:19.000000000 +0200
-+++ Tools/DumpRenderTree/gtk/ImageDiff.cpp	2013-09-11 12:29:38.000000000 +0200
-@@ -30,6 +30,7 @@
- #include <algorithm>
- #include <cmath>
- #include <cstdio>
-+#include <cstdlib>
- #include <cstring>
- #include <gdk/gdk.h>
- 
diff --git a/www/webkit-gtk2/files/patch-cairo b/www/webkit-gtk2/files/patch-cairo
deleted file mode 100644
index 2f928af196aa..000000000000
--- a/www/webkit-gtk2/files/patch-cairo
+++ /dev/null
@@ -1,11 +0,0 @@
---- Source/WebCore/platform/graphics/BitmapImage.cpp.orig	2011-01-08 16:50:57.000000000 +0000
-+++ Source/WebCore/platform/graphics/BitmapImage.cpp	2011-01-11 16:36:22.000000000 +0000
-@@ -207,7 +207,7 @@ bool BitmapImage::isSizeAvailable()
- NativeImagePtr BitmapImage::frameAtIndex(size_t index)
- {
-     if (index >= frameCount())
--        return 0;
-+        return NULL;
- 
-     if (index >= m_frames.size() || !m_frames[index].m_frame)
-         cacheFrame(index);
diff --git a/www/webkit-gtk2/files/patch-configure b/www/webkit-gtk2/files/patch-configure
deleted file mode 100644
index dd277a8ccb5e..000000000000
--- a/www/webkit-gtk2/files/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig	2012-08-04 12:19:43.000000000 +0200
-+++ configure	2012-08-04 13:15:32.000000000 +0200
-@@ -19144,8 +19144,8 @@
- .SECONDARY: $(gsettings_SCHEMAS)
- 
- gsettings__base_list = \
--  sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
--  sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
-+  sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
-+  sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
- 
- install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
- 	@$(NORMAL_INSTALL)
-@@ -20440,7 +20440,7 @@
- 
- done
- 
--    OPENGL_LIBS="-lGL -ldl"
-+    OPENGL_LIBS="-lGL"
- fi
- 
-