3 files changed, 87 insertions, 1 deletions
diff --git a/source/l/qt5-webkit/qt5-webkit.SlackBuild b/source/l/qt5-webkit/qt5-webkit.SlackBuild
index 120b55249..6717b45bd 100755
--- a/source/l/qt5-webkit/qt5-webkit.SlackBuild
+++ b/source/l/qt5-webkit/qt5-webkit.SlackBuild
@@ -28,7 +28,7 @@ PKGNAM=qt5-webkit
 SRCNAM=qtwebkit
 SRCVER=${SRCVER:-5.212.0-alpha4}
 VERSION=$(echo $SRCVER | tr - _)
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -97,6 +97,12 @@ else
   RELOCATIONS=""
 fi
 
+# Fix for icu 68.1 no longer defining TRUE and FALSE externally:
+zcat $CWD/qt5-webkit.icu68_1.diff.gz | patch -p1 --verbose || exit 1
+
+# Fix for bison 3.7.x:
+zcat $CWD/qt5-webkit.bison27.patch.gz | patch -p1 --verbose || exit 1
+
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing"
 export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing"
diff --git a/source/l/qt5-webkit/qt5-webkit.bison27.patch b/source/l/qt5-webkit/qt5-webkit.bison27.patch
new file mode 100644
index 000000000..e8f66ab14
--- /dev/null
+++ b/source/l/qt5-webkit/qt5-webkit.bison27.patch
@@ -0,0 +1,46 @@
+From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57@gmail.com>
+Date: Tue, 4 Aug 2020 21:04:06 +0300
+Subject: [PATCH] Let Bison generate the header directly, to fix build with
+ Bison 3.7
+
+Starting with Bison 3.7, the generated C++ file #include's the header
+by default, instead of duplicating it. So we should not delete it.
+
+Remove the code to add #ifdef guards to the header, since Bison adds
+them itself since version 2.6.3.
+---
+ Source/WebCore/css/makegrammar.pl | 21 +--------------------
+ 1 file changed, 1 insertion(+), 20 deletions(-)
+
+diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl
+index 5d63b08102eb..9435701c7061 100644
+--- a/Source/WebCore/css/makegrammar.pl
++++ b/Source/WebCore/css/makegrammar.pl
+@@ -73,25 +73,6 @@
+ }
+
+ my $fileBase = File::Spec->join($outputDir, $filename);
+-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
++my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
+ push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives.
+ system(@bisonCommand) == 0 or die;
+-
+-open HEADER, ">$fileBase.h" or die;
+-print HEADER << "EOF";
+-#ifndef CSSGRAMMAR_H
+-#define CSSGRAMMAR_H
+-EOF
+-
+-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die;
+-while (<HPP>) {
+-    print HEADER;
+-}
+-close HPP;
+-
+-print HEADER "#endif\n";
+-close HEADER;
+-
+-unlink("$fileBase.cpp.h");
+-unlink("$fileBase.hpp");
+-
diff --git a/source/l/qt5-webkit/qt5-webkit.icu68_1.diff b/source/l/qt5-webkit/qt5-webkit.icu68_1.diff
new file mode 100644
index 000000000..c15d33aa1
--- /dev/null
+++ b/source/l/qt5-webkit/qt5-webkit.icu68_1.diff
@@ -0,0 +1,34 @@
+--- ./Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 11:16:37.000000000 -0600
++++ ./Source/WebCore/platform/text/icu/UTextProvider.h	2020-10-30 13:33:29.455998691 -0500
+@@ -28,6 +28,14 @@
+ 
+ #include <unicode/utext.h>
+ 
++#ifndef FALSE
++#define FALSE (0)
++#endif
++
++#ifndef TRUE
++#define TRUE (!FALSE)
++#endif
++
+ namespace WebCore {
+ 
+ enum class UTextProviderContext {
+--- ./Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 11:16:37.000000000 -0600
++++ ./Source/WebCore/platform/text/TextCodecICU.cpp	2020-10-30 13:34:33.196995165 -0500
+@@ -39,6 +39,14 @@
+ #include <wtf/text/StringBuilder.h>
+ #include <wtf/unicode/CharacterNames.h>
+ 
++#ifndef FALSE
++#define FALSE (0)
++#endif
++
++#ifndef TRUE
++#define TRUE (!FALSE)
++#endif
++
+ namespace WebCore {
+ 
+ const size_t ConversionBufferSize = 16384;