From b3d740d88154c379c9dde5dd41b8b1e7e6015c5c4731b66c57b32b0b652d7abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Tue, 2 Jan 2024 12:25:01 +0000 Subject: [PATCH] Accepting request 1135929 from home:StefanBruens:branches:science - update to 2.21: Too many changes to list, a full list of changes is available in the included LOGFILE. - Drop upstream patches: * 0001-Use-interface-for-cubtri-callback-function.patch OBS-URL: https://build.opensuse.org/request/show/1135929 OBS-URL: https://build.opensuse.org/package/show/science/ccx?expand=0&rev=17 --- 0001-Fixup-spooles-include-dir.patch | 20 ++++- ...terface-for-cubtri-callback-function.patch | 76 ------------------- ccx-2.16-build.patch | 2 +- ccx.changes | 9 +++ ccx.spec | 5 +- ccx_2.20.src.tar.bz2 | 3 - ccx_2.20.test.tar.bz2 | 3 - ccx_2.21.src.tar.bz2 | 3 + ccx_2.21.test.tar.bz2 | 3 + 9 files changed, 37 insertions(+), 87 deletions(-) delete mode 100644 0001-Use-interface-for-cubtri-callback-function.patch delete mode 100644 ccx_2.20.src.tar.bz2 delete mode 100644 ccx_2.20.test.tar.bz2 create mode 100644 ccx_2.21.src.tar.bz2 create mode 100644 ccx_2.21.test.tar.bz2 diff --git a/0001-Fixup-spooles-include-dir.patch b/0001-Fixup-spooles-include-dir.patch index 3e99470..4a3b8c6 100644 --- a/0001-Fixup-spooles-include-dir.patch +++ b/0001-Fixup-spooles-include-dir.patch @@ -5,8 +5,9 @@ Subject: [PATCH] Fixup spooles include dir --- src/cascade.c | 6 +++--- + src/cascadefem.c | 6 +++--- src/spooles.h | 8 ++++---- - 2 files changed, 7 insertions(+), 7 deletions(-) + 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/cascade.c b/src/cascade.c index 796d5cf..c996f12 100644 @@ -24,6 +25,23 @@ index 796d5cf..c996f12 100644 +#include #endif + #include "CalculiX.h" +diff --git a/src/cascadefem.c b/src/cascadefem.c +index 308960c..578d4e3 100755 +--- a/src/cascadefem.c ++++ b/src/cascadefem.c +@@ -21,9 +21,9 @@ + #include + + #ifdef SPOOLES +-#include +-#include +-#include ++#include ++#include ++#include + #endif + #include "CalculiX.h" diff --git a/src/spooles.h b/src/spooles.h index 388f1ff..6966215 100755 diff --git a/0001-Use-interface-for-cubtri-callback-function.patch b/0001-Use-interface-for-cubtri-callback-function.patch deleted file mode 100644 index c7ff0dd..0000000 --- a/0001-Use-interface-for-cubtri-callback-function.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 0f4753160768a89677d8df14b0759a4edce9a966 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= -Date: Tue, 23 Feb 2021 12:19:31 +0100 -Subject: [PATCH] Use interface for cubtri callback function - -Non-legacy gfortran refuses to compile with an implicit interface for -the callback function. ---- - src/calcview.f | 17 +++++++++++++---- - src/cubtri.f | 9 ++++++++- - 2 files changed, 21 insertions(+), 5 deletions(-) - -diff --git a/src/calcview.f b/src/calcview.f -index 531dbc6..f138bbb 100644 ---- a/src/calcview.f -+++ b/src/calcview.f -@@ -47,12 +47,18 @@ - & xxmid,xqmax,dummy,a(3,3),b(3,3),c(3,3),ddd(3),p31(3), - & xq(3),yq(3),ftij,adview(*),auview(*),dint,dir(3), - & dirloc(3),dist(*),area(*),dd,p21(3),sidemean,r(3,3), -- & fform,pl(2,3),epsabs,epsrel,abserr,q(3,3), -+ & pl(2,3),epsabs,epsrel,abserr,q(3,3), - & rdata(21),factor,argument - ! - c real*8 vertex(3,3),vertexl(2,3),unitvec(3,3) - ! -- external fform -+ interface -+ function fform(x,y,idata,rdata) -+ real*8 :: x,y,rdata(:) -+ integer :: idata(:) -+ real*8 :: fform -+ end function fform -+ end interface - ! - nzsradv(3)=nzsrad - ! -@@ -505,10 +511,13 @@ c & (ddd(k)*ddd(l)) - ! - implicit none - ! -- integer k,l,idata(1) -+ real*8 :: x,y,rdata(:) -+ integer :: idata(:) -+! -+ integer k,l - ! - real*8 pint(3),ddd(3),xn(3),q(3,3), -- & unitvec(3,3),r(3,3),xxn,x,y,porigin(3),rdata(21) -+ & unitvec(3,3),r(3,3),xxn,porigin(3) - ! - ! retrieving common data from field rdata - ! -diff --git a/src/cubtri.f b/src/cubtri.f -index c13aa5b..fc654c7 100644 ---- a/src/cubtri.f -+++ b/src/cubtri.f -@@ -72,7 +72,14 @@ C ERROR TEST BY REMOVING THE IF STATEMENT SHORTLY AFTER STATEMENT - C NUMBER 70. - C - implicit none -- EXTERNAL F,rnderr -+ EXTERNAL rnderr -+ interface -+ real*8 function f(x,y,idata,rdata) -+ real*8 :: x,y,rdata(21) -+ integer :: idata(1) -+ end function f -+ end interface -+ - INTEGER IDATA(1), IER, MCALLS, NCALLS, NW,jkp,i,j,k,l,maxc,maxk, - & mw,nfe - REAL*8 ALFA, ANS, ANSKP, AREA, EPS, ERR, ERRMAX, H, Q1, Q2, R1,R2, --- -2.30.1 - diff --git a/ccx-2.16-build.patch b/ccx-2.16-build.patch index 0b15b28..f73ca18 100644 --- a/ccx-2.16-build.patch +++ b/ccx-2.16-build.patch @@ -30,4 +30,4 @@ index 97ce9d1..c785f62 100755 + -larpack -llapack -lblas \ -lpthread -lm -lc - ccx_2.20: $(OCCXMAIN) ccx_2.20.a $(LIBS) + ccx_2.21: $(OCCXMAIN) ccx_2.21.a $(LIBS) diff --git a/ccx.changes b/ccx.changes index 19b630c..a4de7fd 100644 --- a/ccx.changes +++ b/ccx.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jan 1 01:36:48 UTC 2024 - Stefan Brüns + +- update to 2.21: + Too many changes to list, a full list of changes is available in + the included LOGFILE. +- Drop upstream patches: + * 0001-Use-interface-for-cubtri-callback-function.patch + ------------------------------------------------------------------- Thu Sep 1 10:12:59 UTC 2022 - Stefan Brüns diff --git a/ccx.spec b/ccx.spec index 8f69d05..090a54a 100644 --- a/ccx.spec +++ b/ccx.spec @@ -1,7 +1,7 @@ # # spec file for package ccx # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: ccx -Version: 2.20 +Version: 2.21 Release: 0 Summary: An open source finite element package License: BSD-3-Clause AND GPL-2.0-only AND SUSE-Public-Domain @@ -29,7 +29,6 @@ Source2: ccx-rpmlintrc # PATCH-FIX-OPENSUSE -- pass global optflags Patch0: ccx-2.16-build.patch Patch1: 0001-Fixup-spooles-include-dir.patch -Patch2: 0001-Use-interface-for-cubtri-callback-function.patch BuildRequires: arpack-ng-devel BuildRequires: fdupes BuildRequires: gcc-fortran diff --git a/ccx_2.20.src.tar.bz2 b/ccx_2.20.src.tar.bz2 deleted file mode 100644 index 68f1460..0000000 --- a/ccx_2.20.src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63bf6ea09e7edcae93e0145b1bb0579ea7ae82e046f6075a27c8145b72761bcf -size 1499901 diff --git a/ccx_2.20.test.tar.bz2 b/ccx_2.20.test.tar.bz2 deleted file mode 100644 index c92df83..0000000 --- a/ccx_2.20.test.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79848d88dd1e51839d1aed68fb547ff12ad3202c3561c02c2f3a8ceda0f2eb82 -size 12636197 diff --git a/ccx_2.21.src.tar.bz2 b/ccx_2.21.src.tar.bz2 new file mode 100644 index 0000000..d86d969 --- /dev/null +++ b/ccx_2.21.src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52a20ef7216c6e2de75eae460539915640e3140ec4a2f631a9301e01eda605ad +size 1549216 diff --git a/ccx_2.21.test.tar.bz2 b/ccx_2.21.test.tar.bz2 new file mode 100644 index 0000000..84a3deb --- /dev/null +++ b/ccx_2.21.test.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:094a0a2ec324fc6f937a96e932b488f48f31ad8d5d1186cd14437e6dc3e599ea +size 12864846