CVS commit: pkgsrc/x11/qt5-qtbase

["Sebastian Wiedenroth" <wiedi%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiedi
Date:           Sun May  3 11:41:45 UTC 2020

Modified Files:
        pkgsrc/x11/qt5-qtbase: Makefile.common distinfo
Added Files:
        pkgsrc/x11/qt5-qtbase/patches: patch-src_corelib_global_qrandom.cpp

Log Message:
qt5-qtbase: fix build on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/x11/qt5-qtbase/Makefile.common
cvs rdiff -u -r1.58 -r1.59 pkgsrc/x11/qt5-qtbase/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qrandom.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/Makefile.common
diff -u pkgsrc/x11/qt5-qtbase/Makefile.common:1.43 pkgsrc/x11/qt5-qtbase/Makefile.common:1.44
--- pkgsrc/x11/qt5-qtbase/Makefile.common:1.43  Fri Apr 17 02:00:52 2020
+++ pkgsrc/x11/qt5-qtbase/Makefile.common       Sun May  3 11:41:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.43 2020/04/17 02:00:52 gutteridge Exp $
+# $NetBSD: Makefile.common,v 1.44 2020/05/03 11:41:45 wiedi Exp $
 # used by x11/qt5-mysql/Makefile
 # used by x11/qt5-odbc/Makefile
 # used by x11/qt5-psql/Makefile
@@ -47,6 +47,9 @@ CFLAGS+=              -Wno-register
 # wcstof(3) etc. is used in C++ code.
 CFLAGS.NetBSD+=                -D_NETBSD_SOURCE
 
+# include/openssl/e_os2.h:283:25: error: '_Noreturn' does not name a type
+CXXFLAGS.SunOS+=       -D_Noreturn=""
+
 # for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined.
 BUILDLINK_TRANSFORM+=  rm:-Wundef
 

Index: pkgsrc/x11/qt5-qtbase/distinfo
diff -u pkgsrc/x11/qt5-qtbase/distinfo:1.58 pkgsrc/x11/qt5-qtbase/distinfo:1.59
--- pkgsrc/x11/qt5-qtbase/distinfo:1.58 Thu Apr  2 22:05:57 2020
+++ pkgsrc/x11/qt5-qtbase/distinfo      Sun May  3 11:41:45 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2020/04/02 22:05:57 adam Exp $
+$NetBSD: distinfo,v 1.59 2020/05/03 11:41:45 wiedi Exp $
 
 SHA1 (qtbase-everywhere-src-5.14.2.tar.xz) = 9de814d3b9005bf984a78e4b564fbb9413e043c4
 RMD160 (qtbase-everywhere-src-5.14.2.tar.xz) = 103d9c42037393a8c3e6467c9bd1eab447d3c4fb
@@ -12,6 +12,7 @@ SHA1 (patch-qmake_generators_makefile.cp
 SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 915223f7a5b71543f4bb86c0b021284971be5786
 SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = e050b334cecc56259bd1755cd2de8c5bbf1409c0
 SHA1 (patch-src_corelib_configure.json) = 7a83a356330e602cbc65256dd345a107004a67cb
+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

Added files:

Index: pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qrandom.cpp
diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qrandom.cpp:1.1
--- /dev/null   Sun May  3 11:41:45 2020
+++ pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qrandom.cpp  Sun May  3 11:41:45 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_corelib_global_qrandom.cpp,v 1.1 2020/05/03 11:41:45 wiedi Exp $
+
+No getauxval on SunOS
+
+--- src/corelib/global/qrandom.cpp.orig        2020-03-27 09:49:31.000000000 +0000
++++ src/corelib/global/qrandom.cpp
+@@ -277,7 +277,7 @@ static void fallback_fill(quint32 *ptr,
+     if (quint32 v = seed.loadRelaxed())
+         *end++ = v; // 6
+ 
+-#if QT_CONFIG(getauxval)
++#if QT_CONFIG(getauxval) && !defined(Q_OS_SOLARIS)
+     // works on Linux -- all modern libc have getauxval
+ #  ifdef AT_RANDOM
+     // ELF's auxv AT_RANDOM has 16 random bytes