CVS commit: pkgsrc/x11/qt5-qtdeclarative

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Fri Jul  9 22:52:54 UTC 2021

Modified Files:
        pkgsrc/x11/qt5-qtdeclarative: distinfo
Added Files:
        pkgsrc/x11/qt5-qtdeclarative/patches:
            patch-src_3rdparty_masm_yarr_Yarr.h
            patch-src_qmldebug_qqmlprofilerevent_p.h

Log Message:
qt5-qtdeclarative: fix build with gcc-11


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/qt5-qtdeclarative/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_yarr_Yarr.h \
    pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_qmldebug_qqmlprofilerevent_p.h

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-qtdeclarative/distinfo
diff -u pkgsrc/x11/qt5-qtdeclarative/distinfo:1.27 pkgsrc/x11/qt5-qtdeclarative/distinfo:1.28
--- pkgsrc/x11/qt5-qtdeclarative/distinfo:1.27  Tue Jan 12 16:46:45 2021
+++ pkgsrc/x11/qt5-qtdeclarative/distinfo       Fri Jul  9 22:52:54 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2021/01/12 16:46:45 jperkin Exp $
+$NetBSD: distinfo,v 1.28 2021/07/09 22:52:54 markd Exp $
 
 SHA1 (qtdeclarative-everywhere-src-5.15.2.tar.xz) = cde54101a922dc92028a26e8b07149a83b2eaae2
 RMD160 (qtdeclarative-everywhere-src-5.15.2.tar.xz) = 747c8e854b52a3007c4ccbe62d23439fe0894763
@@ -6,8 +6,10 @@ SHA512 (qtdeclarative-everywhere-src-5.1
 Size (qtdeclarative-everywhere-src-5.15.2.tar.xz) = 21559880 bytes
 SHA1 (patch-src_3rdparty_masm_assembler_ARMv7Assembler.h) = 505b2a585a7ed98e63403a3cc44d839a4f80c01d
 SHA1 (patch-src_3rdparty_masm_wtf_Compiler.h) = 8d7e318e0148eea0f262ec13463bc15bd03478dc
+SHA1 (patch-src_3rdparty_masm_yarr_Yarr.h) = 3a3f3d33705dc7d24827b87f37b40b077bcbdaf8
 SHA1 (patch-src_3rdparty_masm_yarr_YarrCanonicalize.h) = 3cb31384f5287a5449d1a6bdd03d42870ac9385f
 SHA1 (patch-src_qml_common_qv4alloca__p.h) = 15a300585e4f5acf956badf0d94e388934883041
 SHA1 (patch-src_qml_jit_qv4assemblercommon__p.h) = 84fa72bb8b90dffe6636fcd4302876bfc838663c
+SHA1 (patch-src_qmldebug_qqmlprofilerevent_p.h) = 128d4849de6766e028433281d6fd463d403d0ccc
 SHA1 (patch-src_qmltest_qmltest.pro) = f340d6f31d8d6a9d69034d67712dfd109e1769fb
 SHA1 (patch-tools_qmltestrunner_qmltestrunner.pro) = 471d399d57696652be5a4264657aed467852c5f3

Added files:

Index: pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_yarr_Yarr.h
diff -u /dev/null pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_yarr_Yarr.h:1.1
--- /dev/null   Fri Jul  9 22:52:54 2021
+++ pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_yarr_Yarr.h    Fri Jul  9 22:52:54 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_3rdparty_masm_yarr_Yarr.h,v 1.1 2021/07/09 22:52:54 markd Exp $
+
+Add missing limits include to fix build with GCC 11
+
+--- src/3rdparty/masm/yarr/Yarr.h.orig 2020-10-27 08:02:12.000000000 +0000
++++ src/3rdparty/masm/yarr/Yarr.h
+@@ -28,6 +28,7 @@
+ #pragma once
+ 
+ #include <limits.h>
++#include <limits>
+ #include "YarrErrorCode.h"
+ 
+ namespace JSC { namespace Yarr {
Index: pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_qmldebug_qqmlprofilerevent_p.h
diff -u /dev/null pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_qmldebug_qqmlprofilerevent_p.h:1.1
--- /dev/null   Fri Jul  9 22:52:54 2021
+++ pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_qmldebug_qqmlprofilerevent_p.h       Fri Jul  9 22:52:54 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_qmldebug_qqmlprofilerevent_p.h,v 1.1 2021/07/09 22:52:54 markd Exp $
+
+Add missing limits include to fix build with GCC 11
+Change-Id: I97606ea493e723006759608b7d4c4f00632f340c
+Reviewed-by: Albert Astals Cid <albert.astals.cid%kdab.com@localhost>
+(cherry picked from commit 367293b1)
+
+--- src/qmldebug/qqmlprofilerevent_p.h.orig    2020-10-27 08:02:12.000000000 +0000
++++ src/qmldebug/qqmlprofilerevent_p.h
+@@ -48,6 +48,7 @@
+ #include <QtCore/qmetatype.h>
+ 
+ #include <initializer_list>
++#include <limits>
+ #include <type_traits>
+ 
+ //