CVS commit: pkgsrc/x11/qt6-qtbase

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Jun 10 21:15:17 UTC 2024

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

Log Message:
qt6-qtbase: Move QT_NO_VERSION_TAGGING hack into header.

Fixes builds of packages that don't share Makefile.common but do use the
public qt6 headers.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/qt6-qtbase/Makefile.common
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/qt6-qtbase/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_global_qversiontagging.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.common
diff -u pkgsrc/x11/qt6-qtbase/Makefile.common:1.39 pkgsrc/x11/qt6-qtbase/Makefile.common:1.40
--- pkgsrc/x11/qt6-qtbase/Makefile.common:1.39  Thu Jun  6 12:46:03 2024
+++ pkgsrc/x11/qt6-qtbase/Makefile.common       Mon Jun 10 21:15:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2024/06/06 12:46:03 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.40 2024/06/10 21:15:17 jperkin Exp $
 # used by audio/qt6-qtspeech/Makefile
 # used by comms/qt6-qtconnectivity/Makefile
 # used by databases/qt6-odbc/Makefile
@@ -55,8 +55,7 @@ CXXFLAGS+=            -Wno-register
 # wcstof(3) etc. is used in C++ code.
 CFLAGS.NetBSD+=                -D_NETBSD_SOURCE
 
-# ld: undefined symbol qt_version_tag
-CFLAGS.SunOS+=         -DQT_NO_VERSION_TAGGING -D__EXTENSIONS__
+CFLAGS.SunOS+=         -D__EXTENSIONS__
 
 # include/openssl/e_os2.h:283:25: error: '_Noreturn' does not name a type
 CXXFLAGS.SunOS+=       -D_Noreturn=""

Index: pkgsrc/x11/qt6-qtbase/distinfo
diff -u pkgsrc/x11/qt6-qtbase/distinfo:1.14 pkgsrc/x11/qt6-qtbase/distinfo:1.15
--- pkgsrc/x11/qt6-qtbase/distinfo:1.14 Mon May 20 19:38:24 2024
+++ pkgsrc/x11/qt6-qtbase/distinfo      Mon Jun 10 21:15:17 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2024/05/20 19:38:24 adam Exp $
+$NetBSD: distinfo,v 1.15 2024/06/10 21:15:17 jperkin Exp $
 
 BLAKE2s (qtbase-everywhere-src-6.7.1.tar.xz) = 29a1bed852df0aff11e043ee964423adc3339049f3a2bc6a4c29bfab57146766
 SHA512 (qtbase-everywhere-src-6.7.1.tar.xz) = 864bebfc3659907e52b8dc3f62a65d431573ef2bf406a9f71c688229083a2128c5474f75823275d11948be3d031de1d6427acf373f977df9ee9e73a27ef56efb
@@ -13,6 +13,7 @@ SHA1 (patch-qmake_generators_makefile.cp
 SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 6ea4efd2ce88d7cf3c73e1dc2cdf984fe3b6af04
 SHA1 (patch-src_corelib_CMakeLists.txt) = 0eb9a57deb694b6b1bd3b3d0f3de31cba9f606a6
 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
 SHA1 (patch-src_corelib_io_qstandardpaths__unix.cpp) = e4964281da856144f0b0c7bf0326015ad86a3078
 SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 5d71c52cb77500bb7ba44ecd289bd5ebeed09cb7

Added files:

Index: pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_global_qversiontagging.h
diff -u /dev/null pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_global_qversiontagging.h:1.3
--- /dev/null   Mon Jun 10 21:15:17 2024
+++ pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_global_qversiontagging.h    Mon Jun 10 21:15:17 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_corelib_global_qversiontagging.h,v 1.3 2024/06/10 21:15:17 jperkin Exp $
+
+SunOS linker does not support this version tagging.
+
+--- src/corelib/global/qversiontagging.h.orig  2024-06-10 17:28:45.092935077 +0000
++++ src/corelib/global/qversiontagging.h
+@@ -75,7 +75,7 @@ struct QVersionTag
+ };
+ }
+ 
+-#if !defined(QT_NO_VERSION_TAGGING) && (defined(QT_BUILD_CORE_LIB) || defined(QT_BOOTSTRAPPED) || defined(QT_STATIC))
++#if !defined(QT_NO_VERSION_TAGGING) && (defined(QT_BUILD_CORE_LIB) || defined(QT_BOOTSTRAPPED) || defined(QT_STATIC) || defined(Q_OS_SOLARIS))
+ // don't make tags in QtCore, bootstrapped systems or if the user asked not to
+ #  define QT_NO_VERSION_TAGGING
+ #endif