Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (762a1acab72ed1701cfc3b826926f1d9a039be41)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (762a1acab72ed1701cfc3b826926f1d9a039be41)
  • Date: Sun, 7 Dec 2008 17:54:23 -0600

GIT changes to master grimoire by George Sherwood <george AT beernabeer.com>:

http/webkitgtk/DETAILS | 4 ++--
http/webkitgtk/HISTORY | 5 +++++
http/webkitgtk/PRE_BUILD | 2 ++
http/webkitgtk/webkit-bison.patch | 36 ++++++++++++++++++++++++++++++++++++
4 files changed, 45 insertions(+), 2 deletions(-)

New commits:
commit 762a1acab72ed1701cfc3b826926f1d9a039be41
Author: George Sherwood <george AT beernabeer.com>
Commit: George Sherwood <george AT beernabeer.com>

webkitgtk: Updated to version r39077. Added patch to fix compile
problems with bison 2.4

diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index eed737e..c496b06 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,8 +1,8 @@
SPELL=webkitgtk
- VERSION=r38654
+ VERSION=r39077
SOURCE=WebKit-$VERSION.tar.bz2
SOURCE_URL[0]=http://nightly.webkit.org/files/trunk/src/$SOURCE
-
SOURCE_HASH=sha512:00f8c32b1ac42afea8bdc0c45a034f294645ec525f7fa1249e51cef85134c76150b6b925ec0aa86b8370bd7ffd7dc6fbfcc0750c4734bcdf8600ff318162d598
+
SOURCE_HASH=sha512:c4a79c71b97a155f5b26aa5066b21a9379a3adeeda4dd8b9fab5d5249532b6f909274df86e914816f4cced7ce5016ed752197af83e20148f4edc7daddc60cc29
SOURCE_DIRECTORY="$BUILD_DIRECTORY/WebKit-$VERSION"
WEB_SITE=http://webkit.org/
GATHER_DOCS=off
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 727e35b..b189ad3 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,8 @@
+2008-12-07 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version r39077
+ * PRE_BUILD: Added upstream patch
+ * webkit-bison.patch: Added patch to fix problems with bison 2.4
+
2008-11-21 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version r38654

diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
index 1b0a55f..6ca0682 100755
--- a/http/webkitgtk/PRE_BUILD
+++ b/http/webkitgtk/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -p0 < $SCRIPT_DIRECTORY/webkit-bison.patch &&
+
sed -i "/.*configure \$AUTOGEN_CONFIGURE_ARGS.*/d" autogen.sh &&

./autogen.sh
diff --git a/http/webkitgtk/webkit-bison.patch
b/http/webkitgtk/webkit-bison.patch
new file mode 100644
index 0000000..55b2bc9
--- /dev/null
+++ b/http/webkitgtk/webkit-bison.patch
@@ -0,0 +1,36 @@
+diff --git WebCore/css/CSSGrammar.y WebCore/css/CSSGrammar.y
+index 9ee9c93..9d0a0c6 100644
+--- WebCore/css/CSSGrammar.y
++++ 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 */



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (762a1acab72ed1701cfc3b826926f1d9a039be41), George Sherwood, 12/07/2008

Archive powered by MHonArc 2.6.24.

Top of Page