* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/files/, gnome-extra/cjs/
@ 2021-06-08 7:34 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-06-08 7:34 UTC (permalink / raw
To: gentoo-commits
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>
| 4 ++++
| 24 ++++++++++++++++++++++++
2 files changed, 28 insertions(+)
--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
--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);
+ });
+ });
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/files/, gnome-extra/cjs/
@ 2022-01-21 17:19 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-01-21 17:19 UTC (permalink / raw
To: gentoo-commits
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>
| 6 +--
| 6 +--
| 58 ----------------------
3 files changed, 2 insertions(+), 68 deletions(-)
--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
--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 ##############################################
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/files/, gnome-extra/cjs/
@ 2023-05-05 5:08 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-05-05 5:08 UTC (permalink / raw
To: gentoo-commits
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>
| 4 +++
| 50 +++++++++++++++++++++++++++
2 files changed, 54 insertions(+)
--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
--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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/files/, gnome-extra/cjs/
@ 2024-12-24 5:00 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-12-24 5:00 UTC (permalink / raw
To: gentoo-commits
commit: 2ec4a13ef6a5ea2ccb08d128a5c575c08f6f03bd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 24 04:59:37 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 04:59:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ec4a13e
gnome-extra/cjs: fix build w/ newer glib
Closes: https://bugs.gentoo.org/946055
Signed-off-by: Sam James <sam <AT> gentoo.org>
| 4 +
| 103 +++++++++++++++++++++
2 files changed, 107 insertions(+)
--git a/gnome-extra/cjs/cjs-6.2.0.ebuild b/gnome-extra/cjs/cjs-6.2.0.ebuild
index d3f71d0fde95..84138b961eaf 100644
--- a/gnome-extra/cjs/cjs-6.2.0.ebuild
+++ b/gnome-extra/cjs/cjs-6.2.0.ebuild
@@ -41,6 +41,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.2.0-glib-closure.patch
+)
+
src_prepare() {
default
python_fix_shebang build
--git a/gnome-extra/cjs/files/cjs-6.2.0-glib-closure.patch b/gnome-extra/cjs/files/cjs-6.2.0-glib-closure.patch
new file mode 100644
index 000000000000..300e01ea477f
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-6.2.0-glib-closure.patch
@@ -0,0 +1,103 @@
+https://bugs.gentoo.org/946055
+https://github.com/linuxmint/cjs/commit/a4d0b0241582fdc5357a6bfc2b0ef2e05fea4893
+
+From a4d0b0241582fdc5357a6bfc2b0ef2e05fea4893 Mon Sep 17 00:00:00 2001
+From: Rick Calixte <10281587+rcalixte@users.noreply.github.com>
+Date: Mon, 18 Nov 2024 13:16:15 -0500
+Subject: [PATCH] gjs-util: Backport private closure annotations patch (#126)
+
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sat, 27 Jul 2024 20:17:39 -0700
+Subject: GjsPrivate: Fix closure annotations
+
+Apparently the closure annotation can be omitted if the parameter is named
+user_data. If it is needed because the parameter is not named
+user_data then the annotation should be on the callback argument and
+refer to the user data argument.
+
+Ref:
+https://gitlab.gnome.org/GNOME/gjs/-/commit/1df5d72d8df383199dcd88cd1d16209617bf32ca
+
+Co-authored-by: Fabio Fantoni <fantonifabio@tiscali.it>
+--- a/libgjs-private/gjs-util.c
++++ b/libgjs-private/gjs-util.c
+@@ -235,7 +235,7 @@ void gjs_gtk_container_child_set_property(GObject* container, GObject* child,
+ * @store: a #GListStore
+ * @item: the new item
+ * @compare_func: (scope call): pairwise comparison function for sorting
+- * @user_data: (closure): user data for @compare_func
++ * @user_data: user data for @compare_func
+ *
+ * Inserts @item into @store at a position to be determined by the
+ * @compare_func.
+@@ -258,7 +258,7 @@ unsigned int gjs_list_store_insert_sorted(GListStore *store, GObject *item,
+ * gjs_list_store_sort:
+ * @store: a #GListStore
+ * @compare_func: (scope call): pairwise comparison function for sorting
+- * @user_data: (closure): user data for @compare_func
++ * @user_data: user data for @compare_func
+ *
+ * Sort the items in @store according to @compare_func.
+ */
+@@ -270,7 +270,7 @@ void gjs_list_store_sort(GListStore *store, GjsCompareDataFunc compare_func,
+ /**
+ * gjs_gtk_custom_sorter_new:
+ * @sort_func: (nullable) (scope call): function to sort items
+- * @user_data: (closure): user data for @compare_func
++ * @user_data: user data for @sort_func
+ * @destroy: destroy notify for @user_data
+ *
+ * Creates a new `GtkSorter` that works by calling @sort_func to compare items.
+@@ -305,7 +305,7 @@ GObject* gjs_gtk_custom_sorter_new(GjsCompareDataFunc sort_func,
+ * gjs_gtk_custom_sorter_set_sort_func:
+ * @sorter: a `GtkCustomSorter`
+ * @sort_func: (nullable) (scope call): function to sort items
+- * @user_data: (closure): user data to pass to @sort_func
++ * @user_data: user data to pass to @sort_func
+ * @destroy: destroy notify for @user_data
+ *
+ * Sets (or unsets) the function used for sorting items.
+@@ -423,7 +423,7 @@ void gjs_log_set_writer_default() {
+ /**
+ * gjs_log_set_writer_func:
+ * @func: (scope notified): callback with log data
+- * @user_data: (closure): user data for @func
++ * @user_data: user data for @func
+ * @user_data_free: (destroy user_data_free): destroy for @user_data
+ *
+ * Sets a given function as the writer function for structured logging,
+--- a/libgjs-private/gjs-util.h
++++ b/libgjs-private/gjs-util.h
+@@ -124,11 +124,11 @@ typedef gboolean (*GjsBindingTransformFunc)(GBinding* binding,
+ * @target:
+ * @target_property:
+ * @flags:
+- * @to_callback: (scope notified) (nullable):
+- * @to_data: (closure to_callback):
++ * @to_callback: (scope notified) (nullable) (closure to_data):
++ * @to_data:
+ * @to_notify: (destroy to_data):
+- * @from_callback: (scope notified) (nullable):
+- * @from_data: (closure from_callback):
++ * @from_callback: (scope notified) (nullable) (closure from_data):
++ * @from_data:
+ * @from_notify: (destroy from_data):
+ *
+ * Returns: (transfer none):
+@@ -149,11 +149,11 @@ GBinding* gjs_g_object_bind_property_full(
+ * @target:
+ * @target_property:
+ * @flags:
+- * @to_callback: (scope notified) (nullable):
+- * @to_data: (closure to_callback):
++ * @to_callback: (scope notified) (nullable) (closure to_data):
++ * @to_data:
+ * @to_notify: (destroy to_data):
+- * @from_callback: (scope notified) (nullable):
+- * @from_data: (closure from_callback):
++ * @from_callback: (scope notified) (nullable) (closure from_data):
++ * @from_data:
+ * @from_notify: (destroy from_data):
+ */
+ GJS_EXPORT
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/files/, gnome-extra/cjs/
@ 2025-10-05 3:21 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2025-10-05 3:21 UTC (permalink / raw
To: gentoo-commits
commit: 35645dbbb88d03361e34b337165a8feefca44f85
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Wed Sep 17 04:57:57 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 5 03:16:38 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35645dbb
gnome-extra/cjs: drop 6.2.0
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Part-of: https://github.com/gentoo/gentoo/pull/43832
Signed-off-by: Sam James <sam <AT> gentoo.org>
| 1 -
| 95 -------------------
| 103 ---------------------
3 files changed, 199 deletions(-)
--git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 37c99302d002..139b3a9f0b68 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,3 +1,2 @@
DIST cjs-128.0.tar.gz 981542 BLAKE2B d4b516a8d02fcb297f23f277d8ac12f7cf3c8bf0eec41d22e01ea4ffd3995aedc1b20a173d44c3fc6827e4cb3366c277347fcd11e6362a66d682c47919f84fec SHA512 e7ad28a085788f05bc40dd8a86799c068e54e25d7ed349a610a8935c9de3bc556b72e4b7b2c158f84a4a62a4b10789a3b812ca9e3ae2b3e1b1db471e91ddee97
-DIST cjs-6.2.0.tar.gz 874457 BLAKE2B 7b1afda55bc0b5da165a20afa7be58382b8f03f1421bde960f6a3f134d7bdb2bdd44320b0b613f4f710258379da6666383a20d92556a1172971ca8340ae6d348 SHA512 5f7ce7f1ba648db834d7703e909ef65cf369d47147ca02e90b8844c31b4360dcc0fb94bbd3265632c3de8ef2b026934dd799b94a2ff3895442a2f9fc469f53db
DIST cjs-6.4.0.tar.gz 874506 BLAKE2B 7cedfa8c9c3b53b417cbe6cebc335cb9ca056c6d98cb6c0abc03db5da678f275ff73b867b4c85289797c4701fe1f4dc10aa257eaa55b97824d9e4bebe61eadeb SHA512 525f19f7a5fba642b9d98ca29406d6663ca029d0f92d177bb10ffb68f03843085b86dfc623ef49ceada01dacb64e03742f16e9d7e2fb86a3cc67c25b6de4a616
diff --git a/gnome-extra/cjs/cjs-6.2.0.ebuild b/gnome-extra/cjs/cjs-6.2.0.ebuild
deleted file mode 100644
index 946533a1647c..000000000000
--- a/gnome-extra/cjs/cjs-6.2.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..14} )
-
-inherit flag-o-matic meson pax-utils python-any-r1 virtualx
-
-DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cjs"
-SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD CC0-1.0 MIT MPL-2.0 || ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="+cairo examples readline sysprof test"
-
-RDEPEND="
- dev-lang/spidermonkey:115
- >=dev-libs/glib-2.66.0:2
- >=dev-libs/gobject-introspection-1.71.0:=
- >=dev-libs/libffi-3.3:0=
-
- cairo? (
- x11-libs/cairo[glib,svg(+),X]
- x11-libs/libX11
- )
- readline? ( sys-libs/readline:0= )
-"
-DEPEND="
- ${RDEPEND}
- sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
- test? (
- sys-apps/dbus
- x11-libs/gtk+:3[introspection]
- )
-"
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.2.0-glib-closure.patch
-)
-
-src_prepare() {
- default
- python_fix_shebang build
-}
-
-src_configure() {
- append-cppflags -DG_DISABLE_CAST_CHECKS
-
- # On musl, it's required that either gjs, pixman or gnome-shell to be built
- # with a larger stack otherwise librsvg fails to render a particular SVG, as
- # a result we fail to get gdm or gnome-shell running (greeted with a fail
- # whale screen). The bug has been reported to librsvg. This is ideally just
- # a temporary workaround until we understand what exactly needs a larger
- # stack size, as it's not sufficient to do just librsvg.
- #
- # Please refer to:
- # https://gitlab.gnome.org/GNOME/librsvg/-/issues/686
- # https://gitlab.gnome.org/GNOME/librsvg/-/issues/874
- #
- # TODO: Find an actual fix instead of increasing the stack
- use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
- local emesonargs=(
- $(meson_feature cairo)
- $(meson_feature readline)
- $(meson_feature sysprof profiler)
- -Dinstalled_tests=false
- $(meson_use !test skip_dbus_tests)
- $(meson_use !test skip_gtk_tests)
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}
-
-src_install() {
- meson_src_install
-
- if use examples; then
- docinto examples
- dodoc "${S}"/examples/*
- fi
-
- # Required for cjs-console to run correctly on PaX systems
- pax-mark mr "${ED}/usr/bin/cjs-console"
-}
diff --git a/gnome-extra/cjs/files/cjs-6.2.0-glib-closure.patch b/gnome-extra/cjs/files/cjs-6.2.0-glib-closure.patch
deleted file mode 100644
index 300e01ea477f..000000000000
--- a/gnome-extra/cjs/files/cjs-6.2.0-glib-closure.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-https://bugs.gentoo.org/946055
-https://github.com/linuxmint/cjs/commit/a4d0b0241582fdc5357a6bfc2b0ef2e05fea4893
-
-From a4d0b0241582fdc5357a6bfc2b0ef2e05fea4893 Mon Sep 17 00:00:00 2001
-From: Rick Calixte <10281587+rcalixte@users.noreply.github.com>
-Date: Mon, 18 Nov 2024 13:16:15 -0500
-Subject: [PATCH] gjs-util: Backport private closure annotations patch (#126)
-
-From: Philip Chimento <philip.chimento@gmail.com>
-Date: Sat, 27 Jul 2024 20:17:39 -0700
-Subject: GjsPrivate: Fix closure annotations
-
-Apparently the closure annotation can be omitted if the parameter is named
-user_data. If it is needed because the parameter is not named
-user_data then the annotation should be on the callback argument and
-refer to the user data argument.
-
-Ref:
-https://gitlab.gnome.org/GNOME/gjs/-/commit/1df5d72d8df383199dcd88cd1d16209617bf32ca
-
-Co-authored-by: Fabio Fantoni <fantonifabio@tiscali.it>
---- a/libgjs-private/gjs-util.c
-+++ b/libgjs-private/gjs-util.c
-@@ -235,7 +235,7 @@ void gjs_gtk_container_child_set_property(GObject* container, GObject* child,
- * @store: a #GListStore
- * @item: the new item
- * @compare_func: (scope call): pairwise comparison function for sorting
-- * @user_data: (closure): user data for @compare_func
-+ * @user_data: user data for @compare_func
- *
- * Inserts @item into @store at a position to be determined by the
- * @compare_func.
-@@ -258,7 +258,7 @@ unsigned int gjs_list_store_insert_sorted(GListStore *store, GObject *item,
- * gjs_list_store_sort:
- * @store: a #GListStore
- * @compare_func: (scope call): pairwise comparison function for sorting
-- * @user_data: (closure): user data for @compare_func
-+ * @user_data: user data for @compare_func
- *
- * Sort the items in @store according to @compare_func.
- */
-@@ -270,7 +270,7 @@ void gjs_list_store_sort(GListStore *store, GjsCompareDataFunc compare_func,
- /**
- * gjs_gtk_custom_sorter_new:
- * @sort_func: (nullable) (scope call): function to sort items
-- * @user_data: (closure): user data for @compare_func
-+ * @user_data: user data for @sort_func
- * @destroy: destroy notify for @user_data
- *
- * Creates a new `GtkSorter` that works by calling @sort_func to compare items.
-@@ -305,7 +305,7 @@ GObject* gjs_gtk_custom_sorter_new(GjsCompareDataFunc sort_func,
- * gjs_gtk_custom_sorter_set_sort_func:
- * @sorter: a `GtkCustomSorter`
- * @sort_func: (nullable) (scope call): function to sort items
-- * @user_data: (closure): user data to pass to @sort_func
-+ * @user_data: user data to pass to @sort_func
- * @destroy: destroy notify for @user_data
- *
- * Sets (or unsets) the function used for sorting items.
-@@ -423,7 +423,7 @@ void gjs_log_set_writer_default() {
- /**
- * gjs_log_set_writer_func:
- * @func: (scope notified): callback with log data
-- * @user_data: (closure): user data for @func
-+ * @user_data: user data for @func
- * @user_data_free: (destroy user_data_free): destroy for @user_data
- *
- * Sets a given function as the writer function for structured logging,
---- a/libgjs-private/gjs-util.h
-+++ b/libgjs-private/gjs-util.h
-@@ -124,11 +124,11 @@ typedef gboolean (*GjsBindingTransformFunc)(GBinding* binding,
- * @target:
- * @target_property:
- * @flags:
-- * @to_callback: (scope notified) (nullable):
-- * @to_data: (closure to_callback):
-+ * @to_callback: (scope notified) (nullable) (closure to_data):
-+ * @to_data:
- * @to_notify: (destroy to_data):
-- * @from_callback: (scope notified) (nullable):
-- * @from_data: (closure from_callback):
-+ * @from_callback: (scope notified) (nullable) (closure from_data):
-+ * @from_data:
- * @from_notify: (destroy from_data):
- *
- * Returns: (transfer none):
-@@ -149,11 +149,11 @@ GBinding* gjs_g_object_bind_property_full(
- * @target:
- * @target_property:
- * @flags:
-- * @to_callback: (scope notified) (nullable):
-- * @to_data: (closure to_callback):
-+ * @to_callback: (scope notified) (nullable) (closure to_data):
-+ * @to_data:
- * @to_notify: (destroy to_data):
-- * @from_callback: (scope notified) (nullable):
-- * @from_data: (closure from_callback):
-+ * @from_callback: (scope notified) (nullable) (closure from_data):
-+ * @from_data:
- * @from_notify: (destroy from_data):
- */
- GJS_EXPORT
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-10-05 3:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-21 17:19 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/files/, gnome-extra/cjs/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-10-05 3:21 Sam James
2024-12-24 5:00 Sam James
2023-05-05 5:08 Sam James
2021-06-08 7:34 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox