diff options
| -rw-r--r-- | www/webkit-gtk/distinfo | 3 | ||||
| -rw-r--r-- | www/webkit-gtk/patches/patch-ae | 38 |
2 files changed, 40 insertions, 1 deletions
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo index bb9c5e37a89..ddb0ba9f717 100644 --- a/www/webkit-gtk/distinfo +++ b/www/webkit-gtk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2008/12/11 19:38:57 ahoka Exp $ +$NetBSD: distinfo,v 1.2 2008/12/11 20:53:04 jmcneill Exp $ SHA1 (WebKit-r35656.tar.bz2) = 38f403fb332cb445467a2bd9a3143ceefca784ff RMD160 (WebKit-r35656.tar.bz2) = 729f5c7e2ef33b6c841d665c839ef6ee47efb71c @@ -7,3 +7,4 @@ SHA1 (patch-aa) = a89653a6cee06a6573fd8111c0dd35f887782337 SHA1 (patch-ab) = 19d9ac9a362a8c41025775bc60634dc1e5c3c28c SHA1 (patch-ac) = bea7fc5d165ca6720d06d068868a285890a1b8c9 SHA1 (patch-ad) = 4ed7d225a499dad3d35ae922a05953cdc7a5b62d +SHA1 (patch-ae) = 52fc990648792d95006e38e65a577b5808777be7 diff --git a/www/webkit-gtk/patches/patch-ae b/www/webkit-gtk/patches/patch-ae new file mode 100644 index 00000000000..c9019e2309e --- /dev/null +++ b/www/webkit-gtk/patches/patch-ae @@ -0,0 +1,38 @@ +$NetBSD: patch-ae,v 1.1 2008/12/11 20:53:04 jmcneill Exp $ + +https://bugs.webkit.org/show_bug.cgi?id=22205 + +--- WebCore/css/CSSGrammar.y.orig 2008-08-08 00:50:53.000000000 -0400 ++++ WebCore/css/CSSGrammar.y 2008-12-11 15:46:35.000000000 -0500 +@@ -93,6 +93,8 @@ + + %expect 48 + ++%nonassoc LOWEST_PREC ++ + %left UNIMPORTANT_TOK + + %token WHITESPACE SGML_CD +@@ -335,7 +337,7 @@ + + closing_brace: + '}' +- | %prec maybe_sgml TOKEN_EOF ++ | %prec LOWEST_PREC TOKEN_EOF + ; + + charset: +@@ -1323,10 +1325,10 @@ + $$.string = $1; + } + /* We might need to actually parse the number from a dimension, but we can't just put something that uses $$.string into unary_term. */ +- | DIMEN maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_DIMENSION } +- | unary_operator DIMEN maybe_space { $$.id = 0; $$.string = $2; $$.unit = CSSPrimitiveValue::CSS_DIMENSION } ++ | DIMEN maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; } ++ | unary_operator DIMEN maybe_space { $$.id = 0; $$.string = $2; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; } + | URI maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_URI; } +- | UNICODERANGE maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_UNICODE_RANGE } ++ | UNICODERANGE maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_UNICODE_RANGE; } + | hexcolor { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; } + | '#' maybe_space { $$.id = 0; $$.string = CSSParserString(); $$.unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; } /* Handle error case: "color: #;" */ + /* FIXME: according to the specs a function can have a unary_operator in front. I know no case where this makes sense */ |