CVS commit: pkgsrc/x11/qt6-qtbase

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Mon May 13 19:39:45 UTC 2024

Modified Files:
        pkgsrc/x11/qt6-qtbase: Makefile distinfo
Added Files:
        pkgsrc/x11/qt6-qtbase/patches:
            patch-src_network_kernel_qhostinfo__unix.cpp

Log Message:
x11/qt6-qtbase: add conditional to avoid res_init() and _res usage
on NetBSD.  This should make this work in threaded programs.
Ref. PR#58249.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/x11/qt6-qtbase/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/qt6-qtbase/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt6-qtbase/patches/patch-src_network_kernel_qhostinfo__unix.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/qt6-qtbase/Makefile
diff -u pkgsrc/x11/qt6-qtbase/Makefile:1.30 pkgsrc/x11/qt6-qtbase/Makefile:1.31
--- pkgsrc/x11/qt6-qtbase/Makefile:1.30 Wed May  1 09:06:54 2024
+++ pkgsrc/x11/qt6-qtbase/Makefile      Mon May 13 19:39:45 2024
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2024/05/01 09:06:54 jperkin Exp $
+# $NetBSD: Makefile,v 1.31 2024/05/13 19:39:45 he Exp $
 
 DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt6-qtbase-${QTVERSION}
+PKGREVISION=   1
 COMMENT=       C++ X GUI toolkit
 CATEGORIES=    x11
 

Index: pkgsrc/x11/qt6-qtbase/distinfo
diff -u pkgsrc/x11/qt6-qtbase/distinfo:1.12 pkgsrc/x11/qt6-qtbase/distinfo:1.13
--- pkgsrc/x11/qt6-qtbase/distinfo:1.12 Mon May 13 10:59:53 2024
+++ pkgsrc/x11/qt6-qtbase/distinfo      Mon May 13 19:39:45 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2024/05/13 10:59:53 jperkin Exp $
+$NetBSD: distinfo,v 1.13 2024/05/13 19:39:45 he Exp $
 
 BLAKE2s (qtbase-everywhere-src-6.7.0.tar.xz) = 5fe8cbd71fe5deb94db78ee78fcf08c5d0d664915f1c7ff7e8ee09c8be0ef255
 SHA512 (qtbase-everywhere-src-6.7.0.tar.xz) = 72896cc5a677361779f49d60dbdfc33a21d77bd479e0586b0beb03eee2016d613aee56e798143a489431a07a5e7a7db4c7c046105a11b63dd178768f3a7f195a
@@ -20,6 +20,7 @@ SHA1 (patch-src_corelib_qt__cmdline.cmak
 SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 865bbf20931290992d0af68b75a8ed4727dfd50f
 SHA1 (patch-src_gui_configure.cmake) = 95735ed2a5928fa92eef3796c4849d8e64213f5e
 SHA1 (patch-src_network_configure.cmake) = 906b48c9200fea71f475f9e3a6fa6c756203cff0
+SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = fb74f7eda50e8c19d69358560698072c98fdfa54
 SHA1 (patch-src_network_kernel_qnetworkinterface__unix.cpp) = e5baaa500c2d122bed579b313dc8f2c950a66315
 SHA1 (patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm) = 01afb2aef1d14370308c897c1d077b05c5e3f0a9
 SHA1 (patch-src_plugins_platforms_xcb_qxcbatom.cpp) = abbd0b04b881666e82f45adc18e49aafdb43d4be

Added files:

Index: pkgsrc/x11/qt6-qtbase/patches/patch-src_network_kernel_qhostinfo__unix.cpp
diff -u /dev/null pkgsrc/x11/qt6-qtbase/patches/patch-src_network_kernel_qhostinfo__unix.cpp:1.1
--- /dev/null   Mon May 13 19:39:45 2024
+++ pkgsrc/x11/qt6-qtbase/patches/patch-src_network_kernel_qhostinfo__unix.cpp  Mon May 13 19:39:45 2024
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_network_kernel_qhostinfo__unix.cpp,v 1.1 2024/05/13 19:39:45 he Exp $
+
+On NetBSD, res_init() is not thread-safe
+and NetBSD's resolver code does "auto-refresh".
+Ref. PR%58249.
+
+--- src/network/kernel/qhostinfo_unix.cpp.orig 2024-05-13 18:52:13.740627531 +0000
++++ src/network/kernel/qhostinfo_unix.cpp
+@@ -47,6 +47,10 @@ static void maybeRefreshResolver()
+     // res_init() is not thread-safe; executing it leads to state corruption.
+     // Whether it reloads resolv.conf on its own is unknown.
+     return;
++#elif defined(Q_OS_NETBSD)
++    // res_init() is not thread-safe, and NetBSD's resolver code
++    // automatically refreshes on resolv.conf modification.
++    return;
+ #endif
+ 
+ #if QT_CONFIG(libresolv)