Commit 69e3d032 authored by Spenser Gilliland's avatar Spenser Gilliland Committed by Peter Korsgaard
Browse files

webkit: bump to version 1.9.6 



Remove bison-2.6-compat patch as it has been incorporated upstream.
Remove fix build issue with old gtk as gtk has been bumped to a newer
version.
Remove fix-build-with-gcc-4-6 as it has incorporated upstream.
Remove directfb patches due to depreciation
Remove pool patch as it is no longer required
Remove pthread_getattr_np as webkit no longer uses this function.

Signed-off-by: default avatarSpenser Gilliland <spenser@gillilanding.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent dca87816

package/webkit/webkit-bison-2-6-compat.patch

deleted100644 → 0
+0 −672
Original line number Diff line number Diff line 
Bison 2.6 compatibility fix



Taken from upstream at http://trac.webkit.org/changeset/124099, with

minor adaptations.



Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>



Index: webkit-1.2.7/WebCore/ChangeLog

===================================================================

--- webkit-1.2.7.orig/WebCore/ChangeLog	2010-12-28 13:27:37.000000000 +0100

+++ webkit-1.2.7/WebCore/ChangeLog	2012-12-15 15:48:40.000000000 +0100

@@ -1,3 +1,28 @@

+2012-07-30  Alexis Menard  <alexis.menard@openbossa.org>

+

+        Build fix with newer bison 2.6.

+        https://bugs.webkit.org/show_bug.cgi?id=92264

+

+        Reviewed by Adam Barth.

+

+        As stated in http://www.gnu.org/software/bison/manual/html_node/Table-of-Symbols.html

+        YYLEX_PARAM and YYPARSE_PARAM are depecreated since version 1.875. So far all Mac OS

+        version I had access to as well as recent Linux runs at least version 2.3 so it's safe

+        to use the replacement of these deprecated macros in favor of %lex-param and %parse-param.

+        As announced http://lists.gnu.org/archive/html/info-gnu/2012-07/msg00011.html with the release

+        of version 2.6 YYLEX_PARAM and YYPARSE_PARAM are not supported anymore.

+

+        No new tests : build fix and the patch should not trigger any regressions

+

+        * css/CSSGrammar.y:

+        * css/CSSParser.cpp:

+        * xml/XPathGrammar.y: Refactored a bit to not use an intermediate PARSER define.

+        * xml/XPathParser.cpp: bison 2.6 declare xpathyyparse in the .h file now, i.e. XPathGrammar.h

+        therefore including this file within the namespace {} declarations leads to xpathyyparse being

+        defined part of WebCore::XPath namespaces but the actual implementation of xpathyyparse is in XPathGrammar.cpp

+        (generated) and not implemented within the WebCore::XPath so it lead to linking issues. Last, XPathGrammar.h needs 

+        to be included after the other includes as it uses some XPath types. It breaks the style but CSSParser.cpp is doing the same.

+

 2010-06-21  Philippe Normand  <pnormand@igalia.com>

 

         Reviewed by Xan Lopez.

Index: webkit-1.2.7/WebCore/css/CSSParser.cpp

===================================================================

--- webkit-1.2.7.orig/WebCore/css/CSSParser.cpp	2010-12-28 13:24:33.000000000 +0100

+++ webkit-1.2.7/WebCore/css/CSSParser.cpp	2012-12-15 17:29:57.000000000 +0100

@@ -81,7 +81,7 @@

 extern int cssyydebug;

 #endif

 

-extern int cssyyparse(void* parser);

+extern int cssyyparse(WebCore::CSSParser*);

 

 using namespace std;

 using namespace WTF;

@@ -226,7 +226,7 @@

     m_defaultNamespace = starAtom; // Reset the default namespace.

     

     setupParser("", string, "");

-    cssyyparse(this);

+    ::cssyyparse(this);

     m_rule = 0;

 }

 

@@ -235,7 +235,7 @@

     m_styleSheet = sheet;

     m_allowNamespaceDeclarations = false;

     setupParser("@-webkit-rule{", string, "} ");

-    cssyyparse(this);

+    ::cssyyparse(this);

     return m_rule.release();

 }

 

@@ -243,7 +243,7 @@

 {

     m_styleSheet = sheet;

     setupParser("@-webkit-keyframe-rule{ ", string, "} ");

-    cssyyparse(this);

+    ::cssyyparse(this);

     return m_keyframe.release();

 }

 

@@ -257,7 +257,7 @@

     m_id = id;

     m_important = important;

     

-    cssyyparse(this);

+    ::cssyyparse(this);

     

     m_rule = 0;

 

@@ -304,7 +304,7 @@

     m_styleSheet = static_cast<CSSStyleSheet*>(declaration->stylesheet());

 

     setupParser("@-webkit-decls{color:", string, "} ");

-    cssyyparse(this);

+    ::cssyyparse(this);

     m_rule = 0;

 

     return (m_numParsedProperties && m_parsedProperties[0]->m_id == CSSPropertyColor);

@@ -319,7 +319,7 @@

 

     setupParser("@-webkit-selector{", string, "}");

 

-    cssyyparse(this);

+    ::cssyyparse(this);

 

     m_selectorListForParseSelector = 0;

 }

@@ -330,7 +330,7 @@

     m_styleSheet = static_cast<CSSStyleSheet*>(declaration->stylesheet());

 

     setupParser("@-webkit-decls{", string, "} ");

-    cssyyparse(this);

+    ::cssyyparse(this);

     m_rule = 0;

 

     bool ok = false;

@@ -354,7 +354,7 @@

     // can't use { because tokenizer state switches from mediaquery to initial state when it sees { token.

     // instead insert one " " (which is WHITESPACE in CSSGrammar.y)

     setupParser("@-webkit-mediaquery ", string, "} ");

-    cssyyparse(this);

+    ::cssyyparse(this);

 

     bool ok = false;

     if (m_mediaQuery) {

@@ -5191,7 +5191,7 @@

     nameValuePair += variableValue;

 

     setupParser("@-webkit-variables-decls{", nameValuePair, "} ");

-    cssyyparse(this);

+    ::cssyyparse(this);

     m_rule = 0;

 

     bool ok = false;

Index: webkit-1.2.7/WebCore/css/CSSGrammar.y

===================================================================

--- webkit-1.2.7.orig/WebCore/css/CSSGrammar.y	2010-09-10 15:20:33.000000000 +0200

+++ webkit-1.2.7/WebCore/css/CSSGrammar.y	2012-12-15 15:48:40.000000000 +0100

@@ -51,14 +51,13 @@

 #define YYMAXDEPTH 10000

 #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 {

     bool boolean;

     char character;

@@ -85,7 +84,7 @@

 

 %{

 

-static inline int cssyyerror(const char*)

+static inline int cssyyerror(void*, const char*)

 {

     return 1;

 }

Index: webkit-1.2.7/WebCore/xml/XPathParser.cpp

===================================================================

--- webkit-1.2.7.orig/WebCore/xml/XPathParser.cpp	2010-09-10 15:20:33.000000000 +0200

+++ webkit-1.2.7/WebCore/xml/XPathParser.cpp	2012-12-15 15:56:37.000000000 +0100

@@ -35,20 +35,18 @@

 #include "XPathEvaluator.h"

 #include "XPathException.h"

 #include "XPathNSResolver.h"

+#include "XPathPath.h"

 #include "XPathStep.h"

 #include <wtf/StdLibExtras.h>

 

-int xpathyyparse(void*);

-

+using namespace WebCore;

 using namespace WTF;

 using namespace Unicode;

 

-namespace WebCore {

-namespace XPath {

-

-class LocationPath;

+using namespace XPath;

 

-#include "XPathGrammar.h"    

+extern int xpathyyparse(WebCore::XPath::Parser*);

+#include "XPathGrammar.h"

 

 Parser* Parser::currentParser = 0;

     

@@ -630,7 +628,5 @@

     delete t;

 }

 

-}

-}

 

 #endif // ENABLE(XPATH)

Index: webkit-1.2.7/WebCore/xml/XPathGrammar.y

===================================================================

--- webkit-1.2.7.orig/WebCore/xml/XPathGrammar.y	2010-02-05 17:26:58.000000000 +0100

+++ webkit-1.2.7/WebCore/xml/XPathGrammar.y	2012-12-15 15:48:40.000000000 +0100

@@ -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($$);

     }

     ;

package/webkit/webkit-disable-docrebase.patch

0 → 100644
+26 −0
Original line number Diff line number Diff line 
This patch prevents documentation from being rebased or installed. This

prevents an error when gtk-doc --rebase is called.



Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>

----

Index: webkit-1.9.6/Tools/GNUmakefile.am

===================================================================

--- webkit-1.9.6.orig/Tools/GNUmakefile.am	2012-08-06 07:34:49.000000000 -0500

+++ webkit-1.9.6/Tools/GNUmakefile.am	2013-05-28 21:29:54.135112927 -0500

@@ -262,6 +262,8 @@

 	Tools/Scripts/webkit-build-directory \

 	Tools/Scripts/webkitdirs.pm

 

+if ENABLE_GTK_DOC

+

 docs: docs-build.stamp

 .PHONY : docs

 DISTCLEANFILES += docs-build.stamp

@@ -362,7 +364,6 @@

 	rm -rf $${installdir}

 endif

 

-if ENABLE_GTK_DOC

 all: docs-build.stamp

 endif

package/webkit/webkit-disable-tests.patch

0 → 100644
+80 −0
Original line number Diff line number Diff line 
This prevents the Webkit test suites from being built.



Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>

----

Index: webkit-1.9.6/GNUmakefile.am

===================================================================

--- webkit-1.9.6.orig/GNUmakefile.am	2012-08-06 03:17:24.000000000 -0500

+++ webkit-1.9.6/GNUmakefile.am	2013-05-28 10:08:53.645129501 -0500

