diff --git a/qtwebkit-5.212-bison-3.7.patch b/qtwebkit-5.212-bison-3.7.patch new file mode 100644 index 0000000..7dec6e4 --- /dev/null +++ b/qtwebkit-5.212-bison-3.7.patch @@ -0,0 +1,31 @@ +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 () { +- print HEADER; +-} +-close HPP; +- +-print HEADER "#endif\n"; +-close HEADER; +- +-unlink("$fileBase.cpp.h"); +-unlink("$fileBase.hpp"); +- diff --git a/qtwebkit.spec b/qtwebkit.spec index 3ef141d..18c91c9 100644 --- a/qtwebkit.spec +++ b/qtwebkit.spec @@ -1,7 +1,7 @@ %define majver %(echo %version | cut -d. -f1-2) Name: qtwebkit Epoch: 1 -Version: 5.13.1 +Version: 5.212 Release: 1mamba Summary: A Qt based web browser engine Group: System/Libraries @@ -9,10 +9,11 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://qt.io -Source: http://download.qt.io/snapshots/ci/qtwebkit/5.212/latest/src/submodules/qtwebkit-everywhere-src-%{version}.tar.xz +Source: http://download.qt.io/snapshots/ci/qtwebkit/5.212/latest/src/submodules/qtwebkit-opensource-src-%{version}.tar.xz #Source: http://download.qt.io/community_releases/%{majver}/%{version}-final/qtwebkit-opensource-src-%{version}.tar.xz Patch0: qtwebkit-5.9.0-icu-59.patch Patch1: qtwebkit-5.212-add-missing-include-functional.patch +Patch2: qtwebkit-5.212-bison-3.7.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -37,7 +38,7 @@ BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END -BuildRequires: libqt5-devel >= 5.14 +BuildRequires: libqt5-devel >= 5.15 BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -66,14 +67,13 @@ This package contains libraries and header files for developing applications tha %debug_package %prep -%setup -q -n qtwebkit-everywhere-src-%{version} -#-D -T -#:<< _EOF +%setup -q -n qtwebkit-opensource-src-%{version} -D -T +:<< _EOF #%patch0 -p1 #%patch1 -p1 +%patch2 -p1 %build -#:<< _EOF #qmake-qt5 %cmake -d build \ -DPORT="Qt" \ @@ -86,7 +86,7 @@ This package contains libraries and header files for developing applications tha -DENABLE_JIT=OFF %endif -%make -j1 +%make -j2 %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -129,6 +129,9 @@ This package contains libraries and header files for developing applications tha %{_libdir}/cmake/Qt5WebKit/WebKit*.cmake %changelog +* Fri Sep 04 2020 Silvan Calarco 5.212-1mamba +- update to 5.212 + * Wed Apr 15 2020 Silvan Calarco 5.13.1-1mamba - update to 5.13.1