On Sat Oct 02, 2021 at 05:11:47PM -0400, Brad Smith wrote:
> Here is an update to fmt 8.0.1.
>
OK rsadowski
>
> 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
> }
> +#endif
>
> - TEST(OutputRedirectTest, RestoreAndRead) {
> + TEST(output_redirect_test, restore_and_read) {
> file read_end, write_end;
> -@@ -388,8 +385,8 @@ TEST(OutputRedirectTest, RestoreAndRead) {
> - std::fprintf(file.get(), "[[[");
> - OutputRedirect redir(file.get());
> - std::fprintf(file.get(), "censored");
> -- EXPECT_EQ("censored", sanitize(redir.restore_and_read()));
> -- EXPECT_EQ("", sanitize(redir.restore_and_read()));
> -+ EXPECT_EQ("censored", redir.restore_and_read());
> -+ EXPECT_EQ("", redir.restore_and_read());
> - std::fprintf(file.get(), "]]]");
> - file = buffered_file();
> - EXPECT_READ(read_end, "[[[]]]");
> Index: patches/patch-test_posix-mock-test_cc
> ===================================================================
> RCS file: patches/patch-test_posix-mock-test_cc
> diff -N patches/patch-test_posix-mock-test_cc
> --- patches/patch-test_posix-mock-test_cc 2 Jan 2021 21:51:19 -0000
> 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,19 +0,0 @@
> -$OpenBSD: patch-test_posix-mock-test_cc,v 1.1.1.1 2021/01/02 21:51:19 jca
> Exp $
> -
> -Index: test/posix-mock-test.cc
> ---- test/posix-mock-test.cc.orig
> -+++ test/posix-mock-test.cc
> -@@ -194,12 +194,12 @@ int(test::fileno)(FILE* stream) {
> - # define EXPECT_EQ_POSIX(expected, actual)
> - #endif
> -
> -+#if FMT_USE_FCNTL
> - static void write_file(fmt::cstring_view filename, fmt::string_view
> content) {
> - fmt::buffered_file f(filename, "w");
> - f.print("{}", content);
> - }
> -
> --#if FMT_USE_FCNTL
> - using fmt::file;
> -
> - TEST(UtilTest, GetPageSize) {
> Index: patches/patch-test_std-format-test_cc
> ===================================================================
> RCS file: patches/patch-test_std-format-test_cc
> diff -N patches/patch-test_std-format-test_cc
> --- patches/patch-test_std-format-test_cc 2 Jan 2021 21:51:19 -0000
> 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-test_std-format-test_cc,v 1.1.1.1 2021/01/02 21:51:19 jca
> Exp $
> -
> -Index: test/std-format-test.cc
> ---- test/std-format-test.cc.orig
> -+++ test/std-format-test.cc
> -@@ -111,7 +111,7 @@ template <> struct std::formatter<S> {
> - char c = get_char();
> - if (!isdigit(c) || (++iter, get_char()) != '}')
> - throw format_error("invalid format");
> -- width_arg_id = c - '0';
> -+ width_arg_id = fmt::detail::to_unsigned(c - '0');
> - ctx.check_arg_id(width_arg_id);
> - return ++iter;
> - }
> Index: pkg/PLIST
> ===================================================================
> RCS file: /home/cvs/ports/devel/fmt/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 2 Jan 2021 21:51:19 -0000 1.1.1.1
> +++ pkg/PLIST 27 Sep 2021 00:47:39 -0000
> @@ -1,5 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.1.1.1 2021/01/02 21:51:19 jca Exp $
> include/fmt/
> +include/fmt/args.h
> include/fmt/chrono.h
> include/fmt/color.h
> include/fmt/compile.h
> @@ -9,9 +10,9 @@ include/fmt/format.h
> include/fmt/locale.h
> include/fmt/os.h
> include/fmt/ostream.h
> -include/fmt/posix.h
> include/fmt/printf.h
> include/fmt/ranges.h
> +include/fmt/xchar.h
> lib/cmake/
> lib/cmake/fmt/
> lib/cmake/fmt/fmt-config-version.cmake
>