@@ -282,11 +282,14 @@

 include Tools/DumpRenderTree/gtk/GNUmakefile.ImageDiff.am

 

 include Source/WebKit2/GNUmakefile.am

-include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am

 include Tools/MiniBrowser/gtk/GNUmakefile.am

+

+if ENABLE_TESTS

+include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am

 include Tools/WebKitTestRunner/GNUmakefile.am

 include Source/ThirdParty/gtest/GNUmakefile.am

 include Tools/TestWebKitAPI/GNUmakefile.am

+endif # ENABLE_TESTS

 # [GTK] Refactor the translations now that we have webkit2

 # https://bugs.webkit.org/show_bug.cgi?id=55153

 

Index: webkit-1.9.6/Source/WebKit/gtk/GNUmakefile.am

===================================================================

--- webkit-1.9.6.orig/Source/WebKit/gtk/GNUmakefile.am	2012-07-19 05:02:29.000000000 -0500

+++ webkit-1.9.6/Source/WebKit/gtk/GNUmakefile.am	2013-05-28 10:09:49.277130516 -0500

@@ -413,6 +413,7 @@

 dist_resources_DATA = \

 	$(shell ls $(srcdir)/Source/WebKit/gtk/resources/*.html)

 

+if ENABLE_TESTS

 # Build unit tests

 webkit_tests_cflags = \

 	-fno-strict-aliasing \

@@ -613,6 +614,8 @@

 Programs_unittests_testcopyandpaste_LDADD = $(webkit_tests_ldadd)

 Programs_unittests_testcopyandpaste_LDFLAGS = $(webkit_tests_ldflags)

 

+endif # ENABLE_TESTS

+

 # Project-wide clean rules

 # Files that will be cleaned

 CLEANFILES += \

Index: webkit-1.9.6/configure.ac

===================================================================

--- webkit-1.9.6.orig/configure.ac	2012-08-06 08:45:10.000000000 -0500

+++ webkit-1.9.6/configure.ac	2013-05-28 10:07:55.817128445 -0500

@@ -516,6 +516,14 @@

 AC_SUBST(CAIRO_CFLAGS)

 AC_SUBST(CAIRO_LIBS)

 

+# check wheter to build tests

+AC_MSG_CHECKING([wheter to build tests])

+AC_ARG_ENABLE(tests,

+              AC_HELP_STRING([--enable-tests],

+                             [turn on tests [default=no]]),

+              [],[enable_debug="no"])

+AC_MSG_RESULT([$enable_tests])

+

 # check whether to build with debugging enabled

 AC_MSG_CHECKING([whether to do a debug build])

 AC_ARG_ENABLE(debug,

@@ -1423,6 +1431,7 @@

 AM_CONDITIONAL([USE_FARSTREAM], [test "$have_farstream" = "yes"])

 

 # WebKit feature conditionals

+AM_CONDITIONAL([ENABLE_TESTS],[test "$enable_tests" = "yes"])

 AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug_features" = "yes"])

 AM_CONDITIONAL([ENABLE_UNSTABLE_FEATURES],[test "$enable_unstable_features" = "yes"])

 AM_CONDITIONAL([ENABLE_WEBGL],[test "$enable_webgl" = "yes"])

@@ -1534,6 +1543,7 @@

 WebKit was configured with the following options:

 

 Build configuration:

+ Enable tests (slow)                                      : $enable_tests

  Enable debugging (slow)                                  : $enable_debug

  Compile with debug symbols (slow)                        : $enable_debug_symbols

  Enable debug features (slow)                             : $enable_debug_features

package/webkit/webkit-execinfo_h.patch

0 → 100644
+28 −0
Original line number Diff line number Diff line 
Fixes uclibc build as uclibc does not include backtrace functionality



Signed-of-by: Spenser Gilliland <spenser@gillilanding.com>

----

Index: webkit-1.9.6/Source/WTF/wtf/Assertions.cpp

===================================================================

--- webkit-1.9.6.orig/Source/WTF/wtf/Assertions.cpp

+++ webkit-1.9.6/Source/WTF/wtf/Assertions.cpp

@@ -61,8 +61,10 @@

 #if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)

 #include <cxxabi.h>

 #include <dlfcn.h>

+#if !defined(__UCLIBC__)

 #include <execinfo.h>

 #endif

+#endif

 

 #if OS(ANDROID)

 #include "android/log.h"

@@ -268,7 +270,7 @@ void WTFReportArgumentAssertionFailure(c

 

 void WTFGetBacktrace(void** stack, int* size)

 {

-#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)

+#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID) && !defined(__UCLIBC__)

     *size = backtrace(stack, *size);

 #elif OS(WINDOWS) && !OS(WINCE)

     // The CaptureStackBackTrace function is available in XP, but it is not defined

package/webkit/webkit-fix-build-issue-with-old-gtk.patch

deleted100644 → 0
+0 −22

File deleted.

Preview size limit exceeded, changes collapsed.