Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=ea2b0841d16b776810235e9fb7bec253e51dd2c9
commit ea2b0841d16b776810235e9fb7bec253e51dd2c9 Author: bouleetbil <[EMAIL PROTECTED]> Date: Wed Dec 10 20:53:10 2008 +0100 webkit-38850-1-i686 *version bump *this version should be able to use flash plugin diff --git a/source/xlib-extra/webkit/FrugalBuild b/source/xlib-extra/webkit/FrugalBuild index 45e1185..831c89f 100644 --- a/source/xlib-extra/webkit/FrugalBuild +++ b/source/xlib-extra/webkit/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: bouleetbil <[EMAIL PROTECTED]> pkgname=webkit -pkgver=37790 -pkgrel=2 +pkgver=38850 +pkgrel=1 pkgdesc="Open source web browser engine that's used by Safari" url="http://www.webkit.org"; depends=('sqlite3' 'gtk+2' 'icu' 'curl' 'libpng' 'gperf'\ @@ -11,11 +11,12 @@ depends=('sqlite3' 'gtk+2' 'icu' 'curl' 'libpng' 'gperf'\ makedepends=('bison' 'flex' 'gnome-vfs' 'gst-plugins-base') groups=('xlib-extra') archs=('i686') -source=(http://nightly.webkit.org/files/trunk/src/WebKit-r$pkgver.tar.bz2) +source=(http://nightly.webkit.org/files/trunk/src/WebKit-r$pkgver.tar.bz2 fix-bison-incompatibility.patch) up2date="lynx -dump http://nightly.webkit.org/builds/trunk/src/1 | grep WebKit-r | cut -d '-' -f 2 | head -1 | cut -d_ -f1 | cut -d 'r' -f 2 | cut -d '.' -f 1" options=('scriptlet') _F_cd_path="WebKit-r$pkgver" -sha1sums=('fd4dee6f1197291c4c7abf638c127da91f9404cf') +sha1sums=('079a32b6ae6d50d8b77f50b147cd5e288bf69c08' \ + 'a6dde368a0ed5b551d94bd52281bdd1b9e32d032') subpkgs=("webkit-gnome") subdescs=("Open source web browser engine that's used by Safari with gnome support") diff --git a/source/xlib-extra/webkit/fix-bison-incompatibility.patch b/source/xlib-extra/webkit/fix-bison-incompatibility.patch new file mode 100644 index 0000000..ccb3667 --- /dev/null +++ b/source/xlib-extra/webkit/fix-bison-incompatibility.patch @@ -0,0 +1,36 @@ +diff --git a/WebCore/css/CSSGrammar.y b/WebCore/css/CSSGrammar.y +index 9ee9c93..9d0a0c6 100644 +--- a/WebCore/css/CSSGrammar.y ++++ b/WebCore/css/CSSGrammar.y +@@ -94,6 +94,8 @@ static int cssyylex(YYSTYPE* yylval, void* parser) + + %expect 49 + ++%nonassoc LOWEST_PREC ++ + %left UNIMPORTANT_TOK + + %token WHITESPACE SGML_CD +@@ -349,7 +351,7 @@ maybe_charset: + + closing_brace: + '}' +- | %prec maybe_sgml TOKEN_EOF ++ | %prec LOWEST_PREC TOKEN_EOF + ; + + charset: +@@ -1357,10 +1357,10 @@ term: + $$.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 */ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
