CVS commit: pkgsrc/x11/qt6-qtbase

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

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sat Oct  4 02:55:33 UTC 2025

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

Log Message:
qt6-qtbase: add workaround to fix build failure on NetBSD/earmv7hfeb.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/qt6-qtbase/distinfo
cvs rdiff -u -r0 -r1.1 \
    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/distinfo
diff -u pkgsrc/x11/qt6-qtbase/distinfo:1.25 pkgsrc/x11/qt6-qtbase/distinfo:1.26
--- pkgsrc/x11/qt6-qtbase/distinfo:1.25 Wed Oct  1 07:25:06 2025
+++ pkgsrc/x11/qt6-qtbase/distinfo      Sat Oct  4 02:55:33 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2025/10/01 07:25:06 adam Exp $
+$NetBSD: distinfo,v 1.26 2025/10/04 02:55:33 tsutsui Exp $
 
 BLAKE2s (qtbase-everywhere-src-6.9.3.tar.xz) = f6c3ec7d0fe4ac95f75c35823c3cbe36684445f12a7ac3f7833e34664279215e
 SHA512 (qtbase-everywhere-src-6.9.3.tar.xz) = d49b6356869830b7421e8bb94354884c132dcb37b9b2d56c88671bff0fe60e51a4ee961a7db3f248da84d0eda64af1636f1bdf59fdc0bbf8e50147c370e901de
@@ -18,6 +18,7 @@ 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_text_qstring.cpp
diff -u /dev/null pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_text_qstring.cpp:1.1
--- /dev/null   Sat Oct  4 02:55:33 2025
+++ pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_text_qstring.cpp    Sat Oct  4 02:55:33 2025
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_corelib_text_qstring.cpp,v 1.1 2025/10/04 02:55:33 tsutsui Exp $
+
+- fix moc --collect-json error on NetBSD/earmv7hfeb due to tokenizer()
+  and split() corruptions by SIMD (neon) on armeb issue
+> [ 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
+
+--- src/corelib/text/qstring.cpp.orig  2025-10-03 14:44:24.989995160 +0000
++++ src/corelib/text/qstring.cpp
+@@ -749,7 +749,7 @@ const char16_t *QtPrivate::qustrchr(QStr
+                                    [=](qsizetype i) { return n[i] == c; },
+                                    [=](qsizetype i) { return n + i; });
+ #  endif
+-#elif defined(__ARM_NEON__)
++#elif defined(__ARM_NEON__) && !defined(__ARMEB__)
+     const uint16x8_t vmask = qvsetq_n_u16(1, 1 << 1, 1 << 2, 1 << 3, 1 << 4, 1 << 5, 1 << 6, 1 << 7);
+     const uint16x8_t ch_vec = vdupq_n_u16(c);
+     for (const char16_t *next = n + 8; next <= e; n = next, next += 8) {
+@@ -1278,7 +1278,7 @@ static int ucstrncmp(const char16_t *a, 
+     }
+ #  elif defined(__SSE2__)
+     return ucstrncmp_sse2<Mode>(a, b, l);
+-#  elif defined(__ARM_NEON__)
++#  elif defined(__ARM_NEON__) && !defined(__ARMEB__)
+     if (l >= 8) {
+         const char16_t *end = a + l;
+         const uint16x8_t mask = qvsetq_n_u16( 1, 1 << 1, 1 << 2, 1 << 3, 1 << 4, 1 << 5, 1 << 6, 1 << 7 );