CVS commit: pkgsrc/x11/qt5-qtbase

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/x11/qt5-qtbase
From: "Mark Davies" <markd%netbsd.org@localhost>
Date: Fri, 9 Jul 2021 22:48:47 +0000

Module Name:    pkgsrc
Committed By:   markd
Date:           Fri Jul  9 22:48:47 UTC 2021

Modified Files:
        pkgsrc/x11/qt5-qtbase: distinfo
Added Files:
        pkgsrc/x11/qt5-qtbase/patches: patch-src_corelib_global_qendian.h
            patch-src_corelib_global_qfloat16.h
            patch-src_corelib_text_qbytearraymatcher.h
            patch-src_corelib_tools_qsharedpointer__impl.h
            patch-src_plugins_platforms_xcb_qxcbwindow.cpp

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


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/x11/qt5-qtbase/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qendian.h \
    pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qfloat16.h \
    pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_text_qbytearraymatcher.h \
    pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_tools_qsharedpointer__impl.h \
    pkgsrc/x11/qt5-qtbase/patches/patch-src_plugins_platforms_xcb_qxcbwindow.cpp

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-qtbase/distinfo
diff -u pkgsrc/x11/qt5-qtbase/distinfo:1.64 pkgsrc/x11/qt5-qtbase/distinfo:1.65
--- pkgsrc/x11/qt5-qtbase/distinfo:1.64 Fri Jun 18 02:21:32 2021
+++ pkgsrc/x11/qt5-qtbase/distinfo      Fri Jul  9 22:48:46 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2021/06/18 02:21:32 thor Exp $
+$NetBSD: distinfo,v 1.65 2021/07/09 22:48:46 markd Exp $
 
 SHA1 (qtbase-everywhere-src-5.15.2.tar.xz) = b5ad67fc6381ad7fae0296944734198488d096a3
 RMD160 (qtbase-everywhere-src-5.15.2.tar.xz) = ee53f1b7dadc0b96a2f79fe7f54467b46894b12b
