CVS commit: pkgsrc/x11/qt5-qtwebkit

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Aug 29 16:26:06 UTC 2020

Modified Files:
        pkgsrc/x11/qt5-qtwebkit: distinfo
Added Files:
        pkgsrc/x11/qt5-qtwebkit/patches:
            patch-Source_WebCore_css_makegrammar.pl

Log Message:
qt5-qtwebkit: let Bison generate the header directly

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.

>From Dmitry Shachnev via Debian.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/qt5-qtwebkit/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_css_makegrammar.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qtwebkit/distinfo
diff -u pkgsrc/x11/qt5-qtwebkit/distinfo:1.16 pkgsrc/x11/qt5-qtwebkit/distinfo:1.17
--- pkgsrc/x11/qt5-qtwebkit/distinfo:1.16       Sat Mar 21 19:42:36 2020
+++ pkgsrc/x11/qt5-qtwebkit/distinfo    Sat Aug 29 16:26:06 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2020/03/21 19:42:36 nia Exp $
+$NetBSD: distinfo,v 1.17 2020/08/29 16:26:06 wiz Exp $
 
 SHA1 (qtwebkit-5.212.0-alpha4.tar.xz) = a2e2840cd751013f6e9fd0d15601d1ea4beb81d5
 RMD160 (qtwebkit-5.212.0-alpha4.tar.xz) = af000947daa429945d80e3c23e5cfd0eb13793be
@@ -18,6 +18,7 @@ SHA1 (patch-Source_WTF_wtf_InlineASM.h) 
 SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 7dac41bf3e50944e49c3e3c29d482d2c3300665d
 SHA1 (patch-Source_WTF_wtf_Platform.h) = 73e8b07e8d7e718abe986a12b9f0b903dfcc4765
 SHA1 (patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp) = bfa570aa20e3508c77bbaebed051821a33f36209
+SHA1 (patch-Source_WebCore_css_makegrammar.pl) = 2f1977c925069243d76379ae6d065e850143b2e3
 SHA1 (patch-Source_WebCore_page_NavigatorBase.cpp) = e8972f4b703a9ff45ce313609d2540f89064b4ff
 SHA1 (patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp) = ec7c7533c2d5a4258170745bfc49655848d0780c
 SHA1 (patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h) = d1d986afd5525143fc786a959240a72167f03352

Added files:

Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_css_makegrammar.pl
diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_css_makegrammar.pl:1.1
--- /dev/null   Sat Aug 29 16:26:06 2020
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_css_makegrammar.pl     Sat Aug 29 16:26:06 2020
@@ -0,0 +1,41 @@
+$NetBSD: patch-Source_WebCore_css_makegrammar.pl,v 1.1 2020/08/29 16:26:06 wiz Exp $
+
+let Bison generate the header directly 
+
+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. 
+
+Author: Dmitry Shachnev <mitya57%debian.org@localhost> 
+
+--- Source/WebCore/css/makegrammar.pl.orig     2020-03-04 17:16:37.000000000 +0000
++++ Source/WebCore/css/makegrammar.pl
+@@ -73,25 +73,6 @@ if ($suffix eq ".y.in") {
+ }
+ 
+ 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");
+-