<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/67a11d19a905c5e39bc7ad068b34f8ec57dcb58e">https://github.com/macports/macports-ports/commit/67a11d19a905c5e39bc7ad068b34f8ec57dcb58e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 67a11d19a905c5e39bc7ad068b34f8ec57dcb58e
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Sun Mar 5 20:51:45 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> fortran-stdlib: update to current upstream, drop now unneeded patch
</span>---
lang/fortran-stdlib/Portfile | 17 +--
...r-equality-between-Fortran-and-C-logicals.patch | 119 ---------------------
2 files changed, 5 insertions(+), 131 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fortran-stdlib/Portfile b/lang/fortran-stdlib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 46045994f50..7eee74a91c4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/fortran-stdlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/fortran-stdlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,17 +7,17 @@ PortGroup compilers 1.0
</span> PortGroup github 1.0
name fortran-stdlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup fortran-lang stdlib fba31e0db6375e9207438d2815b8552dc87c6f0b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2023.02.22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup fortran-lang stdlib 91387a0f936ec7ae5f55b4a31b56a48ed828d9d9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2023.03.04
</span> revision 0
categories-append lang fortran
license MIT
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
description Fortran Standard Library
long_description {*}${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 328d76940bf758be5ba725f163d80808d97e4f7f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9e6cccccf57d44d6c095a42b0595c538da03874d96655fb7363fd304cc87611f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 373896
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 eb68688fdc1ff27d1b92c9c92b5d5e8126cc072e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5e7f5ac48e913640e409937e7ce7849ced83d457bd52654018cba6ea93fc1321 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 374789
</span> cmake.generator Ninja
set py_ver 3.11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,13 +33,6 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/test/string/test_string_assignment.f90 ${worksrcpath}/test/string/test_string_assignment.fypp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles 0001-Check-for-equality-between-Fortran-and-C-logicals.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> compilers.setup require_fortran
compiler.blacklist-append \
{*gcc-[34].*} {macports-gcc-[58]} {clang < 500}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fortran-stdlib/files/0001-Check-for-equality-between-Fortran-and-C-logicals.patch b/lang/fortran-stdlib/files/0001-Check-for-equality-between-Fortran-and-C-logicals.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 35cb389b0c0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/fortran-stdlib/files/0001-Check-for-equality-between-Fortran-and-C-logicals.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,119 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 11c9bb7c0a6743204a332b91947564c7c77843dc Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremie Vandenplas <jeremie.vandenplas@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 19 Feb 2023 13:29:34 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Check for equality between Fortran and C logicals
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 26f49a4..471ce6e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,6 +59,7 @@ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- APPEND fyppFlags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "-DWITH_CBOOL=$<BOOL:${WITH_CBOOL}>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-DWITH_QP=$<BOOL:${WITH_QP}>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-DWITH_XDP=$<BOOL:${WITH_XDP}>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-DPROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f9a5569..9938152 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/config/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/config/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,6 +16,13 @@ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" PARENT_SCOPE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check for available features
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note: users can overwrite the automatic check by setting the value at configure time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(CheckFortranSourceRuns)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if (NOT DEFINED WITH_CBOOL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ check_fortran_source_runs(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "use, intrinsic :: iso_c_binding, only: c_bool; integer, parameter :: lk = kind(.true.); if (c_bool == lk) stop 1; end"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ WITH_CBOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(WITH_CBOOL ${WITH_CBOOL} PARENT_SCOPE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (NOT DEFINED WITH_QP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_fortran_source_runs(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "if (selected_real_kind(33) == -1) stop 1; end"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/config/template.cmake b/config/template.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d01dafc..9a0b15e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/config/template.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/config/template.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @PACKAGE_INIT@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set("@PROJECT_NAME@_WITH_CBOOL" @WITH_CBOOL@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set("@PROJECT_NAME@_WITH_QP" @WITH_QP@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set("@PROJECT_NAME@_WITH_XDP" @WITH_XDP@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/common.fypp b/src/common.fypp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f94b6ec..364a8ae 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/common.fypp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/common.fypp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,6 +3,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #! Project version number
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #:set PROJECT_VERSION = "{}.{}.{}".format(PROJECT_VERSION_MAJOR, PROJECT_VERSION_MINOR, PROJECT_VERSION_PATCH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#! Support for C_BOOL logical
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#:if not defined("WITH_CBOOL")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#:set WITH_CBOOL = False
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#:endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #! Support for quadruple precision floating point numbers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #:if not defined("WITH_QP")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #:set WITH_QP = False
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,7 +58,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #:set INT_KINDS_TYPES = list(zip(INT_KINDS, INT_TYPES))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #! Logical kinds to be considered during templating
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#:set LOG_KINDS = ["lk", "c_bool"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#:set LOG_KINDS = ["lk"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#:if WITH_CBOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#:set LOG_KINDS = LOG_KINDS + ["c_bool"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#:endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #! Logical types to be considered during templating
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #:set LOG_TYPES = ["logical({})".format(k) for k in LOG_KINDS]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/test/ascii/test_ascii.f90 b/test/ascii/test_ascii.f90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2725613..5a88786 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/test/ascii/test_ascii.f90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/test/ascii/test_ascii.f90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,7 +6,7 @@ module test_ascii
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- is_digit, is_octal_digit, is_hex_digit, is_white, is_blank, &
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- is_control, is_punctuation, is_graphical, is_printable, is_ascii, &
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- to_lower, to_upper, to_title, to_sentence, reverse, LF, TAB, NUL, DEL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- use stdlib_kinds, only : int8, int16, int32, int64, lk, c_bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ use stdlib_kinds, only : int8, int16, int32, int64, lk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- implicit none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/test/string/CMakeLists.txt b/test/string/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 59ee5cf..f8e3c23 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/test/string/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/test/string/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#### Pre-process: .fpp -> .f90 via Fypp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Create a list of the files to be preprocessed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(fppFiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test_string_assignment.fypp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fypp_f90("${fyppFlags}" "${fppFiles}" outFiles)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADDTEST(string_assignment)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADDTEST(string_operator)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADDTEST(string_intrinsic)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/test/string/test_string_assignment.f90 b/test/string/test_string_assignment.fypp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/test/string/test_string_assignment.f90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/test/string/test_string_assignment.fypp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,9 +79,11 @@ contains
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- call check(error, string_type(.false.) == trim(flc))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (allocated(error)) return
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#:if WITH_CBOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- write(flc, '(g0)') .false._c_bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- call check(error, string_type(.false._c_bool) == trim(flc))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (allocated(error)) return
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#:endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- write(flc, '(g0)') .true._lk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- call check(error, string_type(.true._lk) == trim(flc))
</span></pre><pre style='margin:0'>
</pre>