Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1715597993295990"
MIME-Version: 1.0
Date: Mon, 13 May 2024 10:59:53 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/x11/qt6-qtbase
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20240513105953.672CCFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1715597993295990
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Mon May 13 10:59:53 UTC 2024

Modified Files:
	pkgsrc/x11/qt6-qtbase: distinfo
Added Files:
	pkgsrc/x11/qt6-qtbase/patches: patch-src_corelib_CMakeLists.txt
	    patch-src_corelib_io_qprocess__unix.cpp

Log Message:
qt6-qtbase: Fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/qt6-qtbase/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt \
    pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_io_qprocess__unix.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1715597993295990
Content-Disposition: inline
Content-Length: 3219
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/x11/qt6-qtbase/distinfo
diff -u pkgsrc/x11/qt6-qtbase/distinfo:1.11 pkgsrc/x11/qt6-qtbase/distinfo:1.12
--- pkgsrc/x11/qt6-qtbase/distinfo:1.11	Sat Apr 27 11:49:40 2024
+++ pkgsrc/x11/qt6-qtbase/distinfo	Mon May 13 10:59:53 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2024/04/27 11:49:40 adam Exp $
+$NetBSD: distinfo,v 1.12 2024/05/13 10:59:53 jperkin Exp $
 
 BLAKE2s (qtbase-everywhere-src-6.7.0.tar.xz) = 5fe8cbd71fe5deb94db78ee78fcf08c5d0d664915f1c7ff7e8ee09c8be0ef255
 SHA512 (qtbase-everywhere-src-6.7.0.tar.xz) = 72896cc5a677361779f49d60dbdfc33a21d77bd479e0586b0beb03eee2016d613aee56e798143a489431a07a5e7a7db4c7c046105a11b63dd178768f3a7f195a
@@ -11,7 +11,9 @@ 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_CMakeLists.txt) = 0eb9a57deb694b6b1bd3b3d0f3de31cba9f606a6
 SHA1 (patch-src_corelib_global_qsysinfo.cpp) = adb69aa6e101f1ef4e6d1e9fdffa8d77469139a9
+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_qt__cmdline.cmake) = 96dda2094d2d80f1eb7b1301390ff3f123887812

Added files:

Index: pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt
diff -u /dev/null pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt:1.1
--- /dev/null	Mon May 13 10:59:53 2024
+++ pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt	Mon May 13 10:59:53 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_corelib_CMakeLists.txt,v 1.1 2024/05/13 10:59:53 jperkin Exp $
+
+Include qversiontagging on SunOS otherwise the build breaks.
+
+--- src/corelib/CMakeLists.txt.orig	2024-05-13 10:28:48.456738816 +0000
++++ src/corelib/CMakeLists.txt
+@@ -465,7 +465,7 @@ set(core_version_tagging_files
+     global/qversiontagging.cpp
+     global/qversiontagging.h)
+ qt_internal_extend_target(Core
+-    CONDITION TEST_ld_version_script OR APPLE OR WIN32
++    CONDITION TEST_ld_version_script OR APPLE OR WIN32 OR SOLARIS
+     SOURCES ${core_version_tagging_files}
+ )
+ 
Index: pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_io_qprocess__unix.cpp
diff -u /dev/null pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_io_qprocess__unix.cpp:1.1
--- /dev/null	Mon May 13 10:59:53 2024
+++ pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_io_qprocess__unix.cpp	Mon May 13 10:59:53 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_corelib_io_qprocess__unix.cpp,v 1.1 2024/05/13 10:59:53 jperkin Exp $
+
+SunOS needs sys/termios.h for TIOCNOTTY.
+
+--- src/corelib/io/qprocess_unix.cpp.orig	2024-05-13 09:54:08.532095783 +0000
++++ src/corelib/io/qprocess_unix.cpp
+@@ -32,6 +32,10 @@
+ #  include <sys/neutrino.h>
+ #endif
+ 
++#ifdef Q_OS_SOLARIS
++#  include <sys/termios.h>
++#endif
++
+ #include <errno.h>
+ #include <limits.h>
+ #include <stdlib.h>


--_----------=_1715597993295990--