diff options
| author | Andreas Müller <schnitzeltony@gmail.com> | 2020-09-07 22:55:43 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-09-08 09:25:43 +0200 |
| commit | 04a6fa63cf3148698a52b207058254b01c6937b1 (patch) | |
| tree | 1d378776fbdb92406d0fa8f71880211036a6702d | |
| parent | 23f78f70d9aedddd09b581854368ab2af9f46b8c (diff) | |
| download | meta-qt5-04a6fa63cf3148698a52b207058254b01c6937b1.tar.gz | |
qtwebkit: Add patch to fix build with bison 3.7
Fixes:
|... /build/DerivedSources/WebCore/XPathGrammar.cpp:120:10: fatal error: XPathGrammar.hpp: No such file or directory
| 120 | #include "XPathGrammar.hpp"
| | ^~~~~~~~~~~~~~~~~~
| ...
| .../build/DerivedSources/WebCore/CSSGrammar.cpp:160:10: fatal error: CSSGrammar.hpp: No such file or directory
| 160 | #include "CSSGrammar.hpp"
| | ^~~~~~~~~~~~~~~~
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtwebkit/0006-Fix-build-with-bison37.patch | 52 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebkit_git.bb | 1 |
2 files changed, 53 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0006-Fix-build-with-bison37.patch b/recipes-qt/qt5/qtwebkit/0006-Fix-build-with-bison37.patch new file mode 100644 index 00000000..9262f5fe --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0006-Fix-build-with-bison37.patch | |||
| @@ -0,0 +1,52 @@ | |||
| 1 | From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Dmitry Shachnev <mitya57@gmail.com> | ||
| 3 | Date: Tue, 4 Aug 2020 21:04:06 +0300 | ||
| 4 | Subject: [PATCH] Let Bison generate the header directly, to fix build with | ||
| 5 | Bison 3.7 | ||
| 6 | |||
| 7 | Starting with Bison 3.7, the generated C++ file #include's the header | ||
| 8 | by default, instead of duplicating it. So we should not delete it. | ||
| 9 | |||
| 10 | Remove the code to add #ifdef guards to the header, since Bison adds | ||
| 11 | them itself since version 2.6.3. | ||
| 12 | |||
| 13 | Found at [1] | ||
| 14 | |||
| 15 | [1] https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31 | ||
| 16 | |||
| 17 | Upstream-Status: Pending | ||
| 18 | --- | ||
| 19 | Source/WebCore/css/makegrammar.pl | 21 +-------------------- | ||
| 20 | 1 file changed, 1 insertion(+), 20 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl | ||
| 23 | index 5d63b08102eb..9435701c7061 100644 | ||
| 24 | --- a/Source/WebCore/css/makegrammar.pl | ||
| 25 | +++ b/Source/WebCore/css/makegrammar.pl | ||
| 26 | @@ -73,25 +73,6 @@ | ||
| 27 | } | ||
| 28 | |||
| 29 | my $fileBase = File::Spec->join($outputDir, $filename); | ||
| 30 | -my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); | ||
| 31 | +my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); | ||
| 32 | push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives. | ||
| 33 | system(@bisonCommand) == 0 or die; | ||
| 34 | - | ||
| 35 | -open HEADER, ">$fileBase.h" or die; | ||
| 36 | -print HEADER << "EOF"; | ||
| 37 | -#ifndef CSSGRAMMAR_H | ||
| 38 | -#define CSSGRAMMAR_H | ||
| 39 | -EOF | ||
| 40 | - | ||
| 41 | -open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die; | ||
| 42 | -while (<HPP>) { | ||
| 43 | - print HEADER; | ||
| 44 | -} | ||
| 45 | -close HPP; | ||
| 46 | - | ||
| 47 | -print HEADER "#endif\n"; | ||
| 48 | -close HEADER; | ||
| 49 | - | ||
| 50 | -unlink("$fileBase.cpp.h"); | ||
| 51 | -unlink("$fileBase.hpp"); | ||
| 52 | - | ||
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index a52ae76e..acd97e09 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
| @@ -16,6 +16,7 @@ SRC_URI += "\ | |||
| 16 | file://0003-Fix-build-with-non-glibc-libc-on-musl.patch \ | 16 | file://0003-Fix-build-with-non-glibc-libc-on-musl.patch \ |
| 17 | file://0004-Fix-build-bug-for-armv32-BE.patch \ | 17 | file://0004-Fix-build-bug-for-armv32-BE.patch \ |
| 18 | file://0005-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \ | 18 | file://0005-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \ |
| 19 | file://0006-Fix-build-with-bison37.patch \ | ||
| 19 | " | 20 | " |
| 20 | 21 | ||
| 21 | inherit cmake_qt5 perlnative | 22 | inherit cmake_qt5 perlnative |
