public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/, gnome-extra/cjs/files/
@ 2018-04-02 20:50 Kristian Fiskerstrand
  0 siblings, 0 replies; 7+ messages in thread
From: Kristian Fiskerstrand @ 2018-04-02 20:50 UTC (permalink / raw
  To: gentoo-commits

commit:     d9a6ddd6e85de8c752389a3b49118e9ac40658cc
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 20:49:58 2018 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Mon Apr  2 20:50:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9a6ddd6

gnome-extra/cjs: Fix test failure on system.version check

Bug: https://bugs.gentoo.org/633404
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 gnome-extra/cjs/cjs-3.6.1.ebuild                   |  2 ++
 ...for-System.version-to-be-this-restrictive.patch | 25 ++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/gnome-extra/cjs/cjs-3.6.1.ebuild b/gnome-extra/cjs/cjs-3.6.1.ebuild
index d0ae7f565ac..399708932f1 100644
--- a/gnome-extra/cjs/cjs-3.6.1.ebuild
+++ b/gnome-extra/cjs/cjs-3.6.1.ebuild
@@ -36,6 +36,8 @@ RDEPEND="${RDEPEND}
 
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}/${PN}-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch" )
+
 src_prepare() {
 	eautoreconf
 	gnome2_src_prepare

diff --git a/gnome-extra/cjs/files/cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch b/gnome-extra/cjs/files/cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch
new file mode 100644
index 00000000000..40be11981ed
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch
@@ -0,0 +1,25 @@
+From 2d3e093bac41474c2adf433c2948fdc97495f4dc Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Mon, 2 Apr 2018 19:27:35 +0200
+Subject: [PATCH] No reason for System.version to be this restrictive
+
+---
+ installed-tests/js/testSystem.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/installed-tests/js/testSystem.js b/installed-tests/js/testSystem.js
+index 1211de4..d205595 100644
+--- a/installed-tests/js/testSystem.js
++++ b/installed-tests/js/testSystem.js
+@@ -12,7 +12,7 @@ describe('System.addressOf()', function () {
+ describe('System.version', function () {
+     it('gives a plausible number', function () {
+         expect(System.version).not.toBeLessThan(14700);
+-        expect(System.version).toBeLessThan(20000);
++        expect(System.version).toBeLessThan(32000);
+     });
+ });
+ 
+-- 
+2.16.1
+


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/, gnome-extra/cjs/files/
@ 2018-05-26 11:32 Mart Raudsepp
  0 siblings, 0 replies; 7+ messages in thread
From: Mart Raudsepp @ 2018-05-26 11:32 UTC (permalink / raw
  To: gentoo-commits

commit:     0b3d20f023835f5c1f7c97a27c1e54c7bc5fefc6
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 11:24:05 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat May 26 11:31:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b3d20f0

gnome-extra/cjs: remove old

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 gnome-extra/cjs/Manifest                           |  3 -
 gnome-extra/cjs/cjs-3.0.1.ebuild                   | 71 ----------------------
 gnome-extra/cjs/cjs-3.4.1.ebuild                   | 67 --------------------
 gnome-extra/cjs/cjs-3.4.4.ebuild                   | 67 --------------------
 .../cjs/files/cjs-2.4.0-disable-unittest-1.patch   | 48 ---------------
 .../cjs/files/cjs-2.4.0-disable-unittest-2.patch   | 40 ------------
 .../cjs/files/cjs-2.4.0-disable-unittest-3.patch   | 35 -----------
 7 files changed, 331 deletions(-)

diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 19cc1a015ba..c20b7157e77 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,4 +1 @@
-DIST cjs-3.0.1.tar.gz 325349 BLAKE2B 084713cb4b8b32fdcc21284af798016e6ad58bdb06b3960913c1721807d89bf55ff90e1a523fbc5cc9d456a176365770d5c75d3c25fddd38abc383f9bb9dcb3f SHA512 3980e60ca005e616be264ec5bf6cb920452eec538da266dc0645ec1c340506b864886007b371b96830efa379e8ed9dd9127dc205b45e004705fd5c181d82e538
-DIST cjs-3.4.1.tar.gz 425003 BLAKE2B 6910c6658ffeaf88e671a6fa6863aa7edc48c6f053170ca735faf4ce843146e3a2d593c37828a81e33a5ec332bdbf47167b5346e5aa06f4003993efd9e2e6b3f SHA512 aab752aa03862979374bfe883d62968efab6b9137914b7ab9fcca2025bab6a6ae536db59aaee6deeeba06d2ff8c433d7f769ae0a4c0e2542e7c9a58f723d8690
-DIST cjs-3.4.4.tar.gz 426665 BLAKE2B 18e232b446945ae296d1dcf4b4624ff10b733f023da99315ba9aeee72228e115a634eb7a31a7c6192c3d1bfb8af1cd89488a9e7fe81edfa3a729bd62061e3581 SHA512 318a1beef6f6a827266170f0c5c1cfaa8bf48908f96e0ce625aee20ddcd648ea967f09f465ed504f21f923830017d3c4a01f62bab26a1cb84181a96131058d33
 DIST cjs-3.6.1.tar.gz 426279 BLAKE2B b9d99e06b580b81178d0b4e2e3d854769357f28277500aed9f5bc2672f26ec72f584576c53d7aa6069737ae81bd0b1bf05d56d39c947de1206c506d72c8da075 SHA512 648997c76acb11885a53a73aa456989784fe5f5a12e0f349bce658c1eb3e3ce2b5c576ace488962c9b012fc85c2c3dd828f61f857cc9da7b60ee5fcdd7d25155

diff --git a/gnome-extra/cjs/cjs-3.0.1.ebuild b/gnome-extra/cjs/cjs-3.0.1.ebuild
deleted file mode 100644
index b56d402ca7a..00000000000
--- a/gnome-extra/cjs/cjs-3.0.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 pax-utils virtualx
-
-DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-lang/spidermonkey:24
-	>=dev-libs/glib-2.37.3:2
-	>=dev-libs/gobject-introspection-1.38:=
-	sys-libs/readline:0
-	virtual/libffi
-	cairo? ( x11-libs/cairo[X,glib] )
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-# Cinnamon 2.2 does not work with this release.
-RDEPEND="${RDEPEND}
-	!<gnome-extra/cinnamon-2.4
-"
-
-src_prepare() {
-	# Disable broken unittests
-	eapply "${FILESDIR}"/${PN}-2.4.0-disable-unittest-*.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	# XXX: Do NOT enable coverage, completely useless for portage installs
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		--disable-coverage \
-		$(use_with cairo) \
-		$(use_with gtk)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# installation sometimes fails in parallel
-	gnome2_src_install -j1
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${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/cjs-3.4.1.ebuild b/gnome-extra/cjs/cjs-3.4.1.ebuild
deleted file mode 100644
index 23afc9055f7..00000000000
--- a/gnome-extra/cjs/cjs-3.4.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 pax-utils virtualx
-
-DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/spidermonkey:38
-	>=dev-libs/glib-2.37.3:2
-	>=dev-libs/gobject-introspection-1.38:=
-	sys-libs/readline:0
-	virtual/libffi
-	cairo? ( x11-libs/cairo[X,glib] )
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-	sys-devel/autoconf-archive
-"
-# Cinnamon 2.2 does not work with this release.
-RDEPEND="${RDEPEND}
-	!<gnome-extra/cinnamon-2.4
-"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		$(use_with cairo) \
-		$(use_with gtk)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# installation sometimes fails in parallel
-	gnome2_src_install -j1
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${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/cjs-3.4.4.ebuild b/gnome-extra/cjs/cjs-3.4.4.ebuild
deleted file mode 100644
index 23afc9055f7..00000000000
--- a/gnome-extra/cjs/cjs-3.4.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 pax-utils virtualx
-
-DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/spidermonkey:38
-	>=dev-libs/glib-2.37.3:2
-	>=dev-libs/gobject-introspection-1.38:=
-	sys-libs/readline:0
-	virtual/libffi
-	cairo? ( x11-libs/cairo[X,glib] )
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-	sys-devel/autoconf-archive
-"
-# Cinnamon 2.2 does not work with this release.
-RDEPEND="${RDEPEND}
-	!<gnome-extra/cinnamon-2.4
-"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		$(use_with cairo) \
-		$(use_with gtk)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# installation sometimes fails in parallel
-	gnome2_src_install -j1
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${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-2.4.0-disable-unittest-1.patch b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-1.patch
deleted file mode 100644
index 5afd8929369..00000000000
--- a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 554c220e78172213e9637f9a901009b4bc964e3a Mon Sep 17 00:00:00 2001
-From: "Jasper St. Pierre" <jstpierre@mecheye.net>
-Date: Wed, 15 Jan 2014 17:00:22 -0500
-Subject: [PATCH] gjs-tests: Remove dumpstack test
-
-OK, I lied. This is the most useless test ever.
----
- test/gjs-tests.cpp | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-diff --git a/test/gjs-tests.cpp b/test/gjs-tests.cpp
-index b79b616..6cade7b 100644
---- a/test/gs-tests.cpp
-+++ b/test/gjs-tests.cpp
-@@ -163,22 +163,6 @@ gjstest_test_func_gjs_jsapi_util_string_js_string_utf8(void)
- }
- 
- static void
--gjstest_test_func_gjs_stack_dump(void)
--{
--  GjsContext *context;
--
--  /* TODO this test could be better - maybe expose dumpstack as a JS API
--   * so that we have a JS stack to dump?  At least here we're getting some
--   * coverage.
--   */
--  context = gjs_context_new();
--
--  gjs_dumpstack();
--  g_object_unref(context);
--  gjs_dumpstack();
--}
--
--static void
- gjstest_test_func_gjs_jsapi_util_error_throw(void)
- {
-     GjsUnitTestFixture fixture;
-@@ -348,7 +332,6 @@ main(int    argc,
-     g_test_add_func("/gjs/jsutil/strip_shebang/no_shebang", gjstest_test_strip_shebang_no_advance_for_no_shebang);
-     g_test_add_func("/gjs/jsutil/strip_shebang/have_shebang", gjstest_test_strip_shebang_advance_for_shebang);
-     g_test_add_func("/gjs/jsutil/strip_shebang/only_shebang", gjstest_test_strip_shebang_return_null_for_just_shebang);
--    g_test_add_func("/gjs/stack/dump", gjstest_test_func_gjs_stack_dump);
-     g_test_add_func("/util/glib/strv/concat/null", gjstest_test_func_util_glib_strv_concat_null);
-     g_test_add_func("/util/glib/strv/concat/pointers", gjstest_test_func_util_glib_strv_concat_pointers);
- 
--- 
-2.1.2
-

diff --git a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch
deleted file mode 100644
index 2490a63fea9..00000000000
--- a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 4ea9fda3f323355d10e946d19d817fe8c4e6b533 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 12 Oct 2014 21:57:11 +0200
-Subject: [PATCH 1/2] Comment broken unittests
-
----
- test/gjs-tests.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/test/gjs-tests.cpp b/test/gjs-tests.cpp
-index 6cade7b..4d6c61e 100644
---- a/test/gjs-tests.cpp
-+++ b/test/gjs-tests.cpp
-@@ -324,18 +324,18 @@ main(int    argc,
- 
-     g_test_init(&argc, &argv, NULL);
- 
--    g_test_add_func("/gjs/context/construct/destroy", gjstest_test_func_gjs_context_construct_destroy);
-+    /* g_test_add_func("/gjs/context/construct/destroy", gjstest_test_func_gjs_context_construct_destroy); */
-     g_test_add_func("/gjs/context/construct/eval", gjstest_test_func_gjs_context_construct_eval);
--    g_test_add_func("/gjs/jsapi/util/array", gjstest_test_func_gjs_jsapi_util_array);
--    g_test_add_func("/gjs/jsapi/util/error/throw", gjstest_test_func_gjs_jsapi_util_error_throw);
--    g_test_add_func("/gjs/jsapi/util/string/js/string/utf8", gjstest_test_func_gjs_jsapi_util_string_js_string_utf8);
-+    /* g_test_add_func("/gjs/jsapi/util/array", gjstest_test_func_gjs_jsapi_util_array); */
-+    /* g_test_add_func("/gjs/jsapi/util/error/throw", gjstest_test_func_gjs_jsapi_util_error_throw); */
-+    /* g_test_add_func("/gjs/jsapi/util/string/js/string/utf8", gjstest_test_func_gjs_jsapi_util_string_js_string_utf8); */
-     g_test_add_func("/gjs/jsutil/strip_shebang/no_shebang", gjstest_test_strip_shebang_no_advance_for_no_shebang);
-     g_test_add_func("/gjs/jsutil/strip_shebang/have_shebang", gjstest_test_strip_shebang_advance_for_shebang);
-     g_test_add_func("/gjs/jsutil/strip_shebang/only_shebang", gjstest_test_strip_shebang_return_null_for_just_shebang);
-     g_test_add_func("/util/glib/strv/concat/null", gjstest_test_func_util_glib_strv_concat_null);
-     g_test_add_func("/util/glib/strv/concat/pointers", gjstest_test_func_util_glib_strv_concat_pointers);
- 
--    gjs_test_add_tests_for_coverage ();
-+    /* gjs_test_add_tests_for_coverage (); */
- 
-     g_test_run();
- 
--- 
-2.1.2
-

diff --git a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch
deleted file mode 100644
index 7b2898b75cf..00000000000
--- a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From da18a2676477138693e893d3245316f987d74497 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 12 Oct 2014 21:57:45 +0200
-Subject: [PATCH 2/2] Comment broken JS unittest
-
----
- installed-tests/js/testLocale.js | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/installed-tests/js/testLocale.js b/installed-tests/js/testLocale.js
-index b086a66..0c5abb1 100644
---- a/installed-tests/js/testLocale.js
-+++ b/installed-tests/js/testLocale.js
-@@ -1,14 +1,14 @@
- // tests for JS_SetLocaleCallbacks().
- const JSUnit = imports.jsUnit;
- 
--function testToLocaleDateString() {
--    let date = new Date();
-+//function testToLocaleDateString() {
-+    //let date = new Date();
-     // %A is the weekday name, this tests locale_to_unicode
-     // we're basically just testing for a non-crash, since
-     // we'd have to run in a specific locale to have any
-     // idea about the result.
--    date.toLocaleDateString("%A");
--}
-+    //date.toLocaleDateString("%A");
-+//}
- 
- function testToLocaleLowerCase() {
-     JSUnit.assertEquals("aaa", "AAA".toLocaleLowerCase());
--- 
-2.1.2
-


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/, gnome-extra/cjs/files/
@ 2020-05-31 19:05 Matt Turner
  0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner @ 2020-05-31 19:05 UTC (permalink / raw
  To: gentoo-commits

commit:     86c5c46f091e2388b1296cd13a4c2c1765724cea
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 18:59:57 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun May 31 19:04:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86c5c46f

gnome-extra/cjs: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 gnome-extra/cjs/Manifest                           |  1 -
 gnome-extra/cjs/cjs-4.0.0-r1.ebuild                | 81 ----------------------
 ...for-System.version-to-be-this-restrictive.patch | 25 -------
 3 files changed, 107 deletions(-)

diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index d92711189f4..f2f15f9f62c 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,2 +1 @@
-DIST cjs-4.0.0.tar.gz 459595 BLAKE2B 63ed660480f87fcd57103965226b3457dc70586019c9ea7f446af86f0b18b493c315566c608f5e999f3b64765d71eb5d463053f3d859f7121c95dcc74d04016d SHA512 86baaba3721b71b266c560180ba20af43eed0d2b8fc37af0d24c7c0c36252e2af85da928b42260074f236f0bc4d4f4f28d20127021e67f23a22b042a09a3baa7
 DIST cjs-4.4.0.tar.gz 463019 BLAKE2B af276cd8f9ef0f66a6f4ab3e0072b485e33015e070bb796818907964df0696240b753f7a271bf45db788eb244e0cd1fb866f3b78798adf3ef8f9e76825fc4d74 SHA512 3b2bdc55ab572713d6b6f92978522b290819656f64fef620659065ff5673a04a0585b83a1a0248116570ac1cfee4f54acc228f355c02aa4e0a2a13b59fbafed2

diff --git a/gnome-extra/cjs/cjs-4.0.0-r1.ebuild b/gnome-extra/cjs/cjs-4.0.0-r1.ebuild
deleted file mode 100644
index 4296fe82db8..00000000000
--- a/gnome-extra/cjs/cjs-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 pax-utils virtualx
-
-DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-lang/spidermonkey:52
-	>=dev-libs/glib-2.37.3:2
-	>=dev-libs/gobject-introspection-1.38:=
-	sys-libs/readline:0=
-	virtual/libffi:0=
-	cairo? ( x11-libs/cairo[X,glib] )
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-	sys-devel/autoconf-archive
-"
-# Cinnamon 2.2 does not work with this release.
-RDEPEND="${RDEPEND}
-	!<gnome-extra/cinnamon-2.4
-"
-
-RESTRICT="test"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-	sed -ie "s/gjs-console/cjs-console/g" \
-		"${S}"/installed-tests/scripts/testCommandLine.sh \
-		"${S}"/installed-tests/scripts/testWarnings.sh || die
-
-	sed -ie "s/Gjs-WARNING/Cjs-WARNING/g" \
-		"${S}"/installed-tests/scripts/testCommandLine.sh || die
-
-	sed -ie "s/'Gjs'/'Cjs'/g" \
-		"${S}"/installed-tests/js/testExceptions.js \
-		"${S}"/installed-tests/js/testSignals.js \
-		"${S}"/installed-tests/js/testGDBus.js \
-		"${S}"/installed-tests/js/testEverythingBasic.js || die
-}
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		$(use_with cairo) \
-		$(use_with gtk)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# installation sometimes fails in parallel
-	gnome2_src_install -j1
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${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-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch b/gnome-extra/cjs/files/cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch
deleted file mode 100644
index 40be11981ed..00000000000
--- a/gnome-extra/cjs/files/cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2d3e093bac41474c2adf433c2948fdc97495f4dc Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
-Date: Mon, 2 Apr 2018 19:27:35 +0200
-Subject: [PATCH] No reason for System.version to be this restrictive
-
----
- installed-tests/js/testSystem.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/installed-tests/js/testSystem.js b/installed-tests/js/testSystem.js
-index 1211de4..d205595 100644
---- a/installed-tests/js/testSystem.js
-+++ b/installed-tests/js/testSystem.js
-@@ -12,7 +12,7 @@ describe('System.addressOf()', function () {
- describe('System.version', function () {
-     it('gives a plausible number', function () {
-         expect(System.version).not.toBeLessThan(14700);
--        expect(System.version).toBeLessThan(20000);
-+        expect(System.version).toBeLessThan(32000);
-     });
- });
- 
--- 
-2.16.1
-


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/, gnome-extra/cjs/files/
@ 2021-10-20  1:14 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2021-10-20  1:14 UTC (permalink / raw
  To: gentoo-commits

commit:     f47851ed3165774f16b09971cefeb16624e12631
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Mon Oct 18 01:43:34 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 01:11:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f47851ed

gnome-extra/cjs: Remove old

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cjs/Manifest                       |  1 -
 gnome-extra/cjs/cjs-5.0.0-r1.ebuild            | 77 --------------------------
 gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch | 24 --------
 3 files changed, 102 deletions(-)

diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 13dff339526..455a88ca7b7 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,3 +1,2 @@
 DIST cjs-4.8.2.tar.gz 600711 BLAKE2B d1506e599c05301083479df4145d3177c9cbb057d3ed260e9744994da70fe392eb2cd872dc00b1ef6269efe9442e32e16878ba975f57f1abc35851cb15e7bb97 SHA512 c607198847a3229443bbfa6906b05036295b6d7f95d3b355780b28e69382407a8f6ef5f637f411fbf2ae474c4c7c5f68f64fec6dd7a2e7f944945927f5efac91
-DIST cjs-5.0.0.tar.gz 601928 BLAKE2B b8d4e64472eefe15678fd2ebcd270161b779e5081b1f9fdff61c4410fdef601cff9bc948b423308059aa73de0b960d430711e8741c10511f758b41da8d96892f SHA512 32524de39e17ffc3e70f83188aed5d6bcb39e9ac4d4a1aa980a1f45dfc7970c103868f270775fcd290de0a6c70035b61b04dc575c6bcc1375972aaa0abdd8e59
 DIST cjs-5.0.1.tar.gz 602005 BLAKE2B 7592b5b0be8fed1efc9fe1c7baca081515b8010935e24ba0cb1e30ce78890941f5c3b2384ee3846a02c3ba5a50c6d6ce5df232f02507743cf15ac089e29d7f23 SHA512 a341e8deae33baf51ed21ea0b03484ba459d83be8689f3928acbd286ebe878719cdd6b4c576907b08b117b3c5738a11f95d0e37ae21f94ae6b88631fad5d3375

diff --git a/gnome-extra/cjs/cjs-5.0.0-r1.ebuild b/gnome-extra/cjs/cjs-5.0.0-r1.ebuild
deleted file mode 100644
index 1cd6bfb71f4..00000000000
--- a/gnome-extra/cjs/cjs-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit 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="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-lang/spidermonkey:78
-	>=dev-libs/glib-2.58.0:2
-	>=dev-libs/gobject-introspection-1.58.3:=
-	>=dev-libs/libffi-3.2.1:0=
-
-	cairo? ( x11-libs/cairo[glib,X] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="
-	${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	test? (
-		sys-apps/dbus
-
-		gtk? ( x11-libs/gtk+:3[introspection] )
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0.0-fix-test.patch"
-)
-
-src_prepare() {
-	default
-	python_fix_shebang build
-}
-
-src_configure() {
-	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-5.0.0-fix-test.patch b/gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch
deleted file mode 100644
index 347ca090782..00000000000
--- a/gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/, gnome-extra/cjs/files/
@ 2021-11-29  0:56 Mike Gilbert
  0 siblings, 0 replies; 7+ messages in thread
From: Mike Gilbert @ 2021-11-29  0:56 UTC (permalink / raw
  To: gentoo-commits

commit:     034143b2d5bb6d7e10b0dfede0bc129528f472bf
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 29 00:55:07 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Nov 29 00:55:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=034143b2

gnome-extra/cjs: backport fix for meson-0.60.2

Closes: https://bugs.gentoo.org/827482
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 gnome-extra/cjs/cjs-5.0.1.ebuild                   |  4 ++
 gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch | 58 ++++++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/gnome-extra/cjs/cjs-5.0.1.ebuild b/gnome-extra/cjs/cjs-5.0.1.ebuild
index e5929ee91601..e5de6fa9f569 100644
--- a/gnome-extra/cjs/cjs-5.0.1.ebuild
+++ b/gnome-extra/cjs/cjs-5.0.1.ebuild
@@ -39,6 +39,10 @@ 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
new file mode 100644
index 000000000000..1ce4eef2abb2
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch
@@ -0,0 +1,58 @@
+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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/, gnome-extra/cjs/files/
@ 2023-07-16 18:34 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-07-16 18:34 UTC (permalink / raw
  To: gentoo-commits

commit:     56c22b5804b1aec01473e34624237720f311fa5c
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Wed Jul  5 03:47:10 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 16 18:33:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56c22b58

gnome-extra/cjs: add 5.8.0

Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cjs/Manifest                           |  1 +
 gnome-extra/cjs/cjs-5.8.0.ebuild                   | 95 ++++++++++++++++++++++
 ...0-move_have_gtk4_to_the_appropriate_place.patch | 38 +++++++++
 3 files changed, 134 insertions(+)

diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 7475c2fec6ef..29fe45dfc6c9 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1 +1,2 @@
 DIST cjs-5.6.1.tar.gz 794907 BLAKE2B 9ec6d5ffb33a28dca96d640da7b499e81751d5889dd0caec354fdf41de7b42c8d8edd737def68c2506c94af7a69a4d3433c459da2a5884f2668f14eac22163a0 SHA512 35662d78174d428610642198d7777a2c19137cd61dce93de69011fea235b0f461a2072ff219da0f18ef36068c1e3e5c2dc88684493b900a12fc1cd0b32503ae5
+DIST cjs-5.8.0.tar.gz 877668 BLAKE2B e4c031631030c2a4221937d5ca04034163f70f21e6e5ff2d0ca15f31a7455e83ecb1f977c4c4fb9a57e58d266856f817446e53b86ee87460bedf5339e33461b6 SHA512 f43bda5810b90ceab24d096d884c65503b2d9b94f5c0a9e6082215a427df97fbec4a21ee3f2d4f22d98ac24a04af1dcd9064600ec191ccec96ae0869cc803a02

diff --git a/gnome-extra/cjs/cjs-5.8.0.ebuild b/gnome-extra/cjs/cjs-5.8.0.ebuild
new file mode 100644
index 000000000000..4a0965dcd743
--- /dev/null
+++ b/gnome-extra/cjs/cjs-5.8.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+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"
+IUSE="+cairo examples readline sysprof test"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-lang/spidermonkey:102
+	>=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}-5.8.0-move_have_gtk4_to_the_appropriate_place.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-5.8.0-move_have_gtk4_to_the_appropriate_place.patch b/gnome-extra/cjs/files/cjs-5.8.0-move_have_gtk4_to_the_appropriate_place.patch
new file mode 100644
index 000000000000..2bb80126507f
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-5.8.0-move_have_gtk4_to_the_appropriate_place.patch
@@ -0,0 +1,38 @@
+# https://gitlab.gnome.org/GNOME/gjs/-/issues/532
+# https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/830/diffs?commit_id=83683d093c157828cf7787e53a32c586ae4e85d3 
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 6db887d2250face397079b03d215bbd13f455efb..1e953ceb7695356b6e854775e5db005a9c22e053 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+ 
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+-    # FIXME: find out why GTK4 tries to acquire a message bus
+-    dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++    have_gtk4 = dependency('gtk4', required: false).found()
++
++    if have_gtk4 
++        # FIXME: find out why GTK4 tries to acquire a message bus
++        dbus_tests += 'Gtk4'
++    endif
+ endif
+ 
+ bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 3ac372a16b0bfaa364ed7422119f3e6e4af8971e..5c7703935b68c724347692ef5bf47a3edf868c61 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+ 
+ ### Tests and test setups ######################################################
+ 
+-if not get_option('skip_gtk_tests')
+-    have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+ 
+ # Note: The test program in test/ needs to be ported


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/, gnome-extra/cjs/files/
@ 2024-08-05  3:36 Eli Schwartz
  0 siblings, 0 replies; 7+ messages in thread
From: Eli Schwartz @ 2024-08-05  3:36 UTC (permalink / raw
  To: gentoo-commits

commit:     6d59fbc1943e0c4532801cf1c43d560cbce2455d
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Mon Jun 24 03:45:43 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Mon Aug  5 03:35:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d59fbc1

gnome-extra/cjs: drop 5.8.0

Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 gnome-extra/cjs/Manifest                           |  1 -
 gnome-extra/cjs/cjs-5.8.0.ebuild                   | 95 ----------------------
 ...0-move_have_gtk4_to_the_appropriate_place.patch | 38 ---------
 3 files changed, 134 deletions(-)

diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index a51b5c6877ba..3e700cf4706e 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,3 +1,2 @@
-DIST cjs-5.8.0.tar.gz 877668 BLAKE2B e4c031631030c2a4221937d5ca04034163f70f21e6e5ff2d0ca15f31a7455e83ecb1f977c4c4fb9a57e58d266856f817446e53b86ee87460bedf5339e33461b6 SHA512 f43bda5810b90ceab24d096d884c65503b2d9b94f5c0a9e6082215a427df97fbec4a21ee3f2d4f22d98ac24a04af1dcd9064600ec191ccec96ae0869cc803a02
 DIST cjs-6.0.0.tar.gz 877404 BLAKE2B 4290f0801f715aab1387da2ce0724376912db8ff3ad16fa8ad7eff03538dfc53ecbff2b7df0e70e52d16295b23ce51024da735d0e618b995fd3d3dfe297f9e26 SHA512 4cb359bf817d22a727683fd451ad6bde19aff4409e9033a97ef9cb204b3bd4c5e86421d7c01a267c3b4d42feb9b3bc5effb6fd970b3baf733242868c09536d95
 DIST cjs-6.2.0.tar.gz 874457 BLAKE2B 7b1afda55bc0b5da165a20afa7be58382b8f03f1421bde960f6a3f134d7bdb2bdd44320b0b613f4f710258379da6666383a20d92556a1172971ca8340ae6d348 SHA512 5f7ce7f1ba648db834d7703e909ef65cf369d47147ca02e90b8844c31b4360dcc0fb94bbd3265632c3de8ef2b026934dd799b94a2ff3895442a2f9fc469f53db

diff --git a/gnome-extra/cjs/cjs-5.8.0.ebuild b/gnome-extra/cjs/cjs-5.8.0.ebuild
deleted file mode 100644
index 1246cf2ca035..000000000000
--- a/gnome-extra/cjs/cjs-5.8.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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"
-IUSE="+cairo examples readline sysprof test"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-lang/spidermonkey:102
-	>=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}-5.8.0-move_have_gtk4_to_the_appropriate_place.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-5.8.0-move_have_gtk4_to_the_appropriate_place.patch b/gnome-extra/cjs/files/cjs-5.8.0-move_have_gtk4_to_the_appropriate_place.patch
deleted file mode 100644
index 2bb80126507f..000000000000
--- a/gnome-extra/cjs/files/cjs-5.8.0-move_have_gtk4_to_the_appropriate_place.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-# https://gitlab.gnome.org/GNOME/gjs/-/issues/532
-# https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/830/diffs?commit_id=83683d093c157828cf7787e53a32c586ae4e85d3 
-diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
-index 6db887d2250face397079b03d215bbd13f455efb..1e953ceb7695356b6e854775e5db005a9c22e053 100644
---- a/installed-tests/js/meson.build
-+++ b/installed-tests/js/meson.build
-@@ -203,9 +203,13 @@ endif
- # during build should be run using dbus-run-session
- 
- dbus_tests = ['GDBus']
--if have_gtk4 and not get_option('skip_gtk_tests')
--    # FIXME: find out why GTK4 tries to acquire a message bus
--    dbus_tests += 'Gtk4'
-+if not get_option('skip_gtk_tests')
-+    have_gtk4 = dependency('gtk4', required: false).found()
-+
-+    if have_gtk4 
-+        # FIXME: find out why GTK4 tries to acquire a message bus
-+        dbus_tests += 'Gtk4'
-+    endif
- endif
- 
- bus_config = files('../../test/test-bus.conf')
-diff --git a/meson.build b/meson.build
-index 3ac372a16b0bfaa364ed7422119f3e6e4af8971e..5c7703935b68c724347692ef5bf47a3edf868c61 100644
---- a/meson.build
-+++ b/meson.build
-@@ -679,10 +679,6 @@ endif
- 
- ### Tests and test setups ######################################################
- 
--if not get_option('skip_gtk_tests')
--    have_gtk4 = dependency('gtk4', required: false).found()
--endif
--
- subdir('installed-tests')
- 
- # Note: The test program in test/ needs to be ported


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-08-05  3:36 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-02 20:50 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/, gnome-extra/cjs/files/ Kristian Fiskerstrand
  -- strict thread matches above, loose matches on Subject: below --
2018-05-26 11:32 Mart Raudsepp
2020-05-31 19:05 Matt Turner
2021-10-20  1:14 Sam James
2021-11-29  0:56 Mike Gilbert
2023-07-16 18:34 Sam James
2024-08-05  3:36 Eli Schwartz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox