gentoo auto-resync : 05:05:2023 - 11:30:40

3 files changed, 56 insertions, 1 deletions

diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 1de0a577653e..bb19d2411de7 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,5 +1,6 @@
+AUX cjs-5.6.1-clang15.patch 1712 BLAKE2B b3e78b3e13f34011e45b13f537860cb18329b5e5249d83f987b0803e8429bd4ebf7434d0788d7cdd458bd44e83538eacbd7c491cdbc10e663b07c17eb90f6612 SHA512 b731d86a8f76afe66dae5b49747374947e63437b40e0bccc5654bc28f00b1ea52cb14db734803c1f172bc91cc85fe0683260793407b8e0e6f482d6edd8ee0280
 DIST cjs-5.2.0.tar.gz 601982 BLAKE2B 99fe183add425e5178863aa6b0af6aa0579de0dabee72ad9bcc86e2edf0ad13093ce659ac60ed365edb33ff1eb54d54766a7e0df1a65aa64b7da34e5559297c7 SHA512 0ce5cc07be036fa9af93c7d98a179881789f883578a2034c3c28255ef9da96d32b4203fc39311eaea0bdbe5148f13920d72dd24acb717c4e60302b390097a825
 DIST cjs-5.6.1.tar.gz 794907 BLAKE2B 9ec6d5ffb33a28dca96d640da7b499e81751d5889dd0caec354fdf41de7b42c8d8edd737def68c2506c94af7a69a4d3433c459da2a5884f2668f14eac22163a0 SHA512 35662d78174d428610642198d7777a2c19137cd61dce93de69011fea235b0f461a2072ff219da0f18ef36068c1e3e5c2dc88684493b900a12fc1cd0b32503ae5
 EBUILD cjs-5.2.0.ebuild 1514 BLAKE2B d6e4b74c6144b653c2928d6f2e282e39a326a6457e210b585a097ba53f661431367111679e7d14f579c49218d467664b8f5fddd992f0acc798dc055bebbe696b SHA512 4f7a1d6182ed20eabe062c228e456db1daa5b7d94f1bfc05b1466ff21758c3540e514c8cf9c2e843f9eb363747450883abdb5640ae69f9362e2e03af25ab37fb
-EBUILD cjs-5.6.1.ebuild 2287 BLAKE2B 17cb9a403b5278cd5dba205208df5a0c0c39e58a9e1fb19edaab9a2406ccdff8d1eea8761e1428f658e29167341022447505ceadc24d2e0728d58e3a402786e6 SHA512 d89f8f2340e835bad467eff7de92529759ca89b7a26e1fdc4a7ae739e38c4df63c1d652a47aedbeccf60d768491ed68492af124edeb7ab8878a12eca7ae4b0e0
+EBUILD cjs-5.6.1.ebuild 2341 BLAKE2B 4e70e52c2aa8cdc54490a73493587ffe9be727cf7b03c06324d4f975e00879d3e415e0d79a7c5db645b7d086cedffce35d1bc0884b172b4c7a72ffb727c644f7 SHA512 a4969fdc1da52051a9a7aa6c49e7b579e091f08c4c84e5d4c0cd596478e242981045c054eb3a3380c59df254616d912ed4d6c67820fcf616ff49bcf19e3938f2
 MISC metadata.xml 608 BLAKE2B 7cc55145357fc7b4b46e1a77f19570b60f5dc6207c81efc3b92adf7d5fdb025296d4e6b8b927f193ed7bd0a929274e61c9bdddad2371ca78a497b94fdbe87737 SHA512 672923005e936fd3d08367a8db65318f63217841e6f841623d469c21ce354724f6c2cea853ecca928280b21011d6aa0e133a7830841c9fa44dd8c36402b28066
diff --git a/gnome-extra/cjs/cjs-5.6.1.ebuild b/gnome-extra/cjs/cjs-5.6.1.ebuild
index e30a52266004..25a3e01843cd 100644
--- a/gnome-extra/cjs/cjs-5.6.1.ebuild
+++ b/gnome-extra/cjs/cjs-5.6.1.ebuild
@@ -38,6 +38,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.6.1-clang15.patch
+)
+
 src_prepare() {
 	default
 	python_fix_shebang build
diff --git a/gnome-extra/cjs/files/cjs-5.6.1-clang15.patch b/gnome-extra/cjs/files/cjs-5.6.1-clang15.patch
new file mode 100644
index 000000000000..43439e6f2c2a
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-5.6.1-clang15.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/905430
+https://github.com/linuxmint/cjs/issues/115
+https://gitlab.gnome.org/GNOME/gjs/-/issues/514
+https://gitlab.gnome.org/GNOME/gjs/-/commit/9b11ed0ba70718a8b1983126563cea58658a808f
+
+From f93880c356108cfdbc8f9ebe318d18f256d7128d Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sat, 5 Nov 2022 18:01:36 -0700
+Subject: [PATCH] tests: Avoid using char type in uniform_int_distribution<T>
+ template
+
+This is undefined behaviour. GCC and pre-15.x Clang accept it, so we
+didn't notice it before.
+
+Closes: #514
+--- a/test/gjs-tests.cpp
++++ b/test/gjs-tests.cpp
+@@ -55,12 +55,30 @@ static unsigned cpp_random_seed = 0;
+ 
+ using Gjs::Test::assert_equal;
+ 
++template <typename T>
++struct is_char_helper : public std::false_type {};
++template <>
++struct is_char_helper<char> : public std::true_type {};
++template <>
++struct is_char_helper<wchar_t> : public std::true_type {};
++template <>
++struct is_char_helper<char16_t> : public std::true_type {};
++template <>
++struct is_char_helper<char32_t> : public std::true_type {};
++template <typename T>
++struct is_char : public is_char_helper<std::remove_cv_t<T>>::type {};
++template <typename T>
++inline constexpr bool is_char_v = is_char<T>::value;
++
+ template <typename T>
+ T get_random_number() {
+     std::mt19937_64 gen(cpp_random_seed);
+ 
+     if constexpr (std::is_same_v<T, bool>) {
+         return g_random_boolean();
++    } else if constexpr (is_char_v<T>) {
++        return std::char_traits<T>::to_char_type(
++            get_random_number<typename std::char_traits<T>::int_type>());
+     } else if constexpr (std::is_integral_v<T>) {
+         T lowest_value = std::numeric_limits<T>::lowest();
+ 
+-- 
+GitLab