<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/476b4fb7b1feedb0e581fc5aa391671321a6fe97">https://github.com/macports/macports-ports/commit/476b4fb7b1feedb0e581fc5aa391671321a6fe97</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 476b4fb7b1f qt511-qtwebkit: revbump and fix against new bison
</span>476b4fb7b1f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 476b4fb7b1feedb0e581fc5aa391671321a6fe97
</span>Author: Ken Cunningham <ken.cunningham.webuse@gmail.com>
AuthorDate: Tue Feb 23 08:43:03 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> qt511-qtwebkit: revbump and fix against new bison
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> needs a revbump due to jpegturbo change
</span><span style='display:block; white-space:pre;color:#404040;'> needs a fix due to bison update
</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/60975
</span>---
aqua/qt511/Portfile | 7 +++++-
aqua/qt511/files/patch-webkit_XPathGrammar.y.diff | 10 ++++++++
aqua/qt511/files/patch-webkit_makegrammar.pl.diff | 29 +++++++++++++++++++++++
3 files changed, 45 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt511/Portfile b/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d9a5614f6db..fbe5bc12699 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -629,7 +629,7 @@ array set modules {
</span> {"Qt WebKit" "Qt WebKit Widgets"}
"community support only (use Qt WebEngine)"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 3"
</span> "License: "
}
qtwebkit-examples {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1399,6 +1399,11 @@ foreach {module module_info} [array get modules] {
</span>
# see https://bugs.webkit.org/show_bug.cgi?id=171612
patchfiles-append patch-qtwebkit_fix_icu.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # work around https://trac.macports.org/ticket/60975
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-webkit_XPathGrammar.y.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-webkit_makegrammar.pl.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
# special case
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt511/files/patch-webkit_XPathGrammar.y.diff b/aqua/qt511/files/patch-webkit_XPathGrammar.y.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..26f22de7e95
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt511/files/patch-webkit_XPathGrammar.y.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/xml/XPathGrammar.y.orig 2017-06-16 14:46:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/xml/XPathGrammar.y 2020-09-18 23:36:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,6 +53,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %pure_parser
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %parse-param { WebCore::XPath::Parser* parser }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++%define api.header.include { "XPathGrammar.h" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %union
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt511/files/patch-webkit_makegrammar.pl.diff b/aqua/qt511/files/patch-webkit_makegrammar.pl.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b1f35883f19
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt511/files/patch-webkit_makegrammar.pl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/css/makegrammar.pl.orig 2017-06-16 14:46:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/css/makegrammar.pl 2020-09-18 22:59:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,23 +73,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $fileBase = File::Spec->join($outputDir, $filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-system("$bison -d -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-open HEADER, ">$fileBase.h" or die;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-print HEADER << "EOF";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef CSSGRAMMAR_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define CSSGRAMMAR_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-while (<HPP>) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print HEADER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-close HPP;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-print HEADER "#endif\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-close HEADER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-unlink("$fileBase.cpp.h");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-unlink("$fileBase.hpp");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++system(@bisonCommand) == 0 or die;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>