Skip to Content.
Sympa Menu

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

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 (cc79fc4acd91cfcba0c8e05393fa11af5541e5d7)
  • Date: Sun, 11 Jan 2009 10:27:30 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

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

New commits:
commit cc79fc4acd91cfcba0c8e05393fa11af5541e5d7
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

webkitgtk: Updated to r39790. Upstream has now
incorporated official fix for bison 2.4.x issues.

diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index c496b06..9c57e5d 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,8 +1,8 @@
SPELL=webkitgtk
- VERSION=r39077
+ VERSION=r39790
SOURCE=WebKit-$VERSION.tar.bz2
SOURCE_URL[0]=http://nightly.webkit.org/files/trunk/src/$SOURCE
-
SOURCE_HASH=sha512:c4a79c71b97a155f5b26aa5066b21a9379a3adeeda4dd8b9fab5d5249532b6f909274df86e914816f4cced7ce5016ed752197af83e20148f4edc7daddc60cc29
+
SOURCE_HASH=sha512:b48c462b3064c58d61b4d711014a33c6d2275351d206d0641fdd101db967e2fe3c72ab0af3ef2857fd4324dafe22c7960f88218ca9641637e1b29b23daf533e5
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 8e4d6bd..3724b8a 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,8 @@
+2009-01-11 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version r39790
+ * PRE_BUILD: Removed bison patch
+ * webkit-bison.patch: Removed. Official fix incorporated upstream
+
2008-12-09 George Sherwood <gsherwood AT sourcemage.org>
* CONFIGURE: Added option for libsoup http backend
* DEPENDS: depends on either curl or libsoup depending on http backend
diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
index 6ca0682..1b0a55f 100755
--- a/http/webkitgtk/PRE_BUILD
+++ b/http/webkitgtk/PRE_BUILD
@@ -1,8 +1,6 @@
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
deleted file mode 100644
index 55b2bc9..0000000
--- a/http/webkitgtk/webkit-bison.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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 (cc79fc4acd91cfcba0c8e05393fa11af5541e5d7), George Sherwood, 01/11/2009

Archive powered by MHonArc 2.6.24.

Top of Page