[arch-commits] Commit in libwebkit/repos (3 files)

[andyrtr at archlinux.org]

    Date: Wednesday, January 14, 2009 @ 14:48:14
  Author: andyrtr
Revision: 24168

Merged revisions 24163-24164 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/libwebkit/trunk

........
  r24163 | andyrtr | 2009-01-14 19:36:02 +0000 (Mi, 14 Jan 2009) | 2 lines
  
  upgpkg: libwebkit 1.0.3-0.39852
      new snapshot, revision r39852
........
  r24164 | andyrtr | 2009-01-14 19:37:34 +0000 (Mi, 14 Jan 2009) | 2 lines
  
  upgpkg: libwebkit 1.0.3-0.39852
      new snapshot, revision r39852
........

Modified:
  libwebkit/repos/extra-i686/	(properties)
  libwebkit/repos/extra-i686/PKGBUILD
Deleted:
  libwebkit/repos/extra-i686/buildfix_webkit_bison2.4.diff

-------------------------------+
 PKGBUILD                      |   10 +++-------
 buildfix_webkit_bison2.4.diff |   37 -------------------------------------
 2 files changed, 3 insertions(+), 44 deletions(-)


Property changes on: libwebkit/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /libwebkit/trunk:1-23402
   + /libwebkit/trunk:1-24167

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-01-14 19:45:07 UTC (rev 24167)
+++ extra-i686/PKGBUILD	2009-01-14 19:48:14 UTC (rev 24168)
@@ -3,7 +3,7 @@
 
 pkgname=libwebkit
 pkgver=1.0.3 # see configure.ac
-_svnver=39737 # date: 20090109
+_svnver=39852 # date: 20090113
 pkgrel=0.${_svnver}
 pkgdesc="an opensource web content engine, derived from KHTML and KJS from KDE"
 arch=('i686' 'x86_64')
@@ -14,16 +14,12 @@
 provides=('webkitgtk-svn')
 conflicts=('webkitgtk-svn')
 replaces=('webgitgtk-svn')
-source=(http://builds.nightly.webkit.org/files/trunk/src/WebKit-r${_svnver}.tar.bz2
-	buildfix_webkit_bison2.4.diff)
+source=(http://builds.nightly.webkit.org/files/trunk/src/WebKit-r${_svnver}.tar.bz2)
 options=('!libtool')
-md5sums=('2abdb91cf96b247bdabde58f4a4cf6dc'
-         '98c8c22b290160f4de7dfcf62eef67bc')
+md5sums=('89c901c31b29ba21ee696f665ee039be')
 
 build() {
   cd ${srcdir}/WebKit-r${_svnver}
-  patch -Np1 -i ${srcdir}/buildfix_webkit_bison2.4.diff || return 1 
-
   ./autogen.sh --prefix=/usr \
 	--enable-video \
 	--with-font-backend=freetype \

Deleted: extra-i686/buildfix_webkit_bison2.4.diff
===================================================================
--- extra-i686/buildfix_webkit_bison2.4.diff	2009-01-14 19:45:07 UTC (rev 24167)
+++ extra-i686/buildfix_webkit_bison2.4.diff	2009-01-14 19:48:14 UTC (rev 24168)
@@ -1,37 +0,0 @@
-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 */
-