Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt5-5.15.2 ver. bump

Browse Source
This commit is contained in:
Rmys
2020-12-18 23:55:41 +03:00
committed by GitHub
parent e0aacfad24
commit 8d5bbb275d
5 changed files with 116 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-webkit/files/d92b11fe.patch
+46
View File
@@ -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");
-
desktop/toolkit/qt5/qt5-webkit/pspec.xml
+27 -20
View File
@@ -45,21 +45,21 @@
<Dependency versionFrom="2.50.2">glib2-devel</Dependency>
<Dependency versionFrom="3.16.2">sqlite-devel</Dependency>
<Dependency versionFrom="2.7.13">python-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-linguist</Dependency>
<Dependency versionFrom="5.15.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-sql-sqlite</Dependency>
<Dependency versionFrom="5.15.1">qt5-qdbusviewer</Dependency>
<Dependency versionFrom="5.15.1">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-designer-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-location-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-assistant-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-multimedia-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-linguist</Dependency>
<Dependency versionFrom="5.15.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-sql-sqlite</Dependency>
<Dependency versionFrom="5.15.2">qt5-qdbusviewer</Dependency>
<Dependency versionFrom="5.15.2">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-designer-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-location-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-assistant-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-multimedia-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="1.10.3">gst-plugins-base-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">icu65.patch</Patch> -->
<Patch level="1">d92b11fe.patch</Patch>
<!-- <Patch level="1">qt5-webkit-cmake3.10.patch</Patch> -->
<!-- <Patch level="1">qt5-webkit-gcc7.patch</Patch> -->
<!-- <Patch level="1">qt5-webkit-null-pointer-dereference.patch</Patch> --> -->
@@ -97,11 +97,11 @@
<Dependency>gstreamer</Dependency>
<Dependency>gst-plugins-base</Dependency>
<Dependency>gst-plugins-base</Dependency>
<Dependency versionFrom="5.15.1">qt5-base</Dependency>
<Dependency versionFrom="5.15.1">qt5-location</Dependency>
<Dependency versionFrom="5.15.1">qt5-sensors</Dependency>
<Dependency versionFrom="5.15.1">qt5-webchannel</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative</Dependency>
<Dependency versionFrom="5.15.2">qt5-base</Dependency>
<Dependency versionFrom="5.15.2">qt5-location</Dependency>
<Dependency versionFrom="5.15.2">qt5-sensors</Dependency>
<Dependency versionFrom="5.15.2">qt5-webchannel</Dependency>
<Dependency versionFrom="5.15.2">qt5-declarative</Dependency>
</RuntimeDependencies>
</Package>
@@ -128,13 +128,20 @@
<Dependency>gstreamer-devel</Dependency>
<Dependency>gst-plugins-base-devel</Dependency>
<Dependency release="current">qt5-webkit</Dependency>
<Dependency versionFrom="5.15.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-declarative-devel</Dependency>
</RuntimeDependencies>
</Package>
<History>
<Update release="24">
<Date>2020-12-14</Date>
<Version>5.212.0</Version>
<Comment>Rebuild qt5-5.15.2</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="23">
<Date>2020-09-09</Date>
<Version>5.212.0</Version>