[pkgsrc/trunk]: pkgsrc/www/webkit-gtk Fix build with bison 2.4

[jmcneill <jmcneill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7411755e9195
branches:  trunk
changeset: 551284:7411755e9195
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Thu Dec 11 20:53:04 2008 +0000

description:
Fix build with bison 2.4

diffstat:

 www/webkit-gtk/distinfo         |   3 ++-
 www/webkit-gtk/patches/patch-ae |  38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletions(-)

diffs (56 lines):

diff -r d0b1df57da04 -r 7411755e9195 www/webkit-gtk/distinfo
--- a/www/webkit-gtk/distinfo   Thu Dec 11 20:19:22 2008 +0000
+++ b/www/webkit-gtk/distinfo   Thu Dec 11 20:53:04 2008 +0000
@@ -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-ab) = 19d9ac9a362a8c41025775bc60634dc1e5c3c28c
 SHA1 (patch-ac) = bea7fc5d165ca6720d06d068868a285890a1b8c9
 SHA1 (patch-ad) = 4ed7d225a499dad3d35ae922a05953cdc7a5b62d
+SHA1 (patch-ae) = 52fc990648792d95006e38e65a577b5808777be7
diff -r d0b1df57da04 -r 7411755e9195 www/webkit-gtk/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/webkit-gtk/patches/patch-ae   Thu Dec 11 20:53:04 2008 +0000
@@ -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 */