<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d748052e3c6c0f7e1230514d581648c77d251fc2">https://github.com/macports/macports-ports/commit/d748052e3c6c0f7e1230514d581648c77d251fc2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new d748052e3c6 qt5-qtwebengine: fix bison 3.7.x issue
</span>d748052e3c6 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit d748052e3c6c0f7e1230514d581648c77d251fc2
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Wed Aug 12 15:53:42 2020 -0500

<span style='display:block; white-space:pre;color:#404040;'>    qt5-qtwebengine: fix bison 3.7.x issue
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/60978
</span>---
 aqua/qt5/Portfile                       |  3 +++
 aqua/qt5/files/patch-rule_bison.py.diff | 13 +++++++++++++
 2 files changed, 16 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 487119fe3fe..1616a49884b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1550,6 +1550,9 @@ foreach {module module_info} [array get modules] {
</span>                 # If Patch version is provided it fails with "Exception: No Major.Minor.Patch+ SDK found"
                 patchfiles-append patch-qtwebengine_sdk.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                # see https://trac.macports.org/ticket/60978
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                patchfiles-append patch-rule_bison.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>                 # see https://trac.macports.org/ticket/59294
                 use_xcode yes
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-rule_bison.py.diff b/aqua/qt5/files/patch-rule_bison.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..52156841c2b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-rule_bison.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/old/rule_bison.py b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f75e25f..6d96b7e 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,7 +101,7 @@ assert outputHTmp != None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ outputHFile = open(outputHTmp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ outputHContents = outputHFile.read()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ outputHFile.close()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-os.unlink(outputHTmp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# not working for bison-3.7: os.unlink(outputHTmp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Rewrite the generated header with #include guards.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ outputH = os.path.join(outputDir, inputRoot + '.h')
</span></pre><pre style='margin:0'>

</pre>