[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/files/, gnome-extra/cjs/

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/files/, gnome-extra/cjs/

[Sam James]

commit:     a84b2faf0da902cf21bb9722f05ecf54e032ac3a
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Sun Jun  6 06:23:28 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun  8 07:34:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a84b2faf

gnome-extra/cjs: fix failing test

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Closes: https://github.com/gentoo/gentoo/pull/21047
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cjs/cjs-5.0.0.ebuild               |  4 ++++
 gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/gnome-extra/cjs/cjs-5.0.0.ebuild b/gnome-extra/cjs/cjs-5.0.0.ebuild
index 59ef8a7d5a6..b6ffaef22ef 100644
--- a/gnome-extra/cjs/cjs-5.0.0.ebuild
+++ b/gnome-extra/cjs/cjs-5.0.0.ebuild
@@ -39,6 +39,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.0-fix-test.patch"
+)
+
 src_prepare() {
 	default
 	python_fix_shebang build

diff --git a/gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch b/gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch
new file mode 100644
index 00000000000..347ca090782
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch
@@ -0,0 +1,24 @@
+From ac2737f524b4d667a7700b8ff077cd603ee21c59 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Thu, 3 Jun 2021 05:21:51 -0400
+Subject: [PATCH] fix failing test checking for version number (#94)
+
+---
+ installed-tests/js/testSystem.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/installed-tests/js/testSystem.js b/installed-tests/js/testSystem.js
+index a4c098c0..8ae8c74a 100644
+--- a/installed-tests/js/testSystem.js
++++ b/installed-tests/js/testSystem.js
+@@ -11,8 +11,8 @@ describe('System.addressOf()', function () {
+ 
+ describe('System.version', function () {
+     it('gives a plausible number', function () {
+-        expect(System.version).not.toBeLessThan(14700);
+-        expect(System.version).toBeLessThan(50000);
++        expect(System.version).not.toBeLessThan(40802);
++        expect(System.version).toBeLessThan(60000);
+     });
+ });
+ 

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/files/, gnome-extra/cjs/

[Sam James]

commit:     0bb38e37e4773eb4f5b53d5a5ee8e4c0cc04fb9d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 21 17:18:28 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 17:18:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bb38e37

gnome-extra/cjs: fix build with meson 0.61

Just drop a patch which is going to end up reverted.

Bug: https://github.com/linuxmint/cjs/pull/100
Closes: https://bugs.gentoo.org/831754
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cjs/cjs-5.0.1.ebuild                   |  6 +--
 gnome-extra/cjs/cjs-5.2.0.ebuild                   |  6 +--
 gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch | 58 ----------------------
 3 files changed, 2 insertions(+), 68 deletions(-)

diff --git a/gnome-extra/cjs/cjs-5.0.1.ebuild b/gnome-extra/cjs/cjs-5.0.1.ebuild
index b858d01e335f..cc39b0d608f5 100644
--- a/gnome-extra/cjs/cjs-5.0.1.ebuild
+++ b/gnome-extra/cjs/cjs-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,10 +38,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}/cjs-5.0.1-meson-0.60.2.patch"
-)
-
 src_prepare() {
 	default
 	python_fix_shebang build

diff --git a/gnome-extra/cjs/cjs-5.2.0.ebuild b/gnome-extra/cjs/cjs-5.2.0.ebuild
index b51622fc3926..bf8e76b942a0 100644
--- a/gnome-extra/cjs/cjs-5.2.0.ebuild
+++ b/gnome-extra/cjs/cjs-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,10 +38,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}/cjs-5.0.1-meson-0.60.2.patch"
-)
-
 src_prepare() {
 	default
 	python_fix_shebang build

diff --git a/gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch b/gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch
deleted file mode 100644
index 1ce4eef2abb2..000000000000
--- a/gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 61823ced59db5ce7a4223ce2759f3da52d83a0de Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Sat, 27 Nov 2021 23:21:56 +0000
-Subject: [PATCH] build: disable gir install via list to pacify meson >= 0.60.2
-
-meson.build:541:0: ERROR: "install_dir" must be specified when installing a target
-installed-tests/js/meson.build:47:0: ERROR: "install_dir" must be specified when installing a target
-installed-tests/js/meson.build:66:0: ERROR: "install_dir" must be specified when installing a target
-installed-tests/js/meson.build:81:0: ERROR: "install_dir" must be specified when installing a target
----
- installed-tests/js/meson.build | 6 +++---
- meson.build                    | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
-index d3125a7c..564124f2 100644
---- a/installed-tests/js/meson.build
-+++ b/installed-tests/js/meson.build
-@@ -48,7 +48,7 @@ regress_gir = gnome.generate_gir(libregress, includes: regress_gir_includes,
-     sources: regress_sources, namespace: 'Regress', nsversion: '1.0',
-     identifier_prefix: 'Regress', symbol_prefix: 'regress_',
-     extra_args: ['--warn-all', '--warn-error'] + regress_gir_c_args,
--    install: get_option('installed_tests'), install_dir_gir: false,
-+    install: get_option('installed_tests'), install_dir_gir: [false],
-     install_dir_typelib: installed_tests_execdir)
- regress_typelib = regress_gir[1]
- 
-@@ -66,7 +66,7 @@ libwarnlib = library('warnlib', warnlib_sources,
- warnlib_gir = gnome.generate_gir(libwarnlib, includes: ['Gio-2.0'],
-     sources: warnlib_sources, namespace: 'WarnLib', nsversion: '1.0',
-     symbol_prefix: 'warnlib_', header: 'warnlib.h',
--    install: get_option('installed_tests'), install_dir_gir: false,
-+    install: get_option('installed_tests'), install_dir_gir: [false],
-     install_dir_typelib: installed_tests_execdir)
- warnlib_typelib = warnlib_gir[1]
- 
-@@ -82,7 +82,7 @@ gimarshallingtests_gir = gnome.generate_gir(libgimarshallingtests,
-     includes: ['Gio-2.0'], sources: gimarshallingtests_sources,
-     namespace: 'GIMarshallingTests', nsversion: '1.0',
-     symbol_prefix: 'gi_marshalling_tests_', extra_args: '--warn-error',
--    install: get_option('installed_tests'), install_dir_gir: false,
-+    install: get_option('installed_tests'), install_dir_gir: [false],
-     install_dir_typelib: installed_tests_execdir)
- gimarshallingtests_typelib = gimarshallingtests_gir[1]
- 
-diff --git a/meson.build b/meson.build
-index aa55addc..43ba4af1 100644
---- a/meson.build
-+++ b/meson.build
-@@ -542,7 +542,7 @@ gjs_private_gir = gnome.generate_gir(libgjs,
-     includes: ['GObject-2.0', 'Gio-2.0'], sources: libgjs_private_sources,
-     namespace: 'CjsPrivate', nsversion: '1.0', identifier_prefix: 'Gjs',
-     symbol_prefix: 'gjs_', extra_args: '--warn-error', install: true,
--    install_dir_gir: false, install_dir_typelib: pkglibdir / 'girepository-1.0')
-+    install_dir_gir: [false], install_dir_typelib: pkglibdir / 'girepository-1.0')
- gjs_private_typelib = gjs_private_gir[1]
- 
- ### Build gjs-console interpreter ##############################################

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/files/, gnome-extra/cjs/

[Sam James]

commit:     365603f75e075df14603daa916aceb3d9519f3cd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May  5 05:08:19 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May  5 05:08:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=365603f7

gnome-extra/cjs: fix build w/ clang 15

Closes: https://bugs.gentoo.org/905430
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cjs/cjs-5.6.1.ebuild              |  4 +++
 gnome-extra/cjs/files/cjs-5.6.1-clang15.patch | 50 +++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

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