git: 9f8385f9876a - main - lang/gjs: fix build with libc++ 15

From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Sun, 18 Dec 2022 17:43:51 UTC
The branch main has been updated by dim (src committer):

URL: https://cgit.FreeBSD.org/ports/commit/?id=9f8385f9876a46d8566cd655062c8ba24efac2f5

commit 9f8385f9876a46d8566cd655062c8ba24efac2f5
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2022-12-12 13:49:23 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2022-12-18 17:34:13 +0000

    lang/gjs: fix build with libc++ 15
    
    During an exp-run for llvm 15 (see bug 265425), it turned out that
    lang/gjs failed to build with clang and libc++ 15:
    
      In file included from ../test/gjs-tests.cpp:11:
      In file included from /usr/include/c++/v1/random:1689:
      In file included from /usr/include/c++/v1/__random/discrete_distribution.h:18:
      In file included from /usr/include/c++/v1/numeric:167:
      In file included from /usr/include/c++/v1/functional:515:
      In file included from /usr/include/c++/v1/__functional/boyer_moore_searcher.h:24:
      In file included from /usr/include/c++/v1/array:127:
      In file included from /usr/include/c++/v1/algorithm:1851:
      In file included from /usr/include/c++/v1/__algorithm/ranges_sample.h:13:
      In file included from /usr/include/c++/v1/__algorithm/sample.h:18:
      /usr/include/c++/v1/__random/uniform_int_distribution.h:162:5: error: static assertion failed due to requirement '__libcpp_random_is_valid_inttype<char32_t>::value': IntType must be a supported integer type
          static_assert(__libcpp_random_is_valid_inttype<_IntType>::value, "IntType must be a supported integer type");
          ^             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      ../test/gjs-tests.cpp:71:16: note: in instantiation of template class 'std::uniform_int_distribution<char32_t>' requested here
              return std::uniform_int_distribution<T>(lowest_value)(gen);
                     ^
      ../test/gjs-tests.cpp:942:30: note: in instantiation of function template specialization 'Gjs::Test::get_random_number<char32_t>' requested here
          char32_t random_char32 = get_random_number<char32_t>();
                                   ^
    
    This is because std::uniform_int_distribution is only defined for strict
    integer types, such as short, int, etc. Use
    std::uniform_int_distribution<uint32_t> instead, and cast the result
    back to a char32_t.
    
    PR:             268329
    Approved by:    portmgr (tcberner)
    MFH:            2022Q4
---
 lang/gjs/files/patch-test_gjs-tests.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lang/gjs/files/patch-test_gjs-tests.cpp b/lang/gjs/files/patch-test_gjs-tests.cpp
new file mode 100644
index 000000000000..e5287370143d
--- /dev/null
+++ b/lang/gjs/files/patch-test_gjs-tests.cpp
@@ -0,0 +1,11 @@
+--- test/gjs-tests.cpp.orig	2022-08-08 05:05:12 UTC
++++ test/gjs-tests.cpp
+@@ -939,7 +939,7 @@ static void gjstest_test_args_set_get_unset() {
+     assert_equal(arg.v_uint64, random_uint64);
+     assert_equal(gjs_arg_get<uint64_t>(&arg), random_uint64);
+ 
+-    char32_t random_char32 = get_random_number<char32_t>();
++    char32_t random_char32 = static_cast<char32_t>(get_random_number<uint32_t>());
+     gjs_arg_set(&arg, random_char32);
+     assert_equal(static_cast<char32_t>(arg.v_uint32), random_char32);
+     assert_equal(gjs_arg_get<char32_t>(&arg), random_char32);