Commit 5f399ee8 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Fixed bison inconsistency

parent 74d12c29
......@@ -9,6 +9,7 @@ all:
tar xf qtwebkit-5.212.0-alpha4.tar.xz
patch -Np1 -d qtwebkit-5.212.0-alpha4 < qtwebkit-5.212.0-alpha4-fix_python3.patch
patch -Np1 -d qtwebkit-5.212.0-alpha4 < qtwebkit-5.212.0-alpha4-fix_icu.patch
patch -Np1 -d qtwebkit-5.212.0-alpha4 < qtwebkit-5.212.0-alpha4-fix_bison.patch
mkdir qtwebkit-5.212.0-alpha4/build
cd qtwebkit-5.212.0-alpha4/build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DPORT=Qt -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF -DENABLE_WEBGL=OFF -DENABLE_WEBGPU=OFF -DENABLE_MEDIA_SOURCE=OFF -DENABLE_MEDIA_STREAM=OFF -DENABLE_DEVICE_ORIENTATION=OFF -DENABLE_GEOLOCATION=OFF -DENABLE_FULLSCREEN_API=OFF -DENABLE_QT_GESTURE_EVENTS=OFF -DENABLE_TOUCH_EVENTS=OFF -DENABLE_GAMEPAD_DEPRECATED=OFF -DENABLE_INSPECTOR_UI=OFF -DENABLE_SPELLCHECK=OFF -DENABLE_ACCELERATED_2D_CANVAS=OFF -DENABLE_DATABASE_PROCESS=OFF -DENABLE_INDEXED_DATABASE=OFF -DENABLE_ICONDATABASE=OFF -DENABLE_QT_WEBCHANNEL=OFF -DUSE_QT_MULTIMEDIA=OFF -DUSE_QT_SENSORS=OFF -DUSE_QT_POSITIONING=OFF -DUSE_OPENGL=OFF -DUSE_GSTREAMER=OFF -DUSE_LIBHYPHEN=OFF -DENABLE_API_TESTS=OFF -DENABLE_SAMPLING_PROFILER=OFF -DENABLE_XSLT=OFF -DENABLE_X11_TARGET=OFF -DENABLE_PRINT_SUPPORT=ON -DUSE_LIBJPEG=ON -DUSE_WOFF2=ON -DQt5_DIR=/usr/lib/cmake/Qt5 ..
$(MAKE) -C qtwebkit-5.212.0-alpha4/build
......
diff -uNr qtwebkit-5.212.0-alpha4/Source/WebCore/CMakeLists.txt qtwebkit-5.212.0-alpha4-fix_bison/Source/WebCore/CMakeLists.txt
--- qtwebkit-5.212.0-alpha4/Source/WebCore/CMakeLists.txt 2020-03-05 03:46:37.000000000 +1030
+++ qtwebkit-5.212.0-alpha4-fix_bison/Source/WebCore/CMakeLists.txt 2025-11-04 14:08:52.238983071 +1030
@@ -3581,10 +3581,10 @@
list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResourcesData.cpp)
ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/StyleResolver.cpp PlugInsResourcesData.cpp PlugInsResources.h)
-GENERATE_GRAMMAR(cssyy ${WEBCORE_DIR}/css/CSSGrammar.y.in ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.h ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
+GENERATE_GRAMMAR(cssyy ${WEBCORE_DIR}/css/CSSGrammar.y.in ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.hpp ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp)
-GENERATE_GRAMMAR(xpathyy ${WEBCORE_DIR}/xml/XPathGrammar.y ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.h ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp "")
+GENERATE_GRAMMAR(xpathyy ${WEBCORE_DIR}/xml/XPathGrammar.y ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.hpp ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp "")
list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp)
diff -uNr qtwebkit-5.212.0-alpha4/Source/WebCore/css/CSSParser.cpp qtwebkit-5.212.0-alpha4-fix_bison/Source/WebCore/css/CSSParser.cpp
--- qtwebkit-5.212.0-alpha4/Source/WebCore/css/CSSParser.cpp 2020-03-05 03:46:37.000000000 +1030
+++ qtwebkit-5.212.0-alpha4-fix_bison/Source/WebCore/css/CSSParser.cpp 2025-11-04 14:08:04.137944428 +1030
@@ -11158,7 +11158,7 @@
#define END_TOKEN 0
-#include "CSSGrammar.h"
+#include "CSSGrammar.hpp"
enum CharacterType {
// Types for the main switch.
diff -uNr qtwebkit-5.212.0-alpha4/Source/WebCore/xml/XPathParser.cpp qtwebkit-5.212.0-alpha4-fix_bison/Source/WebCore/xml/XPathParser.cpp
--- qtwebkit-5.212.0-alpha4/Source/WebCore/xml/XPathParser.cpp 2020-03-05 03:46:37.000000000 +1030
+++ qtwebkit-5.212.0-alpha4-fix_bison/Source/WebCore/xml/XPathParser.cpp 2025-11-04 14:08:55.789912025 +1030
@@ -42,7 +42,7 @@
extern int xpathyyparse(Parser&);
-#include "XPathGrammar.h"
+#include "XPathGrammar.hpp"
namespace WebCore {
namespace XPath {
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment