CVS commit: pkgsrc/x11/qt6-qtbase

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Tue Oct  7 11:57:15 UTC 2025

Modified Files:
        pkgsrc/x11/qt6-qtbase: Makefile distinfo
Added Files:
        pkgsrc/x11/qt6-qtbase/patches: patch-src_corelib_global_qsimd__p.h
Removed Files:
        pkgsrc/x11/qt6-qtbase/patches: patch-src_corelib_text_qstring.cpp

Log Message:
qt6-qtbase: fix ARMEB NEON qvset*() lane order bugs.

Now qt6-qtdeclarative builds and PC6001VX works on NetBSD/earmv7hfeb 10.1.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/x11/qt6-qtbase/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/qt6-qtbase/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_global_qsimd__p.h
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_text_qstring.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.57 pkgsrc/x11/qt6-qtbase/Makefile:1.58
--- pkgsrc/x11/qt6-qtbase/Makefile:1.57 Wed Oct  1 07:25:06 2025
+++ pkgsrc/x11/qt6-qtbase/Makefile      Tue Oct  7 11:57:14 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2025/10/01 07:25:06 adam Exp $
+# $NetBSD: Makefile,v 1.58 2025/10/07 11:57:14 tsutsui 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.26 pkgsrc/x11/qt6-qtbase/distinfo:1.27
--- pkgsrc/x11/qt6-qtbase/distinfo:1.26 Sat Oct  4 02:55:33 2025
+++ pkgsrc/x11/qt6-qtbase/distinfo      Tue Oct  7 11:57:14 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2025/10/04 02:55:33 tsutsui Exp $
+$NetBSD: distinfo,v 1.27 2025/10/07 11:57:14 tsutsui Exp $
 
 BLAKE2s (qtbase-everywhere-src-6.9.3.tar.xz) = f6c3ec7d0fe4ac95f75c35823c3cbe36684445f12a7ac3f7833e34664279215e
 SHA512 (qtbase-everywhere-src-6.9.3.tar.xz) = d49b6356869830b7421e8bb94354884c132dcb37b9b2d56c88671bff0fe60e51a4ee961a7db3f248da84d0eda64af1636f1bdf59fdc0bbf8e50147c370e901de
@@ -11,6 +11,7 @@ SHA1 (patch-cmake_QtSyncQtHelpers.cmake)
 SHA1 (patch-mkspecs_features_toolchain.prf) = 0cf13cb6e859dd6276954239b91953e557add515
 SHA1 (patch-qmake_generators_makefile.cpp) = 1bca636dc88f258876df54bd0c6c64114fa7411d
 SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 6ea4efd2ce88d7cf3c73e1dc2cdf984fe3b6af04
+SHA1 (patch-src_corelib_global_qsimd__p.h) = 9b12c8b076fbe8c0b114905f6c6a3c651f1bd958
 SHA1 (patch-src_corelib_global_qsysinfo.cpp) = adb69aa6e101f1ef4e6d1e9fdffa8d77469139a9
 SHA1 (patch-src_corelib_global_qversiontagging.h) = fdcadb495ce657b2e1b2bc373b0888ccfa5b617d
 SHA1 (patch-src_corelib_io_qprocess__unix.cpp) = 7aced93a08934da29884d7a0abe1aae71de123d5
@@ -18,7 +19,6 @@ SHA1 (patch-src_corelib_io_qstandardpath
 SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 5d71c52cb77500bb7ba44ecd289bd5ebeed09cb7
 SHA1 (patch-src_corelib_plugin_qelfparser__p.cpp) = 99b2b142662ac402ad15b36ba6fe567add269637
 SHA1 (patch-src_corelib_qt__cmdline.cmake) = 96dda2094d2d80f1eb7b1301390ff3f123887812
-SHA1 (patch-src_corelib_text_qstring.cpp) = d8b06a0825931d606f6303b4818f180d35894309
 SHA1 (patch-src_gui_configure.cmake) = 95735ed2a5928fa92eef3796c4849d8e64213f5e
 SHA1 (patch-src_network_configure.cmake) = 906b48c9200fea71f475f9e3a6fa6c756203cff0
 SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = fb74f7eda50e8c19d69358560698072c98fdfa54

Added files:

Index: pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_global_qsimd__p.h
diff -u /dev/null pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_global_qsimd__p.h:1.1
--- /dev/null   Tue Oct  7 11:57:15 2025
+++ pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_global_qsimd__p.h   Tue Oct  7 11:57:14 2025
@@ -0,0 +1,54 @@
+$NetBSD: patch-src_corelib_global_qsimd__p.h,v 1.1 2025/10/07 11:57:14 tsutsui Exp $
+
+- fix ARMEB NEON qvset*() lane order bugs that cause corructions
+  of QString functions like tokenizer() and split() and break
+  qt6 packages builds:
+> [ 11%] Running moc --collect-json for target Core
+> Error opening [snip]/qtbase-everywhere-src-6.9.1/src/corelib/Core_autogen/
+> include/../GSVTHXPFFC/moc_qsequentialanimationgroup_p.cpp.json for reading
+  etc.
+
+--- src/corelib/global/qsimd_p.h.orig  2025-09-22 07:03:29.000000000 +0000
++++ src/corelib/global/qsimd_p.h
+@@ -300,7 +300,8 @@ inline uint16x8_t qvsetq_n_u16(uint16_t 
+         v5 | (v6 << 16) | (u64(v7) << 32) | (u64(v8) << 48)
+     };
+ #else
+-    const uint16x8_t vmask = { v1, v2, v3, v4, v5, v6, v7, v8 };
++    alignas(16) uint16_t mask[8] = { v1, v2, v3, v4, v5, v6, v7, v8 };
++    const uint16x8_t vmask = vld1q_u16(mask);
+ #endif
+     return vmask;
+ }
+@@ -313,7 +314,8 @@ inline uint8x8_t qvset_n_u8(uint8_t v1, 
+         (u64(v5) << 32) | (u64(v6) << 40) | (u64(v7) << 48) | (u64(v8) << 56)
+     };
+ #else
+-    const uint8x8_t vmask = { v1, v2, v3, v4, v5, v6, v7, v8 };
++    alignas(16) uint8_t mask[8] = { v1, v2, v3, v4, v5, v6, v7, v8 };
++    const uint8x8_t vmask = vld1_u8(mask);
+ #endif
+     return vmask;
+ }
+@@ -330,8 +332,9 @@ inline uint8x16_t qvsetq_n_u8(uint8_t v1
+         (u64(v13) << 32) | (u64(v14) << 40) | (u64(v15) << 48) | (u64(v16) << 56)
+     };
+ #else
+-    const uint8x16_t vmask = { v1, v2,  v3,  v4,  v5,  v6,  v7,  v8,
+-                               v9, v10, v11, v12, v13, v14, v15, v16};
++    alignas(16) uint8_t mask[16] = { v1, v2,  v3,  v4,  v5,  v6,  v7,  v8,
++                                     v9, v10, v11, v12, v13, v14, v15, v16};
++    const uint8x16_t vmask = vld1q_u8(mask);
+ #endif
+     return vmask;
+ }
+@@ -340,7 +343,8 @@ inline uint32x4_t qvsetq_n_u32(uint32_t 
+ #if defined(Q_CC_MSVC) && !defined(Q_CC_CLANG)
+     return uint32x4_t{ (uint64_t(b) << 32) | a, (uint64_t(d) << 32) | c };
+ #else
+-    return uint32x4_t{ a, b, c, d };
++    alignas(16) uint32_t mask[4] = { a, b, c, d };
++    return vld1q_u32(mask);
+ #endif
+ }
+ #endif