From afa35ba031bb8f966d0bd52c42a62bbfbdc112cf Mon Sep 17 00:00:00 2001 From: Leon Kos Date: Wed, 27 Dec 2023 15:24:10 +0100 Subject: [PATCH] Update patches with backport PR and commit references --- .../easyconfigs/e/Elmer/Elmer-9.0-DCRComplexSolve.patch | 3 +++ easybuild/easyconfigs/e/Elmer/Elmer-9.0-Qwt-6.2-Fix.patch | 2 ++ easybuild/easyconfigs/e/Elmer/Elmer-9.0-foss-2022b.eb | 6 +++--- .../easyconfigs/e/Elmer/Elmer-9.0-renderarea-Qt5.patch | 3 +++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/e/Elmer/Elmer-9.0-DCRComplexSolve.patch b/easybuild/easyconfigs/e/Elmer/Elmer-9.0-DCRComplexSolve.patch index 744941d4d92..e2823334326 100644 --- a/easybuild/easyconfigs/e/Elmer/Elmer-9.0-DCRComplexSolve.patch +++ b/easybuild/easyconfigs/e/Elmer/Elmer-9.0-DCRComplexSolve.patch @@ -1,4 +1,7 @@ Backport to 9.0 to allow compile with foss/2022b compiler. +See history of https://github.com/ElmerCSC/elmerfem/commits/devel/fem/src/modules/DCRComplexSolve.F90 +and commit "Try to fix some strange compile errors appearing after all these years in DCRComplexSolve.F90" +https://github.com/ElmerCSC/elmerfem/commit/54fd87054f687305644b92d0525a3f0cd4423a93 --- fem/src/modules/DCRComplexSolve.F90.orig 2023-12-15 10:28:53.729618181 +0100 +++ fem/src/modules/DCRComplexSolve.F90 2023-12-15 10:28:58.846691361 +0100 @@ -205,7 +205,7 @@ diff --git a/easybuild/easyconfigs/e/Elmer/Elmer-9.0-Qwt-6.2-Fix.patch b/easybuild/easyconfigs/e/Elmer/Elmer-9.0-Qwt-6.2-Fix.patch index 4ab1d529f29..74e7c145848 100644 --- a/easybuild/easyconfigs/e/Elmer/Elmer-9.0-Qwt-6.2-Fix.patch +++ b/easybuild/easyconfigs/e/Elmer/Elmer-9.0-Qwt-6.2-Fix.patch @@ -1,4 +1,6 @@ Fix for recent Qwt +See PR https://github.com/ElmerCSC/elmerfem/pull/294 ( Compatibility with Qwt 6.2. Fix for #293 #294 ) +and commit https://github.com/ElmerCSC/elmerfem/commit/48e9430ccb858ca5bda28b967a0c84b51e2404b2 --- ElmerGUI/Application/src/convergenceview.h.orig 2020-11-10 20:52:44.000000000 +0100 +++ ElmerGUI/Application/src/convergenceview.h 2023-12-15 11:13:53.627242099 +0100 @@ -51,8 +51,8 @@ diff --git a/easybuild/easyconfigs/e/Elmer/Elmer-9.0-foss-2022b.eb b/easybuild/easyconfigs/e/Elmer/Elmer-9.0-foss-2022b.eb index 041ad527bbd..f477fdf3c2b 100644 --- a/easybuild/easyconfigs/e/Elmer/Elmer-9.0-foss-2022b.eb +++ b/easybuild/easyconfigs/e/Elmer/Elmer-9.0-foss-2022b.eb @@ -17,9 +17,9 @@ sources = ['release-%(version)s.tar.gz'] patches = ['Elmer-9.0-DCRComplexSolve.patch', 'Elmer-9.0-Qwt-6.2-Fix.patch', 'Elmer-9.0-renderarea-Qt5.patch'] checksums = [ {'release-9.0.tar.gz': '08c5bf261e87ff37456c1aa0372db3c83efabe4473ea3ea0b8ec66f5944d1aa0'}, - {'Elmer-9.0-DCRComplexSolve.patch': '360d39251cd09423e4caa7cd7b150817fa17724c5eabc00b5427b113de9e4708'}, - {'Elmer-9.0-Qwt-6.2-Fix.patch': '9abf73537ee1053bd3e49c55fa19b83043ba51fb4a4176600964da0b5cd5a9ca'}, - {'Elmer-9.0-renderarea-Qt5.patch': '745b98335b5ba43bef7a4ee7123b00bdb4f784c875d138a16dea1d0797567cd9'}, + {'Elmer-9.0-DCRComplexSolve.patch': '456e9b255c4cebffd04c1243001a284fcdbda27cb586640f3f852c67511881eb'}, + {'Elmer-9.0-Qwt-6.2-Fix.patch': 'c21b83364e08d2cd8bf3f2d62dfd16ed4f9bc478b8808cf36ecffa5174247b32'}, + {'Elmer-9.0-renderarea-Qt5.patch': '66c185f4e15ce738b85887b138258e70d94d7ae786e52b863624a4b538761639'}, ] builddependencies = [ diff --git a/easybuild/easyconfigs/e/Elmer/Elmer-9.0-renderarea-Qt5.patch b/easybuild/easyconfigs/e/Elmer/Elmer-9.0-renderarea-Qt5.patch index e91976f2ceb..643e538daac 100644 --- a/easybuild/easyconfigs/e/Elmer/Elmer-9.0-renderarea-Qt5.patch +++ b/easybuild/easyconfigs/e/Elmer/Elmer-9.0-renderarea-Qt5.patch @@ -1,4 +1,7 @@ Fix for recent Qt5 +See https://github.com/ElmerCSC/elmerfem/issues/233 +and https://github.com/ElmerCSC/elmerfem/commit/e057b0d46a6d1708a0d322bc73d70594a63de447 +history for https://github.com/ElmerCSC/elmerfem/commits/devel/ElmerGUI/Application/twod/renderarea.cpp --- ElmerGUI/Application/twod/renderarea.cpp.orig 2020-11-10 20:52:44.000000000 +0100 +++ ElmerGUI/Application/twod/renderarea.cpp 2023-12-15 11:43:20.493498704 +0100 @@ -38,6 +38,7 @@