CVS commit: pkgsrc/x11/qt6-qtbase

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

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sat Sep 13 14:31:53 UTC 2025

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

Log Message:
qt6-qtbase: add a patch for PR/59096 (qt6 apps fails on NetBSD/earmv7hf).

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/x11/qt6-qtbase/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/qt6-qtbase/distinfo
cvs rdiff -u -r0 -r1.4 \
    pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_plugin_qelfparser__p.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.53 pkgsrc/x11/qt6-qtbase/Makefile:1.54
--- pkgsrc/x11/qt6-qtbase/Makefile:1.53 Fri Sep  5 19:04:16 2025
+++ pkgsrc/x11/qt6-qtbase/Makefile      Sat Sep 13 14:31:52 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2025/09/05 19:04:16 js Exp $
+# $NetBSD: Makefile,v 1.54 2025/09/13 14:31:52 tsutsui 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.22 pkgsrc/x11/qt6-qtbase/distinfo:1.23
--- pkgsrc/x11/qt6-qtbase/distinfo:1.22 Mon Jun 30 15:18:49 2025
+++ pkgsrc/x11/qt6-qtbase/distinfo      Sat Sep 13 14:31:52 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2025/06/30 15:18:49 adam Exp $
+$NetBSD: distinfo,v 1.23 2025/09/13 14:31:52 tsutsui Exp $
 
 BLAKE2s (qtbase-everywhere-src-6.9.1.tar.xz) = f7506255331e742b8d1db5b3bab1c8e0e2dc8304682dfe709b9d9a05db620a20
 SHA512 (qtbase-everywhere-src-6.9.1.tar.xz) = f0fdf4e2c10db73d8036e4b1324f04f48eced78feeed450b0ffa1fac5574daa4173996a4d25da761f5eeaa6037eab02418a88a59fd760d96a08d813c9b8136ed
@@ -16,6 +16,7 @@ SHA1 (patch-src_corelib_global_qversiont
 SHA1 (patch-src_corelib_io_qprocess__unix.cpp) = 7aced93a08934da29884d7a0abe1aae71de123d5
 SHA1 (patch-src_corelib_io_qstandardpaths__unix.cpp) = e4964281da856144f0b0c7bf0326015ad86a3078
 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_gui_configure.cmake) = 95735ed2a5928fa92eef3796c4849d8e64213f5e
 SHA1 (patch-src_network_configure.cmake) = 906b48c9200fea71f475f9e3a6fa6c756203cff0

Added files:

Index: pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_plugin_qelfparser__p.cpp
diff -u /dev/null pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_plugin_qelfparser__p.cpp:1.4
--- /dev/null   Sat Sep 13 14:31:53 2025
+++ pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_plugin_qelfparser__p.cpp    Sat Sep 13 14:31:53 2025
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_corelib_plugin_qelfparser__p.cpp,v 1.4 2025/09/13 14:31:53 tsutsui Exp $
+
+- fix incorrect alignment calculation in Qt ELF note parser,
+  which can fail on NetBSD/earmv7hf due to a .note.netbsd.march
+  section containing 9 byte n_descsz (e.g. "earmv7hf") (PR/59096)
+
+--- src/corelib/plugin/qelfparser_p.cpp.orig   2025-09-12 13:29:40.513080754 +0000
++++ src/corelib/plugin/qelfparser_p.cpp
+@@ -619,12 +619,12 @@ static QLibraryScanResult scanProgramHea
+             // overflow check: calculate where the next note will be, if it exists
+             T::Off next_offset = offset;
+             next_offset += sizeof(T::Nhdr);          // can't overflow (we checked above)
+-            next_offset += NoteAlignment - 3;        // offset is aligned, this can't overflow
++            next_offset += NoteAlignment - 1;        // offset is aligned, this can't overflow
+             if (qAddOverflow<T::Off>(next_offset, n_namesz, &next_offset))
+                 break;
+             next_offset &= -NoteAlignment;
+ 
+-            next_offset += NoteAlignment - 3;        // offset is aligned, this can't overflow
++            next_offset += NoteAlignment - 1;        // offset is aligned, this can't overflow
+             if (qAddOverflow<T::Off>(next_offset, n_descsz, &next_offset))
+                 break;
+             next_offset &= -NoteAlignment;