Ticket #39923: webkit2.0-bison3.patch

File webkit2.0-bison3.patch, 1.7 KB (added by larryv (Lawrence Velázquez), 9 years ago)

adaptation of upstream fix

  • dports/www/webkit-gtk-2.0/Portfile 

    commit 5c10be0510f86b2f80cd804b6f563671a1228576
Author: Lawrence Velázquez <larryv@macports.org>
Date:   8 hours ago

    webkit-{gtk,gtk3}-2.0: Fix build with Bison 3 (#39923)
    
    Adapted from upstream fix (http://trac.webkit.org/changeset/154109).

diff --git a/dports/www/webkit-gtk-2.0/Portfile b/dports/www/webkit-gtk-2.0/Portfile
index 1911ffb..23eadc0 100644
    a b depends_build \ 
    5656# ppc.patch: https://bugs.webkit.org/show_bug.cgi?id=96005
    5757# tiger.patch: No upstream bug, http://trac.macports.org/ticket/35923
    5858# quartz-webcore.patch: https://bugs.webkit.org/show_bug.cgi?id=126326
     59# bison3.patch: https://bugs.webkit.org/show_bug.cgi?id=119373
    5960
    6061patchfiles \
    6162        clang-assertions.patch \
    … … patchfiles \ 
    6768        ppc.patch \
    6869        tiger.patch \
    6970        quartz-webcore.patch \
    70         patch-freetype-includes.diff
     71        patch-freetype-includes.diff \
     72        bison3.patch
    7173
    7274conflicts_build     google-test
    7375

  • new file dports/www/webkit-gtk-2.0/files/bison3.patch 

    diff --git a/dports/www/webkit-gtk-2.0/files/bison3.patch b/dports/www/webkit-gtk-2.0/files/bison3.patch
new file mode 100644
index 0000000..ebe846b
    - +  
     1Index: Source/ThirdParty/ANGLE/src/compiler/glslang.y
     2===================================================================
     3--- Source/ThirdParty/ANGLE/src/compiler/glslang.y.orig
     4+++ Source/ThirdParty/ANGLE/src/compiler/glslang.y
     5@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glsl
     6 %expect 1 /* One shift reduce conflict because of if | else */
     7 %pure-parser
     8 %parse-param {TParseContext* context}
     9+%lex-param {YYLEX_PARAM}
     10 
     11 %union {
     12     struct {