Received: by mail.netbsd.org (Postfix, from userid 605) id 5964784E19; Sat, 25 Mar 2023 07:29:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 86D6884D8D for ; Sat, 25 Mar 2023 07:29:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id sTbYub90dIxA for ; Sat, 25 Mar 2023 07:29:32 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 9AAD384D17 for ; Sat, 25 Mar 2023 07:29:32 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8E0D7F98D; Sat, 25 Mar 2023 07:29:32 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1679729372218630" MIME-Version: 1.0 Date: Sat, 25 Mar 2023 07:29:32 +0000 From: "Niclas Rosenvik" Subject: CVS commit: pkgsrc/x11/qt6-qtbase To: pkgsrc-changes@NetBSD.org Reply-To: nros@netbsd.org X-Mailer: log_accum Message-Id: <20230325072932.8E0D7F98D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1679729372218630 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nros Date: Sat Mar 25 07:29:32 UTC 2023 Modified Files: pkgsrc/x11/qt6-qtbase: distinfo pkgsrc/x11/qt6-qtbase/patches: patch-src_corelib_plugin_qelfparser__p.cpp Added Files: pkgsrc/x11/qt6-qtbase/patches: patch-src_corelib_global_qprocessordetection.h Log Message: qt6-qtbase: add patches to build on systems with Alpha cpus To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/qt6-qtbase/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_global_qprocessordetection.h cvs rdiff -u -r1.1 -r1.2 \ 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. --_----------=_1679729372218630 Content-Disposition: inline Content-Length: 5181 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.1 pkgsrc/x11/qt6-qtbase/distinfo:1.2 --- pkgsrc/x11/qt6-qtbase/distinfo:1.1 Thu Nov 24 11:11:38 2022 +++ pkgsrc/x11/qt6-qtbase/distinfo Sat Mar 25 07:29:32 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2022/11/24 11:11:38 nros Exp $ +$NetBSD: distinfo,v 1.2 2023/03/25 07:29:32 nros Exp $ BLAKE2s (qtbase-everywhere-src-6.4.1.tar.xz) = edd9109f0862cc1ea719e84d0aa85c15a1e28f0ad55ba9881a374828ee8ee7b8 SHA512 (qtbase-everywhere-src-6.4.1.tar.xz) = d5c85a8b05dd32912e213b1c51c928e6bde0ac64cdef1649419f02522604988add9d8e45baa770f53790b5477e6e43e4e66e69db7f2e0c1081a48cfa4052b4af @@ -12,10 +12,11 @@ SHA1 (patch-mkspecs_features_toolchain.p SHA1 (patch-qmake_generators_makefile.cpp) = 1bca636dc88f258876df54bd0c6c64114fa7411d SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 6ea4efd2ce88d7cf3c73e1dc2cdf984fe3b6af04 SHA1 (patch-src_corelib_global_qglobal.cpp) = 6368692c2d5d64633d956a89c6b4607667c121a7 +SHA1 (patch-src_corelib_global_qprocessordetection.h) = c8df67bbf9dff30a0069220b92c085b057a4b37f SHA1 (patch-src_corelib_global_qversiontagging.h) = 7a91e19fe1eb9a5b97edb6be3a7bcbf6405b3eb8 SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = b12a41da19b25e34e12fdf80714a37e8c46278f9 SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073 -SHA1 (patch-src_corelib_plugin_qelfparser__p.cpp) = ba60f01a1c712c2da89f6b9edb662757b00119bb +SHA1 (patch-src_corelib_plugin_qelfparser__p.cpp) = 8955a14b9b12a0e3517547af20b4ba5454462dae SHA1 (patch-src_corelib_qt__cmdline.cmake) = 25fe89821ba1e1323edae87ca1ee0bd5ccf0e407 SHA1 (patch-src_corelib_thread_qmutex__p.h) = 47047f5af4383b622c59c3969145e44c6ac4bf18 SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 9dffdbfc81bc7d3259020cd32b4039b7be6ee2bd Index: pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_plugin_qelfparser__p.cpp diff -u pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_plugin_qelfparser__p.cpp:1.1 pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_plugin_qelfparser__p.cpp:1.2 --- pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_plugin_qelfparser__p.cpp:1.1 Thu Nov 24 11:11:38 2022 +++ pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_plugin_qelfparser__p.cpp Sat Mar 25 07:29:32 2023 @@ -1,8 +1,12 @@ -$NetBSD: patch-src_corelib_plugin_qelfparser__p.cpp,v 1.1 2022/11/24 11:11:38 nros Exp $ +$NetBSD: patch-src_corelib_plugin_qelfparser__p.cpp,v 1.2 2023/03/25 07:29:32 nros Exp $ * Support older ELFOSABI_LINUX that has been replaced with ELFOSABI_GNU. Needed on NetBSD 9. +* Enable Alpha support + From upstream: + https://codereview.qt-project.org/c/qt/qtbase/+/437349 + --- src/corelib/plugin/qelfparser_p.cpp.orig 2022-11-03 12:40:18.000000000 +0000 +++ src/corelib/plugin/qelfparser_p.cpp @@ -20,6 +20,11 @@ @@ -17,3 +21,20 @@ $NetBSD: patch-src_corelib_plugin_qelfpa QT_BEGIN_NAMESPACE using namespace Qt::StringLiterals; +@@ -107,6 +112,8 @@ struct ElfMachineCheck + static const Elf32_Half ExpectedMachine = + #if 0 + // nothing ++#elif defined(Q_PROCESSOR_ALPHA) ++ EM_ALPHA + #elif defined(Q_PROCESSOR_ARM_32) + EM_ARM + #elif defined(Q_PROCESSOR_ARM_64) +@@ -371,6 +378,7 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION stati + switch (r.machine) { + // list definitely not exhaustive! + case EM_NONE: d << ", no machine"; break; ++ case EM_ALPHA: d << ", ALPHA"; break; + case EM_ARM: d << ", ARM"; break; + case EM_AARCH64: d << ", AArch64"; break; + #ifdef EM_BLACKFIN Added files: Index: pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_global_qprocessordetection.h diff -u /dev/null pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_global_qprocessordetection.h:1.1 --- /dev/null Sat Mar 25 07:29:32 2023 +++ pkgsrc/x11/qt6-qtbase/patches/patch-src_corelib_global_qprocessordetection.h Sat Mar 25 07:29:32 2023 @@ -0,0 +1,28 @@ +$NetBSD: patch-src_corelib_global_qprocessordetection.h,v 1.1 2023/03/25 07:29:32 nros Exp $ + +* Enable Alpha support + From upstream: + https://codereview.qt-project.org/c/qt/qtbase/+/437349 + +--- src/corelib/global/qprocessordetection.h.orig 2023-03-23 21:53:15.312590294 +0000 ++++ src/corelib/global/qprocessordetection.h +@@ -48,8 +48,8 @@ + + Alpha is bi-endian, use endianness auto-detection implemented below. + */ +-// #elif defined(__alpha__) || defined(_M_ALPHA) +-// # define Q_PROCESSOR_ALPHA ++#if defined(__alpha__) || defined(_M_ALPHA) ++# define Q_PROCESSOR_ALPHA + // Q_BYTE_ORDER not defined, use endianness auto-detection + + /* +@@ -58,7 +58,7 @@ + ARM is bi-endian, detect using __ARMEL__ or __ARMEB__, falling back to + auto-detection implemented below. + */ +-#if defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_M_ARM) || defined(_M_ARM64) || defined(__aarch64__) || defined(__ARM64__) ++#elif defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_M_ARM) || defined(_M_ARM64) || defined(__aarch64__) || defined(__ARM64__) + # if defined(__aarch64__) || defined(__ARM64__) || defined(_M_ARM64) + # define Q_PROCESSOR_ARM_64 + # define Q_PROCESSOR_WORDSIZE 8 --_----------=_1679729372218630--