From 143c55546ea721f2d63f9468afd54a5d9cc3c051 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 22 Jun 2024 08:10:50 -0400 Subject: [PATCH 1/3] geant4: fix commands in /particle/property/decay/ --- packages/geant4/package.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/geant4/package.py b/packages/geant4/package.py index 0ff457d8..adf61672 100644 --- a/packages/geant4/package.py +++ b/packages/geant4/package.py @@ -9,3 +9,7 @@ class Geant4(BuiltinGeant4): ## Add to the hardcoded GEANT4 Birk's constants patch("birks.patch", when="@10.7.0:") + + ## Fix commands in /particle/property/decay/ + patch("https://github.com/Geant4/geant4/commit/e32bc92498d87fb42829b08348d7fad89bc89404.diff", + sha256="0581bd4869ab1a7459b639b63a041d01b672247e701f1106580bfce9209c47ed") From f2f171a22c997a960ec07462cc89afbe3e06a53e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 22 Jun 2024 08:20:47 -0400 Subject: [PATCH 2/3] fix incorrect merge conflict resolution --- packages/geant4/package.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/geant4/package.py b/packages/geant4/package.py index 585138d1..532bfa89 100644 --- a/packages/geant4/package.py +++ b/packages/geant4/package.py @@ -10,11 +10,8 @@ class Geant4(BuiltinGeant4): version("11.1.2.east", git="https://github.com/eic/geant4", branch="east-v11.1.2") version("11.1.1.east", git="https://github.com/eic/geant4", branch="east-v11.1.1") - ## Add to the hardcoded GEANT4 Birk's constants - patch("birks.patch", when="@10.7.0:") + patch("G4LogicalSkinSurface.patch", when="@11.2") ## Fix commands in /particle/property/decay/ patch("https://github.com/Geant4/geant4/commit/e32bc92498d87fb42829b08348d7fad89bc89404.diff", sha256="0581bd4869ab1a7459b639b63a041d01b672247e701f1106580bfce9209c47ed") - - patch("G4LogicalSkinSurface.patch", when="@11.2") \ No newline at end of file From bbb4a2ae057e0da63e95938d2f83c8848558b2be Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 22 Jun 2024 09:08:30 -0400 Subject: [PATCH 3/3] ?full_index=1 Co-authored-by: Wouter Deconinck --- packages/geant4/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/geant4/package.py b/packages/geant4/package.py index 532bfa89..524469e2 100644 --- a/packages/geant4/package.py +++ b/packages/geant4/package.py @@ -13,5 +13,5 @@ class Geant4(BuiltinGeant4): patch("G4LogicalSkinSurface.patch", when="@11.2") ## Fix commands in /particle/property/decay/ - patch("https://github.com/Geant4/geant4/commit/e32bc92498d87fb42829b08348d7fad89bc89404.diff", - sha256="0581bd4869ab1a7459b639b63a041d01b672247e701f1106580bfce9209c47ed") + patch("https://github.com/Geant4/geant4/commit/e32bc92498d87fb42829b08348d7fad89bc89404.diff?full_index=1", + sha256="a63b098f3214eaf4b5f34b3e434603b1cdbd13c919456782e933cd7422a45d99")