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

[andyrtr at archlinux.org]

    Date: Monday, December 8, 2008 @ 15:02:59
  Author: andyrtr
Revision: 21017

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

........
  r21016 | andyrtr | 2008-12-08 20:02:26 +0000 (Mo, 08 Dez 2008) | 1 line
  
  upgpkg: libwebkit 1.0.3-0.39096
........

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

-------------------------------+
 PKGBUILD                      |   28 ++++++++++++++++------------
 buildfix_webkit_bison2.4.diff |   32 ++++++++++++++++++++++++++------
 2 files changed, 42 insertions(+), 18 deletions(-)


Property changes on: libwebkit/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /libwebkit/trunk:1-19427
   + /libwebkit/trunk:1-21016

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-08 20:02:26 UTC (rev 21016)
+++ extra-x86_64/PKGBUILD	2008-12-08 20:02:59 UTC (rev 21017)
@@ -3,8 +3,9 @@
 
 pkgname=libwebkit
 _origname=webkit
-pkgver=1.0.1
-pkgrel=1
+pkgver=1.0.3 # see configure.ac
+pkgrel=0.39096
+_svnver=39096 # date: 20081208
 pkgdesc="an opensource web content engine, derived from KHTML and KJS from KDE"
 arch=('i686' 'x86_64')
 url="http://webkit.org/"
@@ -14,24 +15,27 @@
 provides=('webkitgtk-svn')
 conflicts=('webkitgtk-svn')
 replaces=('webgitgtk-svn')
-source=(http://people.freedesktop.org/~alp/${_origname}/gtk/${_origname}-${pkgver}.tar.gz
-	http://people.freedesktop.org/~alp/webkit/gtk/webkit-cairo-canvas-r34625-for-1.0.1.patch
-	buildfix.diff
+source=(#http://people.freedesktop.org/~alp/${_origname}/gtk/${_origname}-${pkgver}.tar.gz
+	${pkgname}-${pkgver}.${_svnver}.tar.gz
 	buildfix_webkit_bison2.4.diff)
-md5sums=('4de68a5773998bea14e8939aa341c466' 'ccb08e8394211f97c237d615b46db01a'\
-         'e90a20a513ba8bdf2851c89f0af19bfb' '6c15894d304671f6eb9114cb715d42ca')
 options=('!libtool')
+md5sums=('2a1d2b41b3676f8e73f9c81f0bd1343c'
+         '98c8c22b290160f4de7dfcf62eef67bc')
 
 build() {
-  cd ${srcdir}/${_origname}-${pkgver}
-  patch -Np1 -i ${srcdir}/webkit-cairo-canvas-r34625-for-1.0.1.patch || return 1
-  patch -Np0 -i ${srcdir}/buildfix.diff || return 1
-  patch -Np1 -i ${srcdir}/buildfix_webkit_bison2.4.diff || return 1
+  cd ${srcdir}/ #${_origname}
+#  svn checkout -r ${_svnver} http://svn.webkit.org/repository/webkit/trunk WebKit
+#  find ${srcdir} -type d -depth -name ".svn" -exec rm -rf {} \;
+#  tar -cvzf ../${pkgname}-${pkgver}.${_svnver}.tar.gz WebKit/*
+#  return 1
+
+  cd ${srcdir}/WebKit
+  patch -Np1 -i ${srcdir}/buildfix_webkit_bison2.4.diff || return 1 
   ./autogen.sh --prefix=/usr
   make || return 1
   make DESTDIR="$pkgdir" install
 
   # install license
-  install -Dm644 ${srcdir}/${_origname}-${pkgver}/WebKit/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 ${srcdir}/WebKit/WebKit/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
 

Modified: extra-x86_64/buildfix_webkit_bison2.4.diff
===================================================================
--- extra-x86_64/buildfix_webkit_bison2.4.diff	2008-12-08 20:02:26 UTC (rev 21016)
+++ extra-x86_64/buildfix_webkit_bison2.4.diff	2008-12-08 20:02:59 UTC (rev 21017)
@@ -1,7 +1,26 @@
-diff -Naur webkit-1.0.1/WebCore/css/CSSGrammar.y webkit-1.0.1-new/WebCore/css/CSSGrammar.y
---- webkit-1.0.1/WebCore/css/CSSGrammar.y	2008-06-15 19:40:06.000000000 -0400
-+++ webkit-1.0.1-new/WebCore/css/CSSGrammar.y	2008-11-23 00:42:28.408816319 -0500
-@@ -1070,10 +1070,10 @@
+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. */
@@ -12,6 +31,7 @@
    | 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_RGBCOLOR; }
-   | '#' maybe_space { $$.id = 0; $$.string = ParseString(); $$.unit = CSSPrimitiveValue::CSS_RGBCOLOR; } /* Handle error case: "color: #;" */
+   | 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 */
+