@@ -14,17 +14,22 @@ SHA1 (patch-qmake_generators_unix_unixma
 SHA1 (patch-src_3rdparty_double-conversion_include_double-conversion_utils.h) = 88cd4ab81fd480c5dd28cc0a4ac0560c9565a0bc
 SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = e050b334cecc56259bd1755cd2de8c5bbf1409c0
 SHA1 (patch-src_corelib_configure.json) = 7a83a356330e602cbc65256dd345a107004a67cb
+SHA1 (patch-src_corelib_global_qendian.h) = bd8385a250ed59904de742251a99426924861e5a
+SHA1 (patch-src_corelib_global_qfloat16.h) = a5ac74fee2f08074a59003074570acb294423eaa
 SHA1 (patch-src_corelib_global_qrandom.cpp) = d910579df42d5b01583b88fa19f514b230596ca7
 SHA1 (patch-src_corelib_io_io.pri) = b2c1057e20c3150162695947bab958a2644df7dc
 SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = b12a41da19b25e34e12fdf80714a37e8c46278f9
 SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073
+SHA1 (patch-src_corelib_text_qbytearraymatcher.h) = 809a02c98cc6360d74fdcf42edddd0c32a5e8684
 SHA1 (patch-src_corelib_thread_qmutex__p.h) = 093089b8a37baa3071257c99bbde5f6295bd2eec
 SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 9dffdbfc81bc7d3259020cd32b4039b7be6ee2bd
+SHA1 (patch-src_corelib_tools_qsharedpointer__impl.h) = 91755dcdd0e13bfc047167db918b9a4d7a172165
 SHA1 (patch-src_network_kernel_qnetworkinterface__unix.cpp) = 2c5569eb2ba19999eb62e4fdb54f347c88f6e6a5
 SHA1 (patch-src_openglextensions_openglextensions.pro) = 575d31c3a48f36d82dc1f342078e636f4c25e33f
 SHA1 (patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm) = 01afb2aef1d14370308c897c1d077b05c5e3f0a9
 SHA1 (patch-src_plugins_platforms_xcb_qxcbatom.cpp) = abbd0b04b881666e82f45adc18e49aafdb43d4be
 SHA1 (patch-src_plugins_platforms_xcb_qxcbconnection__basic.h) = e369001cba31e865adf010ab714ad132b96c1bef
+SHA1 (patch-src_plugins_platforms_xcb_qxcbwindow.cpp) = 4f32b1cfd555613acc136f0f4e5849176987afb6
 SHA1 (patch-src_tools_moc_main.cpp) = ebdddd657ba1c24657a9ca5624907e31a5d0c8bb
 SHA1 (patch-src_widgets_graphicsview_qgraphicsitem__p.h) = fd55d5ef6fde506849aab07f7ba23e856373b3a1
 SHA1 (patch-tests_auto_corelib_io_qprocess_qprocess.pro) = 1dbb08e5ec6715cbe239efdfb45389959b179ea3

Added files:

Index: pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qendian.h
diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qendian.h:1.1
--- /dev/null   Fri Jul  9 22:48:47 2021
+++ pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qendian.h    Fri Jul  9 22:48:47 2021
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_corelib_global_qendian.h,v 1.1 2021/07/09 22:48:47 markd Exp $
+
+Fix build with GCC 11: include <limits>
+Fixes: QTBUG-90395
+Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40
+(cherry picked from commit 9c56d4da
+
+--- src/corelib/global/qendian.h.orig  2020-10-27 08:02:11.000000000 +0000
++++ src/corelib/global/qendian.h
+@@ -1,7 +1,7 @@
+ /****************************************************************************
+ **
+-** Copyright (C) 2016 The Qt Company Ltd.
+-** Copyright (C) 2016 Intel Corporation.
++** Copyright (C) 2021 The Qt Company Ltd.
++** Copyright (C) 2021 Intel Corporation.
+ ** Contact: https://www.qt.io/licensing/
+ **
+ ** This file is part of the QtCore module of the Qt Toolkit.
+@@ -44,6 +44,8 @@
+ #include <QtCore/qfloat16.h>
+ #include <QtCore/qglobal.h>
+ 
++#include <limits>
++
+ // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
+ #include <stdlib.h>
+ #include <string.h>
Index: pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qfloat16.h
diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qfloat16.h:1.1
--- /dev/null   Fri Jul  9 22:48:47 2021
+++ pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qfloat16.h   Fri Jul  9 22:48:47 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_corelib_global_qfloat16.h,v 1.1 2021/07/09 22:48:47 markd Exp $
+
+Fix build with GCC 11: include <limits> 
+Fixes: QTBUG-90395 
+Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 
+(cherry picked from commit 9c56d4da 
+
+--- src/corelib/global/qfloat16.h.orig 2020-10-27 08:02:11.000000000 +0000
++++ src/corelib/global/qfloat16.h
+@@ -43,6 +43,7 @@
+ 
+ #include <QtCore/qglobal.h>
+ #include <QtCore/qmetatype.h>
++#include <limits>
+ #include <string.h>
+ 
+ #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
Index: pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_text_qbytearraymatcher.h
diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_text_qbytearraymatcher.h:1.1
--- /dev/null   Fri Jul  9 22:48:47 2021
+++ pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_text_qbytearraymatcher.h    Fri Jul  9 22:48:47 2021
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_corelib_text_qbytearraymatcher.h,v 1.1 2021/07/09 22:48:47 markd Exp $
+
+Build fixes for GCC 11
+
+Task-number: QTBUG-89977
+Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21
+Reviewed-by: Lars Knoll <lars.knoll%qt.io@localhost>
+Reviewed-by: Thiago Macieira <thiago.macieira%intel.com@localhost>
+(cherry picked from commit 813a928c)
+
+--- src/corelib/text/qbytearraymatcher.h.orig  2020-10-27 08:02:11.000000000 +0000
++++ src/corelib/text/qbytearraymatcher.h
+@@ -42,6 +42,8 @@
+ 
+ #include <QtCore/qbytearray.h>
+ 
++#include <limits>
++
+ QT_BEGIN_NAMESPACE
+ 
+ 
Index: pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_tools_qsharedpointer__impl.h
diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_tools_qsharedpointer__impl.h:1.1
--- /dev/null   Fri Jul  9 22:48:47 2021
+++ pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_tools_qsharedpointer__impl.h        Fri Jul  9 22:48:47 2021
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_corelib_tools_qsharedpointer__impl.h,v 1.1 2021/07/09 22:48:47 markd Exp $
+
+Build fixes for GCC 11
+
+Task-number: QTBUG-89977
+Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21
+Reviewed-by: Lars Knoll <lars.knoll%qt.io@localhost>
+Reviewed-by: Thiago Macieira <thiago.macieira%intel.com@localhost>
+(cherry picked from commit 813a928c)
+
+--- src/corelib/tools/qsharedpointer_impl.h.orig       2020-10-27 08:02:11.000000000 +0000
++++ src/corelib/tools/qsharedpointer_impl.h
+@@ -155,9 +155,6 @@ namespace QtSharedPointer {
+ #endif
+         inline void checkQObjectShared(...) { }
+         inline void setQObjectShared(...) { }
+-
+-        inline void operator delete(void *ptr) { ::operator delete(ptr); }
+-        inline void operator delete(void *, void *) { }
+     };
+     // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)
+ 
Index: pkgsrc/x11/qt5-qtbase/patches/patch-src_plugins_platforms_xcb_qxcbwindow.cpp
diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-src_plugins_platforms_xcb_qxcbwindow.cpp:1.1
--- /dev/null   Fri Jul  9 22:48:47 2021
+++ pkgsrc/x11/qt5-qtbase/patches/patch-src_plugins_platforms_xcb_qxcbwindow.cpp        Fri Jul  9 22:48:47 2021
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_plugins_platforms_xcb_qxcbwindow.cpp,v 1.1 2021/07/09 22:48:47 markd Exp $
+
+Build fixes for GCC 11
+
+Task-number: QTBUG-89977
+Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21
+Reviewed-by: Lars Knoll <lars.knoll%qt.io@localhost>
+Reviewed-by: Thiago Macieira <thiago.macieira%intel.com@localhost>
+(cherry picked from commit 813a928c)
+
+--- src/plugins/platforms/xcb/qxcbwindow.cpp.orig      2020-10-27 08:02:11.000000000 +0000
++++ src/plugins/platforms/xcb/qxcbwindow.cpp
+@@ -698,7 +698,7 @@ void QXcbWindow::show()
+         if (isTransient(window())) {
+             const QWindow *tp = window()->transientParent();
+             if (tp && tp->handle())
+-                transientXcbParent = static_cast<const QXcbWindow *>(tp->handle())->winId();
++                transientXcbParent = tp->handle()->winId();
+             // Default to client leader if there is no transient parent, else modal dialogs can
+             // be hidden by their parents.
+             if (!transientXcbParent)

Prev by Date: CVS commit: pkgsrc/emulators/qemu
Next by Date: CVS commit: pkgsrc/x11/qt5-qtdeclarative
Previous by Thread: CVS commit: pkgsrc/emulators/qemu
Next by Thread: CVS commit: pkgsrc/x11/qt5-qtdeclarative
Indexes:

Home | Main Index | Thread Index | Old Index