From nobody Tue Nov 19 09:52:09 2024 X-Original-To: dev-commits-ports-branches@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 4Xt0CG1jHHz5dqrG; Tue, 19 Nov 2024 09:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xt0CF6lf8z4f1Q; Tue, 19 Nov 2024 09:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732009929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aDrOrmdiLshz+/YLv+/xWOj6hREt0mzvjZ6M83dZ0Cc=; b=by48oA+quMq+eWDbltSarJN4PRA7NEn+LZSbJ6l8ecHuexrlN5oCbYg9O1TgwKd6+pGFTF 3ntTEqOeha0w3MnirVJnwNxOtOTLwm0Ll8+FKZ157VogRpOq0ky/BhYArVa+0Mw8CnGKOa sJuUx7IdbBDtXY+NVjtGlYErI6JopK+EhKDEhiuh1NSMtmAHZ4KAF+OcXTcAG3hb67lxE8 N8uhb4ZN8TFwRjpC3xoUHRdQ2yO6JnThHrLa7pY0FijpHWmBpPfigb8B8ph4TlvxSKLvft +Et7L19nK2E2/tbLJtYoD1zYp9+IUah79P+mcTUaKs/dO4DtVTivfTzZUsaGig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732009929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aDrOrmdiLshz+/YLv+/xWOj6hREt0mzvjZ6M83dZ0Cc=; b=TXNkFxYbeBHN5x1O2JkZKbkMbq9LULL72J0fyjmmEXmdwBELrcGMSlKT1v7HL045N1TtQt i4wowRgDF+jbmihPakKFkAFxXlxi2M6KZcrPS0nBmBrbaJ/VRAl839q8RjfvfznlibLssI Ffn4hQFOzj4B2cbCci4vhSoz23aUr3dbndXtk1pNjKtFCiQsPQAAmziIeOpGQcSttnsWmx gw81NrkO94YUYOku5nrlG4N+wON4blBMEefiahpwSFoEzNLshf/YyjmAqKfb4F0XjFPorr eXD91OITST3VuPcXPuIgLTF9x710qZ0r+nJOUD346hgvuXApJqtCIibvHovdjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732009929; a=rsa-sha256; cv=none; b=O789j3I+if8zB90B48XYtk8AdPEVZNig3K9KC91YpC4ry901fA+1hwbhPCVLqNxs2fD/V/ 63UwnoNhhOhNRySfULoR5mkgpHQTvYCgXPk6jTRgGHaNLrFQYEexb/fDJQmkxSav/QpcQe 2krfirz3BfrpDdpiRsD6gkMw33c9mvUrSqz7tHE3BXId8+K1ByW2GshsbQaPm+xIkZhEpB Z0wYTOMkNtQ8Xwnn/XHiIQ0oovp8R74DAkSaKxMd+q1TFqPZTnbEXHfJUBzRVqQFxLK6P1 f7KDxmfShCXyvr+vsLXXBNJqvLoRcMm9APiQKBfmzue0nK6fskBKI65E65005A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xt0CF6N3nz1JRk; Tue, 19 Nov 2024 09:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AJ9q96r023884; Tue, 19 Nov 2024 09:52:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AJ9q97R023881; Tue, 19 Nov 2024 09:52:09 GMT (envelope-from git) Date: Tue, 19 Nov 2024 09:52:09 GMT Message-Id: <202411190952.4AJ9q97R023881@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Nuno Teixeira Subject: git: 75b54e539dd0 - 2024Q4 - science/geant4: Fix build error List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: 75b54e539dd0899bd584584aabce4f0a5f6f2a76 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=75b54e539dd0899bd584584aabce4f0a5f6f2a76 commit 75b54e539dd0899bd584584aabce4f0a5f6f2a76 Author: Erik Jensen AuthorDate: 2024-11-19 08:14:16 +0000 Commit: Nuno Teixeira CommitDate: 2024-11-19 09:51:21 +0000 science/geant4: Fix build error Apply patch to fix typo in code builded in some systems that leads to build errors. This patch unbreaks build on main amd64, i386 and armv7. See also: https://portsfallout.com/port/33546/ PR: 282761 MFH: 2024Q4 (cherry picked from commit 3f947d3a1d86212efcac3e1f4a53363ad4875f5f) --- science/geant4/Makefile | 2 +- ...h-source_externals_g4tools_include_tools_wroot_columns.icc | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/science/geant4/Makefile b/science/geant4/Makefile index 73c450d964e7..612d95dafc2c 100644 --- a/science/geant4/Makefile +++ b/science/geant4/Makefile @@ -1,7 +1,7 @@ PORTNAME= geant4 DISTVERSIONPREFIX= v DISTVERSION= 11.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science parallel devel cad MASTER_SITES= https://cern.ch/geant4-data/releases/ \ https://cern.ch/geant4-data/datasets/:data diff --git a/science/geant4/files/patch-source_externals_g4tools_include_tools_wroot_columns.icc b/science/geant4/files/patch-source_externals_g4tools_include_tools_wroot_columns.icc new file mode 100644 index 000000000000..744b361baf36 --- /dev/null +++ b/science/geant4/files/patch-source_externals_g4tools_include_tools_wroot_columns.icc @@ -0,0 +1,11 @@ +--- source/externals/g4tools/include/tools/wroot/columns.icc.orig 2024-06-28 09:15:16 UTC ++++ source/externals/g4tools/include/tools/wroot/columns.icc +@@ -399,7 +399,7 @@ + protected: + std_vector_column_ref(const std_vector_column_ref& a_from) + :icol(a_from) +- ,m_branch(a_from.m_barnch) ++ ,m_branch(a_from.m_branch) + ,m_ref(a_from.m_ref) + ,m_leaf(0) + ,m_leaf_count(0)