diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2020-10-31 01:29:37 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-10-31 08:59:53 +0100 |
commit | 1fa4345d3c7c45951e7603e684cebd718f666b2d (patch) | |
tree | 2e6c31726852bc3c8cf0a76dd010199f76b0fe08 /source/l/qt5-webkit/qt5-webkit.bison27.patch | |
parent | c54ffbc86d562b12ffef86f2af11628ec0647899 (diff) | |
download | current-1fa4345d3c7c45951e7603e684cebd718f666b2d.tar.gz |
Sat Oct 31 01:29:37 UTC 202020201031012937
a/aaa_elflibs-15.0-x86_64-27.txz: Rebuilt.
More temporary additions:
libicudata.so.67.1, libicui18n.so.67.1, libicuio.so.67.1, libicutest.so.67.1,
libicutu.so.67.1, libicuuc.so.67.1.
a/xfsprogs-5.9.0-x86_64-2.txz: Rebuilt.
Recompiled against icu4c-68.1.
ap/sqlite-3.33.0-x86_64-2.txz: Rebuilt.
Recompiled against icu4c-68.1.
ap/tmux-3.1c-x86_64-1.txz: Upgraded.
d/git-2.29.2-x86_64-1.txz: Upgraded.
d/meson-0.56.0-x86_64-1.txz: Upgraded.
l/boost-1.74.0-x86_64-3.txz: Rebuilt.
Recompiled against icu4c-68.1.
l/harfbuzz-2.7.2-x86_64-2.txz: Rebuilt.
Recompiled against icu4c-68.1.
l/icu4c-68.1-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
l/libical-3.0.8-x86_64-3.txz: Rebuilt.
Recompiled against icu4c-68.1.
l/libvisio-0.1.7-x86_64-4.txz: Rebuilt.
Recompiled against icu4c-68.1.
l/qt-4.8.7-x86_64-17.txz: Rebuilt.
Recompiled against icu4c-68.1.
l/qt5-5.15.1-x86_64-3.txz: Rebuilt.
Recompiled against icu4c-68.1.
l/qt5-webkit-5.212.0_alpha4-x86_64-4.txz: Rebuilt.
Recompiled against icu4c-68.1.
l/raptor2-2.0.15-x86_64-10.txz: Rebuilt.
Recompiled against icu4c-68.1.
l/vte-0.60.3-x86_64-2.txz: Rebuilt.
Recompiled against icu4c-68.1.
n/dovecot-2.3.11.3-x86_64-2.txz: Rebuilt.
Recompiled against icu4c-68.1.
n/ipset-7.7-x86_64-1.txz: Upgraded.
n/php-7.4.12-x86_64-2.txz: Rebuilt.
Recompiled against icu4c-68.1.
n/postfix-3.5.7-x86_64-3.txz: Rebuilt.
Recompiled against icu4c-68.1.
n/samba-4.13.1-x86_64-2.txz: Rebuilt.
Recompiled against icu4c-68.1.
n/tin-2.4.4-x86_64-3.txz: Rebuilt.
Recompiled against icu4c-68.1.
t/texlive-2020.200608-x86_64-2.txz: Rebuilt.
Recompiled against icu4c-68.1.
x/x11-skel-7.7-x86_64-5.txz: Rebuilt.
xwmconfig: change blurb from "K Desktop Environment" to "KDE Plasma Desktop".
extra/brltty/brltty-6.1-x86_64-3.txz: Rebuilt.
Recompiled against icu4c-68.1.
extra/pure-alsa-system/qt5-5.15.1-x86_64-3_alsa.txz: Rebuilt.
Recompiled against icu4c-68.1.
isolinux/initrd.img: Rebuilt.
Added libnsl.so.2. Thanks to Olek.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Added libnsl.so.2. Thanks to Olek.
Diffstat (limited to 'source/l/qt5-webkit/qt5-webkit.bison27.patch')
-rw-r--r-- | source/l/qt5-webkit/qt5-webkit.bison27.patch | 46 |
1 files changed, 46 insertions, 0 deletions
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 00000000..e8f66ab1 --- /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"); +- |