From nobody Sun Nov 10 23:23:24 2024 X-Original-To: freebsd-ports@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xmpdh0vDVz5cR0h for ; Sun, 10 Nov 2024 23:23:36 +0000 (UTC) (envelope-from tatsuki_makino@hotmail.com) Received: from HK3PR03CU002.outbound.protection.outlook.com (mail-eastasiaazolkn19011035.outbound.protection.outlook.com [52.103.64.35]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.protection.outlook.com", Issuer "DigiCert Cloud Services CA-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xmpdf4WhFz4ry8 for ; Sun, 10 Nov 2024 23:23:34 +0000 (UTC) (envelope-from tatsuki_makino@hotmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=hotmail.com header.s=selector1 header.b=YWVzMUOd; spf=pass (mx1.freebsd.org: domain of tatsuki_makino@hotmail.com designates 52.103.64.35 as permitted sender) smtp.mailfrom=tatsuki_makino@hotmail.com; dmarc=pass (policy=none) header.from=hotmail.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TBRq5GJi72VJ0Q19vqdLXNUvxdvoYsbQaowK+CfFkSXDzv5WFfF+z8MrTQu3ppgc3V19V922/yBXx1afzvdg7yF9o703O1LuzFlrjqOlX4/cPtGkyn4oIFPS1qM+4SFLui9tJT2IZsL2euCuS2ujsLmhpGD9dzultMKqMLJLPD35JSTb9jfZj5/zh+QllJ42zgH/Bh7EteXHuvWpcoRM1H40UMAzAkVntnuSCgsOKzkOSZtMIr9lQIng6lKUtdXLdXF1UL7mkWZE47FgNYzvM/yljZ0HnRPN1Wnq90q9x+or1oYYoNbGiRw4HP9VaLHgrV8FNzgx0S6+cAxEb4aOaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KEtb6hUEl1seqmmxmkDPk4tIsQqed8txnl3BmMxEJXg=; b=D3wvBQir1g4NpyItoQGmFAwGz6bGLtI/c02SY0RtqvNanqVxjPlyHddAAursG4T0mYOvqMIO6sd7xJN7CillFd+wErqVOj21ux1DciyhcjL8wrzCBxhvFf10vclsNzkPkmiW+mGh9yYATu+1p8dz36UDB/8EMoUYPEIjNhMVbZv8Ox6h9KzfYOvdKuDAkDNaSJbubxEkzpUyoJxso7oec7mtqcNOywq1eHy/z6rAQHGkhwbj5Fb4RdWI7oJDVTx1hwM5b0Yi9rDavNKixjomnDP6D/t2YT9/JSWxZRlB3UQ3VXe/oIfzBiFUOAOja8wy3aW2NC4L/nuJ1Zq8dtyqwA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KEtb6hUEl1seqmmxmkDPk4tIsQqed8txnl3BmMxEJXg=; b=YWVzMUOdCwU75qDqjXTObUHtllvub+c/vNY/IKVYyxLcDfIqOPLwn8Hw+RCMu8V7dsU8cAhDRf0e9Iebp06hiLA1RKDtN/KieK9kmbD12MK3R6M6SEe8Cjja7u4vglGHPXsGD6/VdSMGk51iD8rhhD+RGRwJlk5ta41MVTAFKWnSCaCHsIROs75/FJ88yvQKdBPpk2p13atbv6UyoDWyfmwAuK94FZKcKgRIxRXPMQ55G2KzbLAgUmr4LQAXT5OWn8OSgjftx9Jy12X+ud2l82PNLZoxu8qHk3s1V4OA+ncZ3I+cnLg1XBQtB+tJ1UVBnf9mifxSMx9TAI/hXqga4w== Received: from SI2PR01MB5036.apcprd01.prod.exchangelabs.com (2603:1096:4:1f8::9) by TYZPR01MB6099.apcprd01.prod.exchangelabs.com (2603:1096:405:6c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.35; Sun, 10 Nov 2024 23:23:29 +0000 Received: from SI2PR01MB5036.apcprd01.prod.exchangelabs.com ([fe80::546c:7ecf:524e:4c34]) by SI2PR01MB5036.apcprd01.prod.exchangelabs.com ([fe80::546c:7ecf:524e:4c34%3]) with mapi id 15.20.8114.031; Sun, 10 Nov 2024 23:23:28 +0000 Message-ID: Date: Mon, 11 Nov 2024 08:23:24 +0900 User-Agent: Mozilla Thunderbird Content-Language: en-US To: "freebsd-ports@FreeBSD.org" From: Tatsuki Makino Subject: sysutils/bsdisks: 0.36 requires full C++20 header Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: OS0P286CA0077.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:b0::10) To SI2PR01MB5036.apcprd01.prod.exchangelabs.com (2603:1096:4:1f8::9) X-Microsoft-Original-Message-ID: <250628ec-0203-4dc8-b650-9a272ea6ebfa@hotmail.com> List-Id: Porting software to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-ports List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: freebsd-ports@freebsd.org Sender: owner-freebsd-ports@FreeBSD.org MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SI2PR01MB5036:EE_|TYZPR01MB6099:EE_ X-MS-Office365-Filtering-Correlation-Id: b4ee211e-7f65-402a-f63a-08dd01deae0a X-Microsoft-Antispam: BCL:0;ARA:14566002|461199028|8060799006|5072599009|6090799003|7092599003|19110799003|15080799006|440099028|3412199025|4302099013|10035399004|1602099012; X-Microsoft-Antispam-Message-Info: =?utf-8?B?ZlByQnVNODV6SFhHbjZFTnZtZFR5N1lOSTlTWkNZZ0xUTDU5RXkxZjdGOFlo?= =?utf-8?B?UFZiRTVQWHA5enJwTWdJSG5tOGMvekpIM3FEa1A5ZmFEVzdLQis3bVowbWR3?= =?utf-8?B?enZWUitscDBDRTk2UEppbHdvM2V4d0t4YlFKZTE5ZXpFYUZJWUp3SXQ0RGtB?= =?utf-8?B?Rkl6Vjl3TFo2amF2UkpRVGZzdlNURVl0SEF2TEI3WWxVeHB4aEtDSGZYMVNK?= =?utf-8?B?dnJlTXNGM1BTY2pZVDZCeW82L2R3Y05FNkZvQ0p1YVFabjgybWE2U0YvajVH?= =?utf-8?B?WlRsT2dRS0xiZzR2MEN3MWdHcXB5Tk5KVGxZQit2SlkzSnQyMXdwZUJmWW1p?= =?utf-8?B?NVduOUlKOGREOHF6Z21UTzgyb1E1bkc3ZDQxbVhtQVNmRElEVU5lZGxtaWYy?= =?utf-8?B?d1c2aVp5akVjM0xsSzBFaTZhdGVzZkF5MWxYd0VESmtlcVZhMW5TYnNsZXlC?= =?utf-8?B?UEF2d3hTK1hWeWZFNUF5azJiYTd3OTUrenh4WVBmd1ZSeTE4RkRlbENRSGlx?= =?utf-8?B?empLSHNhWUZTRnlicTFMSUhVNTl6MXVsL1VpWHBaNm5LeEtHTTEyajJLazZa?= =?utf-8?B?OXZqaVlxenVhRFh4WVBvSExTNHdOUEFCUlI1TXI2K09TQ0wvcXFoS2E0K0xO?= =?utf-8?B?ajBnYzkxQlBzdXdkK1JleFBSNTlwZnpKYlZMSUZETFlyZkhlYUNJOEkvN0Rn?= =?utf-8?B?dmNQUytlZEk0UDJZekJlZ01TUVZRNFI1UGNmbHcvRUdjLzh2VmUyK00zZkl2?= =?utf-8?B?a21GVWU4VmhCYTAzcDhMRzBpYjVhaCtHQ2Q1RnVhbDNLdFVlS05uRW9BdE5M?= =?utf-8?B?emFhVHNDQzRRaC93ZHBISmM3eGxQaDZBNjlnSnlMdGdHbVQySWo2VUNMZThB?= =?utf-8?B?YnpIblJWMS91d0NkRElsOEJVb2REWmdleHhnYWNncHY0Y3RDcEMzbDVIU3ZY?= =?utf-8?B?TUtyYlk4NEJKM3ZtZXliMng3NUFQOUM4QkRkcXF2Mm01MjJSemRyVzZCL1B1?= =?utf-8?B?NjJMMlVacUsranBIcUZ1R3ovU1RZQk1qTWREQThEeU5KSHVWcitXTTVwQ1VU?= =?utf-8?B?NUZIRE1DSEg5VUROZ2JLejdqbmM2MTVXanJmQUxPOTMxZWtUSzFVKzVWSG0z?= =?utf-8?B?UFY2QkVJenkwSkN1OE5WOEdlWlVScFFQdktxQWQxVWRqRFloNlVpb0VZVWtU?= =?utf-8?B?WU1zRHVHMHZDalBQSmFGeU1NaGZjN1FPeU9IRHBGNmFWU0NSSitxQWM1ZVpn?= =?utf-8?B?NlY1NGZCZ1NaSXdrRWNPb3Zha3htdnBrWndac21sd2ZVbWdHcTgyWm5LQkMr?= =?utf-8?B?amFmOU0xa0ZvYWRmNmdyYjR0WkxIZnQwa2VtYlV3aWF5b0p1RC80cndib0M0?= =?utf-8?B?bmZscXcraEtXMS9xZmZoelc3cWFqdDdvUzdZVFVtS29JeE4zODk4cElmc0VT?= =?utf-8?B?QUo2dXZjMWNhN0pkQUdXeWcyeExoSDJXRXZmMk1naDlhWU5YajRBWXhOSjQ4?= =?utf-8?B?bG5aMFYxdG5BSWF2SmZGMVJzb3lKdElQM0xhd2UxMkhTWWtnbU54citWSmNQ?= =?utf-8?Q?9gCq605/rJaLnBpsbek+qUh6Y=3D?= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RmRkd3JBSmZrTmlpeVpTbG1UK2JHYTFFMlFPaTBoSE1xQmlOQnlEaUo5cFFT?= =?utf-8?B?d3pxV0Z6SEJhWWpHcUU4VG5lYUF4YWZTVUQ1U3hHbHVKRDVWK1RWYTlxblNC?= =?utf-8?B?anQ2emkrcWdqNFRDWGRRQTBhVTFqZE1rTDUxWDArbkc4VmQ2YUVDRnFtWXZv?= =?utf-8?B?c3FKTXAycFpmVTUwWGdqNEtNSkNCc0pMMG5BUXB0cWVhUUtFTWcycTVualBz?= =?utf-8?B?bGlsR1ZoSEZyVGZTVTRpL0EzcFJtVDFxdy9QbVhJQW5lRnZPSEZwZWJjWnVB?= =?utf-8?B?Um5lYTBnSGJtbjVJQlVRZ3IrcG9RWUYzU2VsVUhoRU9NMzlCVDh2SGhyQzBZ?= =?utf-8?B?cEcvRVpHN0FoNWNvbnZkcDBQS1g0bXlJSG1TbzdZRityUWdwSHYwV05YSFRo?= =?utf-8?B?My8vais4bEVDek9RWUIrNU1pRFA5VUFYZXhEbmFBcS84M1ZGbU9mbkpjNTR2?= =?utf-8?B?NmZRQ2xSenByWnN0YWJEQlYrNEZLQzdSUGkyaE1DeWxTS2RXMkdtaEZkYjhS?= =?utf-8?B?aFV6NzhPOHAyZnp6bjdjWFNlaG9sVmdYZkVLTmRWejQxSERtVlk0Nm9hMGFS?= =?utf-8?B?dVlQQzB6SkpSWlB2aWgrZVJBeGxxY2xsRUxvWkV5U0M0ZjVzY2pZaEkzVEpr?= =?utf-8?B?eFdONUhCMzFLUFZKZkdqMGdzTVlUMlpGUWtSRjgxNHk3RWU0Z09idXFWOHVo?= =?utf-8?B?U0pBVEtqQ0MwMUFkbXFzeCtIaVRaeHZ0cFdEeTZyd0lmSXNSdGRLUGt0N2dm?= =?utf-8?B?YkhmTlBzcUx2Q28wUFdaOXloQXZXMTZLUHBiOEZidFFYRU1xTVBuRDBqcFh6?= =?utf-8?B?YXZzVWRvY25FOTFNYnNpanBYcWRESFJZSkh2bkJBZWpwc1AzdzlJTUxKZE9u?= =?utf-8?B?WERMaCtHbktjL3IwczlsZzViNThQcStwWlRKT25vZFRpSnZHY2RBQW1GcXYw?= =?utf-8?B?eGFVVVFoTzZ1S2FnUTVIUmpFUXZBYUdjVU9xMi9WM3I0dGwrOTNyMGJscGVZ?= =?utf-8?B?Vlh6MDMzZDEzNW4vY0VKVlYzVzE3c3o2SXI5RzJvcGFHcUo1emc0OUE4cVdi?= =?utf-8?B?MGZpNGhOMitBWCtoSXNCUkpjcWU0M251SDN2a0YrdGtPTDV5OUZQQnUyNWxs?= =?utf-8?B?MU5acUIrYkFRUkZrbGx2UjRJbmlBREhRRi9VajA2US9HZ1dISzZSSWg5N0hF?= =?utf-8?B?bkZKdWdHam42VnRmdXhtMGpoV0loenFTcmp3SXR3VDhFaWl0NEgzMjdTMXNr?= =?utf-8?B?OUdJQUdZQTJSV0Zsek9hRSsvczZqVklhR0FKRE5EK0MwNmR1UlRtM1JTa3Z4?= =?utf-8?B?SXVlQkZ1cnAwd1NzbGdqNjgvZTcrR0JxMFM1bXM5dm05OUs1ZjFoVnFWdlVD?= =?utf-8?B?OExiMUUxZVFDS2NJSW5CM2xqUzE0ZmtpeVJUdDhLQTM1T200V1U4ZWYxWXFP?= =?utf-8?B?ZWtpdE4rVkFOdi9BVWsrNHlZR3Q5ZTU2Yy9YV09ZT0FaRG9TSzR6TlBRUURw?= =?utf-8?B?Q2ltWkRNdGJpb0VpZ2doVkJIUFdWc2VKRDEyWml4NGM3S2x6YVBBN2dkWnNm?= =?utf-8?B?dFhtbGpXSlBkMjlEWG5WNXVpaWVDNUNDOGdESkZrNXQ3RHhqS1MydEhNU0xs?= =?utf-8?B?NFQ3RTNodUlDRmw0bi83clJCbXh4ck1TL3ZXMGZ2S3FWL3ZVa3dxSS9mdXVP?= =?utf-8?Q?h78w4CQwS93VncVgY+3B?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-d8e84.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: b4ee211e-7f65-402a-f63a-08dd01deae0a X-MS-Exchange-CrossTenant-AuthSource: SI2PR01MB5036.apcprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2024 23:23:27.6789 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR01MB6099 X-Spamd-Result: default: False [-2.43 / 15.00]; FORGED_MUA_THUNDERBIRD_MSGID_UNKNOWN(2.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector10001:i=1]; NEURAL_HAM_SHORT(-0.94)[-0.938]; DMARC_POLICY_ALLOW(-0.50)[hotmail.com,none]; R_SPF_ALLOW(-0.20)[+ip4:52.103.0.0/17]; R_DKIM_ALLOW(-0.20)[hotmail.com:s=selector1]; MIME_GOOD(-0.10)[text/plain]; XM_UA_NO_VERSION(0.01)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; FREEMAIL_FROM(0.00)[hotmail.com]; MIME_TRACE(0.00)[0:+]; DWL_DNSWL_NONE(0.00)[hotmail.com:dkim]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[hotmail.com:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_EQ_ADDR_ALL(0.00)[]; MLMMJ_DEST(0.00)[freebsd-ports@FreeBSD.org]; ASN(0.00)[asn:8075, ipnet:52.96.0.0/12, country:US]; RWL_MAILSPIKE_POSSIBLE(0.00)[52.103.64.35:from]; FREEMAIL_ENVFROM(0.00)[hotmail.com]; RCVD_IN_DNSWL_NONE(0.00)[52.103.64.35:from] X-Rspamd-Queue-Id: 4Xmpdf4WhFz4ry8 X-Spamd-Bar: -- Hello. bsdisks-0.36 is now something that can't be built for people like me who are still using environments with incomplete c20 headers. If you want to force it to build, apply a patch like the one attached below and build it :) Regards. diff --git a/sysutils/bsdisks/files/patch-block.cpp b/sysutils/bsdisks/files/patch-block.cpp new file mode 100644 index 00000000000..03cb6bc613f --- /dev/null +++ b/sysutils/bsdisks/files/patch-block.cpp @@ -0,0 +1,22 @@ +--- block.cpp.orig 2024-11-10 10:48:14 UTC ++++ block.cpp +@@ -238,10 +238,19 @@ QDBusObjectPath Block::table() const + + void Block::fillMountPoints() + { ++#if __FreeBSD__ >= 13 + auto readyStorage = QStorageInfo::mountedVolumes() + | views::filter([](const QStorageInfo &storage) { return storage.isValid() && storage.isReady(); }); ++#else ++ auto readyStorage = QStorageInfo::mountedVolumes(); ++#endif + for (const QStorageInfo &storage : readyStorage) + { ++#if __FreeBSD__ >= 13 ++#else ++ if(!(storage.isValid() && storage.isReady())) ++ continue; ++#endif + // first check if the mounted device matches this->device() + bool match = !storage.device().compare(device().chopped(1)); + // then go over all labels diff --git a/sysutils/bsdisks/files/patch-blockfilesystem.cpp b/sysutils/bsdisks/files/patch-blockfilesystem.cpp new file mode 100644 index 00000000000..415e7adf20a --- /dev/null +++ b/sysutils/bsdisks/files/patch-blockfilesystem.cpp @@ -0,0 +1,39 @@ +--- blockfilesystem.cpp.orig 2024-11-10 10:48:14 UTC ++++ blockfilesystem.cpp +@@ -320,9 +320,17 @@ void BlockFilesystem::signalMountPointsChanged() + { + // TODO: this probably need a less hacky fix + // See https://foss.heptapod.net/bsdutils/bsdisks/-/issues/12 ++#if __FreeBSD__ >= 13 + auto mounts = mountPoints + | views::transform([](const auto& pair) { return pair.first + '\0'; }); + auto mps = QByteArrayList(mounts.begin(), mounts.end()); ++#else ++ QByteArrayList mps; ++ for (const auto& mountPair : mountPoints) ++ { ++ mps << (mountPair.first + '\0'); ++ } ++#endif + + QVariantMap props; + props.insert(QStringLiteral("MountPoints"), QVariant::fromValue(mps)); +@@ -351,9 +359,18 @@ void BlockFilesystem::tryAddMountPoint(QString mountDe + } + + if(match) { ++#if __FreeBSD__ >= 13 + auto exists = [mountPoint](const auto& mountPair) { return mountPoint == mountPair.first; }; + if (ranges::any_of(mountPoints, exists)) + return; ++#else ++ for (const auto& mountPair : mountPoints) ++ { ++ if (mountPoint == mountPair.first) { ++ return; ++ } ++ } ++#endif + + mountPoints << qMakePair(mountPoint.toLocal8Bit(), 0); + diff --git a/sysutils/bsdisks/files/patch-objectmanager.cpp b/sysutils/bsdisks/files/patch-objectmanager.cpp new file mode 100644 index 00000000000..2054fd17fc3 --- /dev/null +++ b/sysutils/bsdisks/files/patch-objectmanager.cpp @@ -0,0 +1,26 @@ +--- objectmanager.cpp.orig 2024-11-10 10:48:14 UTC ++++ objectmanager.cpp +@@ -467,10 +467,23 @@ void ObjectManager::addZFSDataset(const ZFSInfo& zfsIn + + void ObjectManager::mountFS(QString mountDevice, QString mountPoint) + { ++#if __FreeBSD__ >= 13 + auto blocks = m_blockObjects.values() + | views::filter([](const auto *block) { return block->bFilesystem; }); ++#else ++ auto blocks = m_blockObjects.values(); ++#endif + for(const auto* block: blocks) ++#if __FreeBSD__ >= 13 + block->bFilesystem->tryAddMountPoint(mountDevice, mountPoint); ++#else ++ { ++ auto* bfs = block->bFilesystem; ++ if(!bfs) ++ continue; ++ block->bFilesystem->tryAddMountPoint(mountDevice, mountPoint); ++ } ++#endif + } + + void ObjectManager::unmountFS(QString mountPoint)