From 79edc5942b386de59ce645004cf3356c994f4437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=BCtzel?= Date: Fri, 21 Jun 2024 20:15:43 +0200 Subject: [PATCH] sundials: update to 7.1.0 Remove patches for changes that have been applied upstream. --- .../0002-sundials-missing-export.patch | 15 --------------- .../0003-sundials-use-default-installdirs.patch | 11 ----------- mingw-w64-sundials/PKGBUILD | 10 ++-------- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 mingw-w64-sundials/0002-sundials-missing-export.patch delete mode 100644 mingw-w64-sundials/0003-sundials-use-default-installdirs.patch diff --git a/mingw-w64-sundials/0002-sundials-missing-export.patch b/mingw-w64-sundials/0002-sundials-missing-export.patch deleted file mode 100644 index ace65a13f7ce4..0000000000000 --- a/mingw-w64-sundials/0002-sundials-missing-export.patch +++ /dev/null @@ -1,15 +0,0 @@ -Add attribute to dllexport function - -diff -urN sundials-7.0.0/include/cvodes/cvodes.h.orig sundials-7.0.0/include/cvodes/cvodes.h ---- sundials-7.0.0/include/cvodes/cvodes.h.orig 2024-03-01 18:41:17.321314600 +0100 -+++ sundials-7.0.0/include/cvodes/cvodes.h 2024-03-01 18:42:56.424206800 +0100 -@@ -579,7 +579,8 @@ - CVadjCheckPointRec* ckpnt); - - /* CVLS interface function that depends on CVRhsFn */ --int CVodeSetJacTimesRhsFnB(void* cvode_mem, int which, CVRhsFn jtimesRhsFn); -+SUNDIALS_EXPORT int CVodeSetJacTimesRhsFnB(void* cvode_mem, int which, -+ CVRhsFn jtimesRhsFn); - - /* Undocumented Optional Output Functions For Backward Problems */ - diff --git a/mingw-w64-sundials/0003-sundials-use-default-installdirs.patch b/mingw-w64-sundials/0003-sundials-use-default-installdirs.patch deleted file mode 100644 index f00d860c519fc..0000000000000 --- a/mingw-w64-sundials/0003-sundials-use-default-installdirs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sundials-5.7.0.orig/cmake/macros/SundialsAddLibrary.cmake 2021-01-29 15:14:52.000000000 -0600 -+++ sundials-5.7.0/cmake/macros/SundialsAddLibrary.cmake 2021-07-09 13:43:07.076625400 -0500 -@@ -324,7 +324,7 @@ - endif() - - # install phase -- install(TARGETS ${_actual_target_name} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT sundials-targets) -+ install(TARGETS ${_actual_target_name} EXPORT sundials-targets) - - endif() - diff --git a/mingw-w64-sundials/PKGBUILD b/mingw-w64-sundials/PKGBUILD index d87973fe17d49..779b7947aee7a 100644 --- a/mingw-w64-sundials/PKGBUILD +++ b/mingw-w64-sundials/PKGBUILD @@ -13,7 +13,7 @@ fi _realname=sundials pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=7.0.0 +pkgver=7.1.0 pkgrel=1 pkgdesc="SUite of Nonlinear and DIfferential/ALgebraic equation Solvers (mingw-w64)" arch=('any') @@ -39,12 +39,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" $([[ "$_enable_mpi" == "yes" ]] && echo "${MINGW_PACKAGE_PREFIX}-msmpi")) optdepends=("${MINGW_PACKAGE_PREFIX}-python: for running examples") source=(https://github.com/LLNL/sundials/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz - '0002-sundials-missing-export.patch' - '0003-sundials-use-default-installdirs.patch' '0008-sundials-petsc-pkg-config-module.patch') -sha256sums=('d762a7950ef4097fbe9d289f67a8fb717a0b9f90f87ed82170eb5c36c0a07989' - '6e49c44cafadfdc2f7c6f39feeb9d7a1dc1940c0b06e7bcc43075c416f012d13' - '310b9beb86426fd2f817391baf72c0f9aefe9dc31e737daed5cc0280b7693311' +sha256sums=('17f03e49fef54c89bd84a9769743fbf108c003e23ad0abc11fd4d0c0f4c74bf9' 'd4a56ef02d87d8d17970733fe8391c12fea9465f093681a1091a24b2ad0a787a') apply_patch_with_msg() { @@ -59,8 +55,6 @@ prepare() { cd "${_realname}-${pkgver}" apply_patch_with_msg \ - 0002-sundials-missing-export.patch \ - 0003-sundials-use-default-installdirs.patch \ 0008-sundials-petsc-pkg-config-module.patch }