From: Jan Palus <atler@pld-linux.org>
Date: Wed, 5 Aug 2020 08:51:11 +0000 (+0200)
Subject: add bison 3.7 patch from debian; rel 5
X-Git-Tag: auto/th/qt5-qtwebengine-5.15.0-5
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fqt5-qtwebengine.git;a=commitdiff_plain;h=01d8735

add bison 3.7 patch from debian; rel 5
---

diff --git a/bison-3.7.patch b/bison-3.7.patch
new file mode 100644
index 0000000..876eb7a
--- /dev/null
+++ b/bison-3.7.patch
@@ -0,0 +1,42 @@
+Description: use .hh extension for Bison header file
+ Previously Bison generated an .hh header and rule_bison.py changed it to .h.
+ That used to work fine, but with Bison 3.7 the generated .cc file #includes
+ that header (instead of duplicating it), so we need to keep the original
+ extension.
+Author: Dmitry Shachnev <mitya57@debian.org>
+Forwarded: no
+Last-Update: 2020-07-28
+
+--- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
++++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
+@@ -104,7 +104,7 @@ outputHFile.close()
+ os.unlink(outputHTmp)
+ 
+ # Rewrite the generated header with #include guards.
+-outputH = os.path.join(outputDir, inputRoot + '.h')
++outputH = outputHTmp
+ 
+ outputHInGen = outputH.replace('gen/', '')
+ headerGuard = NameStyleConverter(outputHInGen).to_header_guard()
+--- a/src/3rdparty/chromium/third_party/blink/renderer/core/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/BUILD.gn
+@@ -952,7 +952,7 @@ action_foreach("make_core_generated_biso
+   ]
+   outputs = [
+     "$blink_core_output_dir/{{source_name_part}}.cc",
+-    "$blink_core_output_dir/{{source_name_part}}.h",
++    "$blink_core_output_dir/{{source_name_part}}.hh",
+   ]
+   args = [
+     "{{source}}",
+--- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xpath_parser.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xpath_parser.cc
+@@ -31,7 +31,7 @@
+ #include "third_party/blink/renderer/core/xml/xpath_evaluator.h"
+ #include "third_party/blink/renderer/core/xml/xpath_ns_resolver.h"
+ #include "third_party/blink/renderer/core/xml/xpath_path.h"
+-#include "third_party/blink/renderer/core/xpath_grammar.h"
++#include "third_party/blink/renderer/core/xpath_grammar.hh"
+ #include "third_party/blink/renderer/platform/bindings/exception_state.h"
+ #include "third_party/blink/renderer/platform/wtf/std_lib_extras.h"
+ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 4ed9b3f..26690c0 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -8,14 +8,15 @@ Summary:	The Qt5 WebEngine library
 Summary(pl.UTF-8):	Biblioteka Qt5 WebEngine
 Name:		qt5-%{orgname}
 Version:	5.15.0
-Release:	4
+Release:	5
 License:	LGPL v3 or GPL v2+ or commercial
 Group:		X11/Libraries
 Source0:	http://download.qt.io/official_releases/qt/5.15/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
 # Source0-md5:	738478b9409f8615ca0f63738b73bbae
 Patch0:		x32.patch
 Patch1:		webauthn.patch
-Patch2:		icu67.patch
+Patch2:		bison-3.7.patch
+Patch3:		icu67.patch
 URL:		http://www.qt.io/
 BuildRequires:	Mesa-khrplatform-devel
 BuildRequires:	Qt5Core-devel >= %{version}
@@ -226,8 +227,9 @@ Biblioteka Qt5 Pdf - pliki programistyczne.
 %patch0 -p1
 %endif
 %patch1 -p1
+%patch2 -p1
 cd ./src/3rdparty/chromium
-%patch2 -p2
+%patch3 -p2
 
 %build
 %ifarch x32