snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

qt5-webkit: fix build w/ bison-3.7.3 

Closes: #25876
This commit is contained in:
Jürgen Buchmüller 2020-10-26 13:03:38 +01:00
parent 6fd6dc6e22
commit bf80f4fc15
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
srcpkgs/qt5-webkit/patches/bison3.7.patch Normal file
View File

@ -0,0 +1,18 @@
--- Source/WebCore/css/makegrammar.pl 2020-04-14 00:51:51.000000000 +0200
+++ Source/WebCore/css/makegrammar.pl 2020-10-25 14:59:39.879927464 +0100
@@ -73,7 +73,6 @@
}
my $fileBase = File::Spec->join($outputDir, $filename);
-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
+my @bisonCommand = ($bison, "--no-lines", "--defines=$fileBase.cpp.h", "-p", $symbolsPrefix, $grammarFilePath, "--output=$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;
@@ -91,6 +91,5 @@
print HEADER "#endif\n";
close HEADER;
-unlink("$fileBase.cpp.h");
unlink("$fileBase.hpp");

4
srcpkgs/qt5-webkit/template
View File

@ -14,7 +14,7 @@ configure_args="-DPORT=Qt -DUSE_LD_GOLD=OFF
-DCMAKE_C_FLAGS_RELEASE=-DNDEBUG -DCMAKE_C_FLAGS_RELEASE=-DNDEBUG
-DCMAKE_C_FLAGS_DEBUG=-DNDEBUG -DCMAKE_C_FLAGS_DEBUG=-DNDEBUG
-DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG" -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG"
hostmakedepends="flex gperf perl pkg-config python qt5-qmake ruby" hostmakedepends="bison gperf perl pkg-config python qt5-qmake ruby"
makedepends="libwebp-devel libxslt-devel libXcomposite-devel sqlite-devel makedepends="libwebp-devel libxslt-devel libXcomposite-devel sqlite-devel
libjpeg-turbo-devel gst-plugins-base1-devel qt5-declarative-devel libjpeg-turbo-devel gst-plugins-base1-devel qt5-declarative-devel
qt5-location-devel qt5-sensors-devel qt5-webchannel-devel hyphen-devel qt5-location-devel qt5-sensors-devel qt5-webchannel-devel hyphen-devel
@ -27,7 +27,7 @@ distfiles="https://download.qt.io/snapshots/ci/qtwebkit/${_v}/${_snap}/src/submo
checksum=9a6ed083154c7ec850081102b299afa928ca7e48bbdf2b5f3ae152425e46eb17 checksum=9a6ed083154c7ec850081102b299afa928ca7e48bbdf2b5f3ae152425e46eb17
CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include" CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include"
CXXFLAGS="-fpermissive -Wno-class-memaccess" CXXFLAGS="-fpermissive -Wno-class-memaccess -Wno-redundant-move -Wno-deprecated-copy"
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-declarative-devel ruby-devel" hostmakedepends+=" qt5-host-tools qt5-declarative-devel ruby-devel"