CVS commit: pkgsrc/x11/qt6-qtbase

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Sep  8 20:34:46 UTC 2026

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

Log Message:
qt6-qtbase: fix regression in icon handling

Don't consider fallbackThemeName() in themeName()
https://codereview.qt-project.org/c/qt/qtbase/+/763319
https://bugs.kde.org/show_bug.cgi?id=524657


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/x11/qt6-qtbase/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/x11/qt6-qtbase/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt6-qtbase/patches/patch-src_gui_image_qiconloader.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.76 pkgsrc/x11/qt6-qtbase/Makefile:1.77
--- pkgsrc/x11/qt6-qtbase/Makefile:1.76 Wed Sep  2 19:05:31 2026
+++ pkgsrc/x11/qt6-qtbase/Makefile      Tue Sep  8 20:34:46 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.76 2026/09/02 19:05:31 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2026/09/08 20:34:46 markd 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.34 pkgsrc/x11/qt6-qtbase/distinfo:1.35
--- pkgsrc/x11/qt6-qtbase/distinfo:1.34 Tue Aug 18 18:26:02 2026
+++ pkgsrc/x11/qt6-qtbase/distinfo      Tue Sep  8 20:34:46 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2026/08/18 18:26:02 adam Exp $
+$NetBSD: distinfo,v 1.35 2026/09/08 20:34:46 markd Exp $
 
 BLAKE2s (qtbase-everywhere-src-6.11.2.tar.xz) = 692466ff9236f254a99026e17417bfadeafaa0af1a6ef4b10787924939c58c91
 SHA512 (qtbase-everywhere-src-6.11.2.tar.xz) = 8dc4dbb4b3aac9e478361193ed8f8540dc70f1c22f25c91bdc5b6e6e574ea7f8c228800bc54e9a527baaa3334d106b4ecd882d05dc61ab7dcc4cdbe7b4fdb715
@@ -22,6 +22,7 @@ SHA1 (patch-src_corelib_qt__cmdline.cmak
 SHA1 (patch-src_corelib_thread_qthread__unix.cpp) = 952e849bd970030b0382b863d573476af0d35c22
 SHA1 (patch-src_corelib_thread_qyieldcpu.h) = 5d5f755cf0873b9096387c52dce3e6e869c629c1
 SHA1 (patch-src_gui_configure.cmake) = 8a42533c1bd4b67934a2f65c69ed4c802a46954d
+SHA1 (patch-src_gui_image_qiconloader.cpp) = 907be5e997c0635a799dc6afc80b97602f701f9a
 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

Added files:

Index: pkgsrc/x11/qt6-qtbase/patches/patch-src_gui_image_qiconloader.cpp
diff -u /dev/null pkgsrc/x11/qt6-qtbase/patches/patch-src_gui_image_qiconloader.cpp:1.1
--- /dev/null   Tue Sep  8 20:34:46 2026
+++ pkgsrc/x11/qt6-qtbase/patches/patch-src_gui_image_qiconloader.cpp   Tue Sep  8 20:34:46 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_gui_image_qiconloader.cpp,v 1.1 2026/09/08 20:34:46 markd Exp $
+
+Don't consider fallbackThemeName() in themeName()
+https://codereview.qt-project.org/c/qt/qtbase/+/763319
+https://bugs.kde.org/show_bug.cgi?id=524657
+
+--- src/gui/image/qiconloader.cpp.orig 2026-05-11 20:54:55.000000000 +0000
++++ src/gui/image/qiconloader.cpp
+@@ -151,8 +151,7 @@ QString QIconLoader::themeName() const
+         return m_userTheme;
+ 
+     if (m_systemTheme.isEmpty()) {
+-        const QString &themeName = systemThemeName();
+-        m_systemTheme = !themeName.isEmpty() ? themeName : fallbackThemeName();
++        m_systemTheme = systemThemeName();
+     }
+     return m_systemTheme;
+ }