diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-07-04 03:59:13 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-07-04 03:59:13 +0800 |
commit | 3362d89b3fcc7b590960b36791649832e4e65a43 (patch) | |
tree | 32efaeb65c63fab6790fced01f0f36d69a71d0f2 /www/webkit-gtk3/files | |
parent | 64360ac6936c32a9c28eb4486573ddd59e914821 (diff) | |
download | marcuscom-ports-3362d89b3fcc7b590960b36791649832e4e65a43.tar marcuscom-ports-3362d89b3fcc7b590960b36791649832e4e65a43.tar.gz marcuscom-ports-3362d89b3fcc7b590960b36791649832e4e65a43.tar.bz2 marcuscom-ports-3362d89b3fcc7b590960b36791649832e4e65a43.tar.lz marcuscom-ports-3362d89b3fcc7b590960b36791649832e4e65a43.tar.xz marcuscom-ports-3362d89b3fcc7b590960b36791649832e4e65a43.tar.zst marcuscom-ports-3362d89b3fcc7b590960b36791649832e4e65a43.zip |
Update to 2.0.3.
This will need clang and libc++ from ports (not yet committed) to work
on 9.1-stable and 9.x. This will not work on 9.1-R due to missing
libc function that libc++ needs.
Don't commit the -gtk2 port yet because that would impose the same limitations.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18618 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www/webkit-gtk3/files')
15 files changed, 138 insertions, 622 deletions
diff --git a/www/webkit-gtk3/files/patch-Source_JavaScriptCore_wtf_NumberOfCores.cpp b/www/webkit-gtk3/files/patch-Source_JavaScriptCore_wtf_NumberOfCores.cpp deleted file mode 100644 index 82d5f90df..000000000 --- a/www/webkit-gtk3/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-gtk3/files/patch-Source_ThirdParty_gtext_include_gtest_internal_gtest-port.h b/www/webkit-gtk3/files/patch-Source_ThirdParty_gtext_include_gtest_internal_gtest-port.h new file mode 100644 index 000000000..d02ccf9ec --- /dev/null +++ b/www/webkit-gtk3/files/patch-Source_ThirdParty_gtext_include_gtest_internal_gtest-port.h @@ -0,0 +1,10 @@ +--- Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h.orig 2013-06-10 07:06:02.000000000 +0000 ++++ Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h 2013-06-10 07:51:20.000000000 +0000 +@@ -172,6 +172,7 @@ + #include <stddef.h> // For ptrdiff_t + #include <stdlib.h> + #include <stdio.h> ++#include <unistd.h> + #include <string.h> + #ifndef _WIN32_WCE + #include <sys/stat.h> diff --git a/www/webkit-gtk3/files/patch-Source_WebCore_css_CSSGrammar.y b/www/webkit-gtk3/files/patch-Source_WebCore_css_CSSGrammar.y deleted file mode 100644 index e96254f9b..000000000 --- a/www/webkit-gtk3/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-gtk3/files/patch-Source_WebCore_css_CSSParser.cpp b/www/webkit-gtk3/files/patch-Source_WebCore_css_CSSParser.cpp deleted file mode 100644 index a45f74d0f..000000000 --- a/www/webkit-gtk3/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-gtk3/files/patch-Source_WebCore_plugins_gtk_PluginViewGtk.cpp b/www/webkit-gtk3/files/patch-Source_WebCore_plugins_gtk_PluginViewGtk.cpp deleted file mode 100644 index 424dcc034..000000000 --- a/www/webkit-gtk3/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-gtk3/files/patch-Source_WebCore_xml_XPathGrammer.y b/www/webkit-gtk3/files/patch-Source_WebCore_xml_XPathGrammer.y deleted file mode 100644 index a0213c8ac..000000000 --- a/www/webkit-gtk3/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-gtk3/files/patch-Source_WebCore_xml_XPathParser.cpp b/www/webkit-gtk3/files/patch-Source_WebCore_xml_XPathParser.cpp deleted file mode 100644 index bacafcf92..000000000 --- a/www/webkit-gtk3/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-gtk3/files/patch-Source_WebKit2_PluginProcess_unix_PluginProcessMainUnix.cpp b/www/webkit-gtk3/files/patch-Source_WebKit2_PluginProcess_unix_PluginProcessMainUnix.cpp new file mode 100644 index 000000000..872726025 --- /dev/null +++ b/www/webkit-gtk3/files/patch-Source_WebKit2_PluginProcess_unix_PluginProcessMainUnix.cpp @@ -0,0 +1,13 @@ +man 3 basename + +--- Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp.orig 2013-06-11 20:02:23.000000000 +0000 ++++ Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp 2013-06-11 20:04:31.000000000 +0000 +@@ -48,6 +48,8 @@ + + #ifdef XP_UNIX + ++#include <libgen.h> ++ + #if !LOG_DISABLED + static const char xErrorString[] = "The program '%s' received an X Window System error.\n" + "This probably reflects a bug in a browser plugin.\n" diff --git a/www/webkit-gtk3/files/patch-Source_WebKit2_UIProcess_Launcher_gtk_ProcessLauncherGtk.cpp b/www/webkit-gtk3/files/patch-Source_WebKit2_UIProcess_Launcher_gtk_ProcessLauncherGtk.cpp new file mode 100644 index 000000000..b2ed9b7aa --- /dev/null +++ b/www/webkit-gtk3/files/patch-Source_WebKit2_UIProcess_Launcher_gtk_ProcessLauncherGtk.cpp @@ -0,0 +1,10 @@ +--- Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp.orig 2012-09-24 16:48:12.000000000 +0000 ++++ Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2012-09-24 16:48:41.000000000 +0000 +@@ -27,6 +27,7 @@ + #include "config.h" + #include "ProcessLauncher.h" + ++#include <sys/wait.h> + #include "Connection.h" + #include "ProcessExecutablePath.h" + #include <WebCore/FileSystem.h> diff --git a/www/webkit-gtk3/files/patch-Source_WebKit2_UIProcess_Plugins_unix_PluginProcessProxyUnix.cpp b/www/webkit-gtk3/files/patch-Source_WebKit2_UIProcess_Plugins_unix_PluginProcessProxyUnix.cpp new file mode 100644 index 000000000..19d754496 --- /dev/null +++ b/www/webkit-gtk3/files/patch-Source_WebKit2_UIProcess_Plugins_unix_PluginProcessProxyUnix.cpp @@ -0,0 +1,26 @@ +--- Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp.orig 2013-06-10 07:21:09.000000000 +0000 ++++ Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2013-06-10 07:29:32.000000000 +0000 +@@ -78,19 +78,23 @@ bool PluginProcessProxy::scanPlugin(cons + // As a consequence, we make sure that the disposition is set to + // SIG_DFL before calling g_spawn_sync(). + struct sigaction action; ++#if defined(SIGCLD) + sigaction(SIGCLD, 0, &action); + if (action.sa_handler == SIG_IGN) { + action.sa_handler = SIG_DFL; + sigaction(SIGCLD, &action, 0); + } ++#endif + + if (!g_spawn_sync(0, argv, 0, G_SPAWN_STDERR_TO_DEV_NULL, 0, 0, &stdOut, 0, &status, 0)) + return false; + ++#if defined(WEXITSTATUS) + if (!WIFEXITED(status) || WEXITSTATUS(status) != EXIT_SUCCESS || !stdOut) { + free(stdOut); + return false; + } ++#endif + + String stdOutString(reinterpret_cast<const UChar*>(stdOut)); + free(stdOut); diff --git a/www/webkit-gtk3/files/patch-Source_WebKit_gtk_resources_error.html b/www/webkit-gtk3/files/patch-Source_WebKit_gtk_resources_error.html deleted file mode 100644 index 07e04aafb..000000000 --- a/www/webkit-gtk3/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-gtk3/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp b/www/webkit-gtk3/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp index 958014e4e..f7ca5e227 100644 --- a/www/webkit-gtk3/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp +++ b/www/webkit-gtk3/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp @@ -1,8 +1,6 @@ -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 @@ +--- Source/WebKit/gtk/webkit/webkitwebview.cpp.orig 2013-03-26 18:25:31.000000000 +0000 ++++ Source/WebKit/gtk/webkit/webkitwebview.cpp 2013-03-31 11:49:59.000000000 +0000 +@@ -5061,6 +5061,8 @@ void webkit_web_view_add_main_resource(W priv->mainResource = adoptGRef(webResource); priv->mainResourceIdentifier = identifier; @@ -11,12 +9,12 @@ https://bugs.webkit.org/show_bug.cgi?id=50173 } 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); +@@ -5078,6 +5080,8 @@ void webkitWebViewRemoveSubresource(WebK + if (!mainResource.isNull() && g_str_equal(identifier, mainResource.data())) + return; + g_hash_table_remove(webView->priv->subResources.get(), identifier); + -+ g_object_unref(webView); ++ g_object_unref(webView); } WebKitWebResource* webkit_web_view_get_resource(WebKitWebView* webView, char* identifier) diff --git a/www/webkit-gtk3/files/patch-Tools_ImageDiff_gtk_ImageDiff.cpp b/www/webkit-gtk3/files/patch-Tools_ImageDiff_gtk_ImageDiff.cpp new file mode 100644 index 000000000..0c47c03ee --- /dev/null +++ b/www/webkit-gtk3/files/patch-Tools_ImageDiff_gtk_ImageDiff.cpp @@ -0,0 +1,10 @@ +--- Tools/ImageDiff/gtk/ImageDiff.cpp.orig 2013-06-14 11:11:41.000000000 +0000 ++++ Tools/ImageDiff/gtk/ImageDiff.cpp 2013-06-14 11:27:33.000000000 +0000 +@@ -31,6 +31,7 @@ + #include <cmath> + #include <cstdio> + #include <cstring> ++#include <stdlib.h> + #include <gdk/gdk.h> + + using namespace std; diff --git a/www/webkit-gtk3/files/patch-cairo b/www/webkit-gtk3/files/patch-cairo deleted file mode 100644 index 2f928af19..000000000 --- a/www/webkit-gtk3/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-gtk3/files/patch-configure b/www/webkit-gtk3/files/patch-configure index 8466810cd..c326f9b82 100644 --- a/www/webkit-gtk3/files/patch-configure +++ b/www/webkit-gtk3/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2012-05-16 12:57:04.000000000 +0200 -+++ configure 2012-05-16 14:00:03.000000000 +0200 -@@ -19144,8 +19144,8 @@ +--- configure.orig 2013-06-11 12:47:07.000000000 +0200 ++++ configure 2013-06-22 10:50:41.000000000 +0200 +@@ -17508,8 +17508,8 @@ .SECONDARY: $(gsettings_SCHEMAS) gsettings__base_list = \ @@ -11,12 +11,66 @@ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) @$(NORMAL_INSTALL) -@@ -20440,7 +20440,7 @@ +@@ -17518,7 +17518,7 @@ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ +- done | $(gsettings__base_list) | \ ++ done | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \ +@@ -19538,8 +19538,8 @@ + $as_echo "yes" >&6; } + + fi +- FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS" +- FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS" ++ FREETYPE_CFLAGS="${FREETYPE_CFLAGS} $HARFBUZZ_ICU_CFLAGS" ++ FREETYPE_LIBS="${FREETYPE_LIBS} $HARFBUZZ_ICU_LIBS" + fi + + +@@ -20144,7 +20144,7 @@ + + fi + +-acceleration_backend_description=$with_acceleration_backend ++acceleration_backend_description=${with_acceleration_backend} + if test "$with_acceleration_backend" = "clutter"; then + + pkg_failed=no +@@ -20341,18 +20341,18 @@ + + if test "$with_acceleration_backend" = "opengl"; then + if test "$enable_gles2" = "yes"; then +- acceleration_backend_description+= "(gles2" ++ acceleration_backend_description="${acceleration_backend_description} (gles2" + OPENGL_LIBS="-lGLESv2" + else +- acceleration_backend_description+="(gl" ++ acceleration_backend_description="${acceleration_backend_description} (gl" + OPENGL_LIBS="-lGL" + fi + if test "$enable_egl" = "yes"; then +- acceleration_backend_description+=", egl" ++ acceleration_backend_description="${acceleration_backend_description}, egl" + OPENGL_LIBS+=" -lEGL" + fi + if test "$enable_glx" = "yes"; then +- acceleration_backend_description+=", glx" ++ acceleration_backend_description="${acceleration_backend_description}, glx" + fi + + # Check whether dlopen() is in the core libc like on FreeBSD, or in a separate +@@ -20405,8 +20405,8 @@ + - done -- OPENGL_LIBS="-lGL -ldl" -+ OPENGL_LIBS="-lGL" +- OPENGL_LIBS+=" $DLOPEN_LIBS" +- acceleration_backend_description+=")" ++ OPENGL_LIBS="${OPENGL_LIBS} $DLOPEN_LIBS" ++ acceleration_backend_description="${acceleration_backend_description})" fi |