summaryrefslogtreecommitdiff
path: root/gnome-extra/cjs
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-extra/cjs')
-rw-r--r--gnome-extra/cjs/Manifest6
-rw-r--r--gnome-extra/cjs/cjs-4.4.0.ebuild80
-rw-r--r--gnome-extra/cjs/cjs-4.6.0.ebuild74
-rw-r--r--gnome-extra/cjs/cjs-4.8.1.ebuild72
-rw-r--r--gnome-extra/cjs/metadata.xml2
5 files changed, 77 insertions, 157 deletions
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index f7c04bf99e58..abeb265c4bb1 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,2 +1,4 @@
-DIST cjs-4.4.0.tar.gz 463019 BLAKE2B af276cd8f9ef0f66a6f4ab3e0072b485e33015e070bb796818907964df0696240b753f7a271bf45db788eb244e0cd1fb866f3b78798adf3ef8f9e76825fc4d74 SHA512 3b2bdc55ab572713d6b6f92978522b290819656f64fef620659065ff5673a04a0585b83a1a0248116570ac1cfee4f54acc228f355c02aa4e0a2a13b59fbafed2
-DIST cjs-4.6.0.tar.gz 463060 BLAKE2B 466f807539ea95eece8b468287582f2c085ce86a63cf37ed1489f6ed20c98dfcb7028c7679102526009b71aba7d737f6f56c9544bc926fbf5a0be540afeaee53 SHA512 b7b457b43b756918670c9acc1064fc5b424d7bb7ab826ec207595c98159f407411ceb6d3043d305570f21f7675e1b699d7e95466688835034e178e079e118dfe
+DIST cjs-4.8.1-rebase-on-1.66.1.patch 17811 BLAKE2B b48aa6895b70e9ccaef143abc7a1c4eef16bcb87f73669041a41942d4f192d12aea96c132a6c6cee337f6daecf1ae1caa0ebeec90197b8fcf2bff2ae44610c89 SHA512 40aa2c70d591c8b8e56b0e6679d9bbaa5db937c9c5cf8bd00346716d10e12b89cf8a1174da61a320c47e347f69a3c7d601190b9ec7eae52f2018c9d79a8e3ef3
+DIST cjs-4.8.1.tar.gz 599988 BLAKE2B 56132b44cc5181d0e31db0356af77e47a5dfb049085da75a2e717e89befadce8320e1ada9614e9deb88fa90b02d58690a0526d5d8818585e2348d820489a8f38 SHA512 24eb1efb2b7de0bcad1f4445a5c3d0b911636ff7e62c858e756acd47c86f9960738d9421c6e4db7d21efde8916cac7313489f8a90ac034d68521dac6f358b368
+EBUILD cjs-4.8.1.ebuild 1607 BLAKE2B 4dbabf1db2ab3e61bfb1da45d49250f992168d637e07a5825d6b694149d8c0a1c1cceabacc45f67e3c1562f39e7d5c9716a94464df8de64cff6a52d1a33f0ad6 SHA512 23a0eb350b5ec9bd1eb2ceafd957d3ac8c4ce72277abc0c4547dbcd75c5e66680f8d696d0f3402e3158d2322f9f818041d4d279a78730f47493f0dc139543d2c
+MISC metadata.xml 452 BLAKE2B 14171fbd087539a58381694472c27a76b85400df2a910427386755db2418ffe514ad17df2058d67e454fbe9c720793664556df787a7008341530b8b52763b553 SHA512 370917c429954d9a72be84416b7a3675f54b355a0093cf138796dec8f94e55a8f127e96456b2a5025ceb93d4bcc14e378c9f78e3d6a43a3be1e61a46e70fc38a
diff --git a/gnome-extra/cjs/cjs-4.4.0.ebuild b/gnome-extra/cjs/cjs-4.4.0.ebuild
deleted file mode 100644
index 4bd638f43d71..000000000000
--- a/gnome-extra/cjs/cjs-4.4.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 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="https://projects.linuxmint.com/cinnamon/"
-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.42:2
- >=dev-libs/gobject-introspection-1.41.4:=
- sys-libs/readline:0=
- dev-libs/libffi:0=
- cairo? ( x11-libs/cairo[X,glib] )
- gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
- 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
-
- # Fixed in 4.6.0
- sed -ie "s/Gjs-WARNING/Cjs-WARNING/g" \
- "${S}"/installed-tests/scripts/testCommandLine.sh || die
-
- # Fixed in 4.6.0
- sed -ie "s/40000/50000/g" \
- "${S}"/installed-tests/js/testSystem.js || die
-
- sed -ie "s/'Gjs'/'Cjs'/g" \
- "${S}"/installed-tests/js/testExceptions.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
- 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/cjs-4.6.0.ebuild b/gnome-extra/cjs/cjs-4.6.0.ebuild
deleted file mode 100644
index ccb7de2083d3..000000000000
--- a/gnome-extra/cjs/cjs-4.6.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools gnome2-utils pax-utils virtualx xdg-utils
-
-DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-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"
-RESTRICT="test"
-
-RDEPEND="
- dev-lang/spidermonkey:52
- >=dev-libs/glib-2.42:2
- >=dev-libs/gobject-introspection-1.41.4:=
- sys-libs/readline:0=
- dev-libs/libffi:0=
- cairo? ( x11-libs/cairo[X,glib] )
- gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
- sys-devel/autoconf-archive
- test? ( sys-apps/dbus )
-"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_prepare() {
- xdg_environment_reset
- default
- eautoreconf
- gnome2_disable_deprecation_warning
-
- sed -ie "s/'Gjs'/'Cjs'/g" \
- "${S}"/installed-tests/js/testExceptions.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
- econf \
- --disable-maintainer-mode \
- --enable-compile-warnings=minimum \
- --disable-systemtap \
- --disable-dtrace \
- $(use_with cairo) \
- $(use_with gtk)
-}
-
-src_test() {
- virtx emake check
-}
-
-src_install() {
- # installation sometimes fails in parallel
- default -j1
- find "${D}" -name '*.la' -delete || die
-
- 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/cjs-4.8.1.ebuild b/gnome-extra/cjs/cjs-4.8.1.ebuild
new file mode 100644
index 000000000000..7c65308deecf
--- /dev/null
+++ b/gnome-extra/cjs/cjs-4.8.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson pax-utils virtualx
+
+DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="
+ https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/linuxmint/cjs/commit/1210c910935e4e3ab5335725a34adb8f661a8d95.patch -> ${P}-rebase-on-1.66.1.patch
+"
+
+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.38.1:4 )
+ test? (
+ sys-apps/dbus
+
+ gtk? ( x11-libs/gtk+:3[introspection] )
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ # Rebase on gjs 1.66.1 to fix SIGABRT
+ # https://github.com/linuxmint/cjs/pull/90
+ "${DISTDIR}/${P}-rebase-on-1.66.1.patch"
+)
+
+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/metadata.xml b/gnome-extra/cjs/metadata.xml
index 52a90f6d8024..d3fb9540208b 100644
--- a/gnome-extra/cjs/metadata.xml
+++ b/gnome-extra/cjs/metadata.xml
@@ -12,5 +12,5 @@
<upstream>
<remote-id type="github">linuxmint/cjs</remote-id>
</upstream>
- <origin>gentoo-staging</origin>
+ <origin>cinnamon-overlay</origin>
</pkgmetadata>
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-01 14:31:00 +0000