Hello community,
here is the log from the commit of package libqt5-qtwebkit for openSUSE:Factory
checked in at 2020-10-06 17:08:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebkit (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebkit"
Tue Oct 6 17:08:47 2020 rev:56 rq:836474 version:5.212~alpha4
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtwebkit/libqt5-qtwebkit.changes
2020-05-29 21:13:55.482433078 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new.4249/libqt5-qtwebkit.changes
2020-10-06 17:10:36.757501488 +0200
@@ -1,0 +2,6 @@
+Thu Sep 24 08:33:23 UTC 2020 - Martin Liška <[email protected]>
+
+- Add upstream patch qtwebkit-5.212.0_pre20200309-bison-3.7.patch
+ in order to fix build with a recent bison.
+
+-------------------------------------------------------------------
New:
----
qtwebkit-5.212.0_pre20200309-bison-3.7.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwebkit.spec ++++++
--- /var/tmp/diff_new_pack.uUOlNJ/_old 2020-10-06 17:10:38.709503174 +0200
+++ /var/tmp/diff_new_pack.uUOlNJ/_new 2020-10-06 17:10:38.709503174 +0200
@@ -48,6 +48,7 @@
Patch1: tell-the-truth-about-private-api.patch
# PATCH-FIX-UPSTREAM https://bugs.webkit.org/show_bug.cgi?id=141288
Patch2: webkit-bwo141288.patch
+Patch3: qtwebkit-5.212.0_pre20200309-bison-3.7.patch
%if %{with avsupport}
BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(gstreamer-app-1.0)
++++++ qtwebkit-5.212.0_pre20200309-bison-3.7.patch ++++++
>From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <[email protected]>
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");
-
