From nobody Tue Nov 19 08:28:28 2024 X-Original-To: dev-commits-ports-main@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 4XsyLj2kdmz5dmJM; Tue, 19 Nov 2024 08:28:29 +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 4XsyLj0S0tz4VVG; Tue, 19 Nov 2024 08:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732004909; 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=IvkewggZDnI1vqowapSNmDXJ0OupyPiGo+0GSlOiKkY=; b=Ki6CqpXaQshgwTaIwJyUo1VXBDR6BnLQwoZo5oHR6PVLRqhGgXQYlMAumLANb9AY/DVNA1 90Z30l3PWN8CeJpTbe7d0tp1MfXfY/rftagXky/UqownDPT1B5tK7Libu8gqVOZk1IAxvT WpxFZgYz3zi4Z4t818h+3BFjeYFv2KcLSlvNYii2xMPsDgo+rVrRaeIsAheHV5yM3KpFKW Blel25pVrTKptY3bdtKHvMzFJuX3Dma0rUdp/SesCs+MK+xmVCNhai9mMFphoSuCqF5UNe NE5hGZdRyRAHobxTSMaN2RJ864vh4EW3iRTYFzqnu5oBnakYPLEAiBiPyHKBUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732004909; 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=IvkewggZDnI1vqowapSNmDXJ0OupyPiGo+0GSlOiKkY=; b=cYXJZ3fky4DVHgtmcgNBMG3cSD45hDJ1HHc4Htktz08TpgHeG4fXhiaeFk4MK/m8SrptVS 7dHJPgyn+iVpZaExTZekrgU9hhDsWxiGUltoXpSXs7N/rMP9YjZ/iinWmTUw0BJXmgREcF T/VqlQsJebaSrIXbmDoKF7XkhMeUO+U3gizjDNKSSPVr8iILEg8oXEfO6jjb+1qUY9GZWY W0EAi9xMh6KD6v4+qVWLkH3or4v/6vUI4u9z/0I63wLLt7+k1yikPmsdSE1xzyMXhrWpzn 4dR8Nh17MIshDHfVSpdEiWUdYhuw1dH60t/9qLFgOaZ3SdODvRySLdA8lM8lAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732004909; a=rsa-sha256; cv=none; b=BlHHtlSjiXBrInpBEtJcfE7pCHOl0CxVNQQACR/923hBew7UlFakKl9dsQaoh3fHcc/bdH 8PBiQ7Z87riMIB5pON1Svc4M+lbXuhTwvO7OXT76y5gnfSKqLf32gWOjKlfL2WprM2sE2Q taYpqHxfmmrunFCDf/1RDr0eJnmf2/59qdW9CAlLyv5P7u27Ep7AeEVcTYSOKhtymbLkqx AIkcNoAAdVIunVJ2qZ98aCmHhxE8V6/adnVnWkK82WqYrwB+hAH7ijFP+ZNtUM03V4HEHd e/7v/mkyvyJ5mXl6YUVhX14HrBz7GV2UN9wakekRF2KpguGqg5HIxP45IdW1Uw== 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 4XsyLj02spz1HHH; Tue, 19 Nov 2024 08:28:29 +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 4AJ8SS0R058504; Tue, 19 Nov 2024 08:28:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AJ8SSOt058501; Tue, 19 Nov 2024 08:28:28 GMT (envelope-from git) Date: Tue, 19 Nov 2024 08:28:28 GMT Message-Id: <202411190828.4AJ8SSOt058501@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 3f947d3a1d86 - main - science/geant4: Fix build error List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 3f947d3a1d86212efcac3e1f4a53363ad4875f5f Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f947d3a1d86212efcac3e1f4a53363ad4875f5f commit 3f947d3a1d86212efcac3e1f4a53363ad4875f5f Author: Erik Jensen AuthorDate: 2024-11-19 08:14:16 +0000 Commit: Nuno Teixeira CommitDate: 2024-11-19 08:27:12 +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 --- 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 612d95dafc2c..e2f95a5deaa8 100644 --- a/science/geant4/Makefile +++ b/science/geant4/Makefile @@ -1,7 +1,7 @@ PORTNAME= geant4 DISTVERSIONPREFIX= v DISTVERSION= 11.2.2 -PORTREVISION= 2 +PORTREVISION= 3 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)