From ecabd6ebc05d773a44ec7db77220512c5fb9b2b2 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Sun, 3 Mar 2024 00:43:25 +0200 Subject: dev-libs/gjs: drop 1.76.2, 1.78.0, 1.78.3 Signed-off-by: Mart Raudsepp --- dev-libs/gjs/Manifest | 3 - ...0-move_have_gtk4_to_the_appropriate_place.patch | 38 ------------ dev-libs/gjs/gjs-1.76.2.ebuild | 72 ---------------------- dev-libs/gjs/gjs-1.78.0.ebuild | 68 -------------------- dev-libs/gjs/gjs-1.78.3.ebuild | 68 -------------------- 5 files changed, 249 deletions(-) delete mode 100644 dev-libs/gjs/files/gjs-1.76.0-move_have_gtk4_to_the_appropriate_place.patch delete mode 100644 dev-libs/gjs/gjs-1.76.2.ebuild delete mode 100644 dev-libs/gjs/gjs-1.78.0.ebuild delete mode 100644 dev-libs/gjs/gjs-1.78.3.ebuild diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest index 77879c0844c6..18f6411fedf7 100644 --- a/dev-libs/gjs/Manifest +++ b/dev-libs/gjs/Manifest @@ -1,5 +1,2 @@ -DIST gjs-1.76.2.tar.xz 646232 BLAKE2B 66466eeb5f956d5041f4e63ba977dc9a688455770c39bcedd63576f56fde9821ed3c827c470f7e3befbbf7828fbd197706637da458876ec129d6c16323e414e8 SHA512 26b024874ce69a6f58b5fabe006b8d5417971db9de00e21ecd352715b4535f405d162bb81c0cf6b20313f0f78833962080ac1cb9bd42cfff9cf6a74340458540 -DIST gjs-1.78.0.tar.xz 653500 BLAKE2B f2b6c3d80f55c1b3365fdc94dcedec357fc21ec7f92eccdf24cc028eb006538057d0d6e3328bc2f743a563ba496da5daa8585fabd6fbf52acd38c990b8a4e8ba SHA512 28ad3ff5c031b8e78622244918994ca5f510e4b403a382e7d0b0bcb9a0611be61e103398773328be4c405b49d7984c089180a5fb603518b412d01a935fb3ceb3 DIST gjs-1.78.1.tar.xz 654556 BLAKE2B 1d723ad2fd15e7ba6b9194cb90f0c0bc7b89c150604beb11ad95e1628ead2bea7ed8b423e1836736013a31e8ff8f3e2400458faa26dcc95d3a6dc36c65957583 SHA512 9a5d02bacbf82364cf5daa69d6613eb38ef34121eb350b2773b87cf1027ccc1b9905b651275fd71036817e710d834d356ee1cecac2f7c83ff571c39e98360286 -DIST gjs-1.78.3.tar.xz 655236 BLAKE2B d240b394a6b13822fe6332ae65fc5b13d70c62cfad7736308b57abb570e039d6045ed2c646170e4c05ebf62a31d24caccaabe6789c9c951a8b63746b33e20edb SHA512 215893e0247f4c0947b9d1394d08d6664aa9ef43ff40e1fb8453ee0f1be7843758166b17d4b63ff91ac421845e2ad27089879ecb3082d8f4737fb3abf2636223 DIST gjs-1.78.4.tar.xz 655220 BLAKE2B 0adcc3d0cc88a36b94b2113a6d88ded9be7fa034392fa38abb9ac22a962fb8601a76b6c886500e48c40fbe8708b3164b1d403dd83cd4e77358a4a020e8c15632 SHA512 a402050cee011a84f0ebb6b1512a2e681e792cf559b3182ece0868e57191be64337d6683ebcb8a7ee89ba79c12947a8cbca85f015c6015d26901352b5255c2c4 diff --git a/dev-libs/gjs/files/gjs-1.76.0-move_have_gtk4_to_the_appropriate_place.patch b/dev-libs/gjs/files/gjs-1.76.0-move_have_gtk4_to_the_appropriate_place.patch deleted file mode 100644 index 2bb80126507f..000000000000 --- a/dev-libs/gjs/files/gjs-1.76.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 diff --git a/dev-libs/gjs/gjs-1.76.2.ebuild b/dev-libs/gjs/gjs-1.76.2.ebuild deleted file mode 100644 index ef4d2148a240..000000000000 --- a/dev-libs/gjs/gjs-1.76.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic gnome.org meson virtualx - -DESCRIPTION="Javascript bindings for GNOME" -HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs" - -LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" -SLOT="0" -IUSE="+cairo examples readline sysprof test" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.66.0:2 - dev-libs/libffi:= - >=dev-libs/gobject-introspection-1.71.1:= - >=dev-lang/spidermonkey-102.2.0:102 - cairo? ( x11-libs/cairo[X,glib] ) - readline? ( sys-libs/readline:0= ) -" -DEPEND="${RDEPEND} - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) - test? ( - sys-apps/dbus - >=x11-libs/gtk+-3.20:3[introspection] - ) -" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-1.76.0-move_have_gtk4_to_the_appropriate_place.patch" -) - -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 - - # FIXME: add systemtap/dtrace support, like in glib:2 - 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) - -Db_pch=True # TODO this has to go - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} diff --git a/dev-libs/gjs/gjs-1.78.0.ebuild b/dev-libs/gjs/gjs-1.78.0.ebuild deleted file mode 100644 index 3f77c1d06628..000000000000 --- a/dev-libs/gjs/gjs-1.78.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic gnome.org meson virtualx - -DESCRIPTION="Javascript bindings for GNOME" -HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs" - -LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" -SLOT="0" -IUSE="+cairo examples readline sysprof test" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.66.0:2 - dev-libs/libffi:= - >=dev-libs/gobject-introspection-1.71.1:= - dev-lang/spidermonkey:115 - cairo? ( x11-libs/cairo[X,glib] ) - readline? ( sys-libs/readline:0= ) -" -DEPEND="${RDEPEND} - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) - test? ( - sys-apps/dbus - >=x11-libs/gtk+-3.20:3[introspection] - ) -" -BDEPEND=" - virtual/pkgconfig -" - -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 - - # FIXME: add systemtap/dtrace support, like in glib:2 - 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) - -Db_pch=True # TODO this has to go - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} diff --git a/dev-libs/gjs/gjs-1.78.3.ebuild b/dev-libs/gjs/gjs-1.78.3.ebuild deleted file mode 100644 index f9d52d43c6ba..000000000000 --- a/dev-libs/gjs/gjs-1.78.3.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic gnome.org meson virtualx - -DESCRIPTION="Javascript bindings for GNOME" -HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs" - -LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" -SLOT="0" -IUSE="+cairo examples readline sysprof test" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.66.0:2 - dev-libs/libffi:= - >=dev-libs/gobject-introspection-1.71.1:= - dev-lang/spidermonkey:115 - cairo? ( x11-libs/cairo[X,glib] ) - readline? ( sys-libs/readline:0= ) -" -DEPEND="${RDEPEND} - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) - test? ( - sys-apps/dbus - >=x11-libs/gtk+-3.20:3[introspection] - ) -" -BDEPEND=" - virtual/pkgconfig -" - -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 - - # FIXME: add systemtap/dtrace support, like in glib:2 - 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) - -Db_pch=True # TODO this has to go - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} -- cgit v1.2.3-65-gdbad