File bison3_7.patch of Package phantomjs

Overview Repositories Revisions Requests Users Attributes Meta

File bison3_7.patch of Package phantomjs (Revision ae55efcf8d1d5c763fc9332dca58acec)

Currently displaying revision ae55efcf8d1d5c763fc9332dca58acec , Show latest

--- a/src/qt/qtwebkit/Source/WebCore/css/makegrammar.pl	2016-04-10 09:48:37.000000000 +0300
+++ b/src/qt/qtwebkit/Source/WebCore/css/makegrammar.pl	2020-10-22 13:28:09.382224742 +0300
@@ -73,23 +73,6 @@
 }
 
 my $fileBase = File::Spec->join($outputDir, $filename);
-system("$bison -d -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp");
-
-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");
-
+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;
--- a/src/qt/qtwebkit/Source/WebCore/DerivedSources.pri	2016-03-15 18:36:24.000000000 +0100
+++ b/src/qt/qtwebkit/Source/WebCore/DerivedSources.pri	2021-05-08 23:12:01.442804963 +0200
@@ -985,9 +985,10 @@
 GENERATORS += pluginsresources
 
 # GENERATOR 11: XPATH grammar
-xpathbison.output = ${QMAKE_FILE_BASE}.cpp
+xpathbison.output = XPathGrammar.cpp
 xpathbison.input = XPATHBISON
-xpathbison.commands = bison -d -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.tab.c && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.c ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.cpp && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.h ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.h
+xpathbison.script = $$PWD/css/makegrammar.pl
+xpathbison.commands = perl -I $$PWD/bindings/scripts $$xpathbison.script --outputDir ${QMAKE_FUNC_FILE_OUT_PATH} --symbolsPrefix xpathyy ${QMAKE_FILE_NAME}
 xpathbison.depends = ${QMAKE_FILE_NAME}
 GENERATORS += xpathbison

Places

File bison3_7.patch of Package phantomjs (Revision ae55efcf8d1d5c763fc9332dca58acec)

Places