Re: UPDATE: fmt 8.0.1

On Sat Oct 02, 2021 at 05:11:47PM -0400, Brad Smith wrote:
> Here is an update to fmt 8.0.1.
>

Committed, Thanks

>
> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/devel/fmt/Makefile,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 Makefile
> --- Makefile 30 Jan 2021 15:37:05 -0000 1.2
> +++ Makefile 27 Sep 2021 00:51:24 -0000
> @@ -4,9 +4,9 @@ COMMENT= alternative formatting library
>
> GH_ACCOUNT= fmtlib
> GH_PROJECT= fmt
> -GH_TAGNAME= 7.1.3
> +GH_TAGNAME= 8.0.1
>
> -SHARED_LIBS= fmt 0.0
> +SHARED_LIBS= fmt 1.0
>
> CATEGORIES= devel
>
> Index: distinfo
> ===================================================================
> RCS file: /home/cvs/ports/devel/fmt/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- distinfo 2 Jan 2021 21:51:19 -0000 1.1.1.1
> +++ distinfo 27 Sep 2021 00:40:13 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (fmt-7.1.3.tar.gz) = XK5wcgQrMEPhLVPVDvQEu7dpSdrR3jaNf5k6FcjAXsw=
> -SIZE (fmt-7.1.3.tar.gz) = 770029
> +SHA256 (fmt-8.0.1.tar.gz) = sGyjEwFYxiWEjz+3QY8jUVWk04myq8OmJF+wHLDrHgE=
> +SIZE (fmt-8.0.1.tar.gz) = 805616
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: /home/cvs/ports/devel/fmt/patches/patch-CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 30 Jan 2021 15:37:05 -0000 1.1
> +++ patches/patch-CMakeLists_txt 27 Sep 2021 00:41:43 -0000
> @@ -7,15 +7,15 @@ over LDFLAGS.
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -59,6 +59,7 @@ set_verbose(FMT_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CA
> +@@ -72,6 +72,7 @@ set_verbose(FMT_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CA
> option(FMT_PEDANTIC "Enable extra warnings and expensive tests." OFF)
> option(FMT_WERROR "Halt the compilation with an error on compiler warnings."
> OFF)
> +option(AS_NEEDED "Use -Wl,--as-needed for linking." ON)
>
> # Options that control generation of various targets.
> - option(FMT_DOC "Generate the doc target." ${MASTER_PROJECT})
> -@@ -233,7 +234,7 @@ endif ()
> + option(FMT_DOC "Generate the doc target." ${FMT_MASTER_PROJECT})
> +@@ -281,7 +282,7 @@ endif ()
>
> if (BUILD_SHARED_LIBS)
> if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" AND
> Index: patches/patch-test_gtest-extra-test_cc
> ===================================================================
> RCS file: /home/cvs/ports/devel/fmt/patches/patch-test_gtest-extra-test_cc,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-test_gtest-extra-test_cc
> --- patches/patch-test_gtest-extra-test_cc 2 Jan 2021 21:51:19 -0000 1.1.1.1
> +++ patches/patch-test_gtest-extra-test_cc 27 Sep 2021 00:58:13 -0000
> @@ -3,22 +3,7 @@ $OpenBSD: patch-test_gtest-extra-test_cc
> Index: test/gtest-extra-test.cc
> --- test/gtest-extra-test.cc.orig
> +++ test/gtest-extra-test.cc
> -@@ -22,14 +22,6 @@
> -
> - namespace {
> -
> --// This is used to suppress coverity warnings about untrusted values.
> --std::string sanitize(const std::string& s) {
> -- std::string result;
> -- for (std::string::const_iterator i = s.begin(), end = s.end(); i != end; ++i)
> -- result.push_back(static_cast<char>(*i & 0xff));
> -- return result;
> --}
> --
> - // Tests that assertion macros evaluate their arguments exactly once.
> - class SingleEvaluationTest : public ::testing::Test {
> - protected:
> -@@ -369,6 +361,10 @@ TEST(OutputRedirectTest, FlushErrorInCtor) {
> +@@ -345,6 +345,10 @@ TEST(output_redirect_test, flush_error_in_ctor) {
> write_copy.dup2(write_fd); // "undo" close or dtor will fail
> }
>
> @@ -26,25 +11,14 @@ Index: test/gtest-extra-test.cc
> +// NOTE(fagg): There's some bug in this test. Can't find it.
> +// Upstream suggests it doesn't matter so lets leave this compiled
> +// out for now while i work on figuring it out.
> - TEST(OutputRedirectTest, DupErrorInCtor) {
> + TEST(output_redirect_test, dup_error_in_ctor) {
> buffered_file f = open_buffered_file();
> int fd = (f.fileno)();
> -@@ -380,6 +376,7 @@ TEST(OutputRedirectTest, DupErrorInCtor) {
> +@@ -356,6 +360,7 @@ TEST(output_redirect_test, dup_error_in_ctor) {
> fmt::format("cannot duplicate file descriptor {}", fd));
> copy.dup2(fd); // "undo" close or dtor will fail
> }
> +