From e747de90cac35192f8001c37c27aba82228c6755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
 =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com>
Date: Sun, 2 Jun 2024 07:15:36 +0100
Subject: [PATCH] fortran-stdlib: update to 0.6.1 and use CMake FindBLAS

---
 .../001-using-openblas.patch                  | 31 +++++++++----------
 mingw-w64-fortran-stdlib/PKGBUILD             |  6 ++--
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/mingw-w64-fortran-stdlib/001-using-openblas.patch b/mingw-w64-fortran-stdlib/001-using-openblas.patch
index 348cffa6b4ab9..dd4232b001c4f 100644
--- a/mingw-w64-fortran-stdlib/001-using-openblas.patch
+++ b/mingw-w64-fortran-stdlib/001-using-openblas.patch
@@ -1,35 +1,32 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b10e1f7..0029d06 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -42,6 +42,17 @@ if(NOT DEFINED CMAKE_MAXIMUM_RANK)
+@@ -42,6 +42,15 @@
    set(CMAKE_MAXIMUM_RANK 4 CACHE STRING "Maximum array rank for generated procedures")
  endif()
 
-+find_package(PkgConfig)
-+pkg_check_modules(OPENBLAS openblas)
-+if(OPENBLAS_FOUND)
-+  add_compile_definitions(STDLIB_EXTERNAL_BLAS STDLIB_EXTERNAL_LAPACK)
-+  include_directories(${OPENBLAS_INCLUDE_DIRS})
-+  link_directories(${OPENBLAS_LIBRARY_DIRS})
-+  message(STATUS "Using OpenBLAS")
-+else()
-+  message(STATUS "Using intrinsic reference BLAS")
++find_package(BLAS)
++if(BLAS_FOUND)
++  add_compile_definitions(STDLIB_EXTERNAL_BLAS)
++endif()
++find_package(LAPACK)
++if(LAPACK_FOUND)
++  add_compile_definitions(STDLIB_EXTERNAL_LAPACK)
 +endif()
 +
  # --- find preprocessor
  find_program(FYPP fypp)
  if(NOT FYPP)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a031ab8..5b02669 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -114,6 +114,9 @@ set(SRC
+@@ -114,6 +114,12 @@
  )
 
  add_library(${PROJECT_NAME} ${SRC})
-+if(OPENBLAS_FOUND)
-+  target_link_libraries(${PROJECT_NAME} ${OPENBLAS_LIBRARIES})
++if(BLAS_FOUND)
++  target_link_libraries(${PROJECT_NAME} BLAS::BLAS)
++endif()
++if(LAPACK_FOUND)
++  target_link_libraries(${PROJECT_NAME} LAPACK::LAPACK)
 +endif()
 
  set_target_properties(
diff --git a/mingw-w64-fortran-stdlib/PKGBUILD b/mingw-w64-fortran-stdlib/PKGBUILD
index 5e65f1a1ebb37..ff2531671391b 100644
--- a/mingw-w64-fortran-stdlib/PKGBUILD
+++ b/mingw-w64-fortran-stdlib/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=fortran-stdlib
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.6.0
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="Fortran Standard Library (mingw-w64)"
 arch=('any')
@@ -24,8 +24,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-fc"
              "${MINGW_PACKAGE_PREFIX}-openblas")
 source=("https://github.com/fortran-lang/stdlib/archive/refs/tags/v${pkgver}/${_realname}-${pkgver}.tar.gz"
 	      "001-using-openblas.patch")
-sha256sums=('2977be7057313db88f4993a91305b2791a8529b67c6fc963d6be42d08851b53a'
-            '0e5990e04231013661cd7f6dcdca9cf8a3c6c6006542bb20ea2b92b835284519')
+sha256sums=('b46964e19e6b47ad5e63ac8a3706c4fa33504339000ca0cd0475a0cc06b0b7bd'
+            '1ec6c36684c2c37bcb3adb0d8c13f1182377365643e575e399e7076d6a79e59d')
 
 prepare() {
   cd "${srcdir}/stdlib-${pkgver}"