CVS commit: pkgsrc/x11/qt6-qtbase

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Mar 27 17:24:05 UTC 2026

Modified Files:
        pkgsrc/x11/qt6-qtbase: Makefile distinfo
Added Files:
        pkgsrc/x11/qt6-qtbase/patches: patch-src_corelib_thread_qyieldcpu.h

Log Message:
qt6-qtbase: fix build with Xcode 26.4


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/x11/qt6-qtbase/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/x11/qt6-qtbase/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_thread_qyieldcpu.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/qt6-qtbase/Makefile
diff -u pkgsrc/x11/qt6-qtbase/Makefile:1.70 pkgsrc/x11/qt6-qtbase/Makefile:1.71
--- pkgsrc/x11/qt6-qtbase/Makefile:1.70 Fri Feb  6 10:06:19 2026
+++ pkgsrc/x11/qt6-qtbase/Makefile      Fri Mar 27 17:24:05 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2026/02/06 10:06:19 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2026/03/27 17:24:05 tnn Exp $
 
 DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt6-qtbase-${QTVERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       C++ X GUI toolkit
 CATEGORIES=    x11
 

Index: pkgsrc/x11/qt6-qtbase/distinfo
diff -u pkgsrc/x11/qt6-qtbase/distinfo:1.30 pkgsrc/x11/qt6-qtbase/distinfo:1.31
--- pkgsrc/x11/qt6-qtbase/distinfo:1.30 Wed Jan 28 17:10:50 2026
+++ pkgsrc/x11/qt6-qtbase/distinfo      Fri Mar 27 17:24:05 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2026/01/28 17:10:50 adam Exp $
+$NetBSD: distinfo,v 1.31 2026/03/27 17:24:05 tnn Exp $
 
 BLAKE2s (qtbase-everywhere-src-6.10.2.tar.xz) = ef88e746bc889c689f4295748fd2bcf1c7943bd511c9957937e4b0cec1bdf797
 SHA512 (qtbase-everywhere-src-6.10.2.tar.xz) = 69e7317aa3114d8ca14e0067a001e42f0d2b9208070bdd1a2391cc1b1ccbb7fc3f90c8adcb0742d3c0b4ec7b3a6b770dbb411265458330d05d45f306cfae95c2
@@ -19,6 +19,7 @@ SHA1 (patch-src_corelib_io_qstandardpath
 SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 1d3bba609cb97358e17cddfd594697b9a8d3d067
 SHA1 (patch-src_corelib_plugin_qelfparser__p.cpp) = 99b2b142662ac402ad15b36ba6fe567add269637
 SHA1 (patch-src_corelib_qt__cmdline.cmake) = 96dda2094d2d80f1eb7b1301390ff3f123887812
+SHA1 (patch-src_corelib_thread_qyieldcpu.h) = af24f8f7a5c413b1ae06af28084225067e011988
 SHA1 (patch-src_gui_configure.cmake) = 8a42533c1bd4b67934a2f65c69ed4c802a46954d
 SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = fb74f7eda50e8c19d69358560698072c98fdfa54
 SHA1 (patch-src_network_kernel_qnetworkinterface__unix.cpp) = e5baaa500c2d122bed579b313dc8f2c950a66315

Added files:

Index: pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_thread_qyieldcpu.h
diff -u /dev/null pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_thread_qyieldcpu.h:1.1
--- /dev/null   Fri Mar 27 17:24:05 2026
+++ pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_thread_qyieldcpu.h  Fri Mar 27 17:24:05 2026
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_corelib_thread_qyieldcpu.h,v 1.1 2026/03/27 17:24:05 tnn Exp $
+
+Xcode 26.4 build fix
+
+--- src/corelib/thread/qyieldcpu.h.orig        2026-01-13 10:18:17.000000000 +0000
++++ src/corelib/thread/qyieldcpu.h
+@@ -10,6 +10,12 @@
+ #include <QtCore/qprocessordetection.h>
+ #include <QtCore/qtconfigmacros.h>
+ 
++#if defined(__APPLE__) && defined(__aarch64__)
++#  if __has_include(<arm_acle.h>)
++#    include <arm_acle.h> /* for __yield() */
++#  endif
++#endif
++
+ #ifdef Q_CC_MSVC_ONLY
+ // MSVC defines _YIELD_PROCESSOR() in <xatomic.h>, but as that is a private
+ // header, we include the public ones