From b8215b304dce31259ace9bf5ba1cf4b99749a155 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 8 Oct 2022 19:20:02 +0100 Subject: dev-libs/gjs: fix MissingUseDepDefault on cairo Closes: https://bugs.gentoo.org/875908 Signed-off-by: Sam James --- dev-libs/gjs/gjs-1.72.1-r1.ebuild | 67 +++++++++++++++++++++++++++++++++++++++ dev-libs/gjs/gjs-1.72.1.ebuild | 67 --------------------------------------- dev-libs/gjs/gjs-1.72.2-r1.ebuild | 67 +++++++++++++++++++++++++++++++++++++++ dev-libs/gjs/gjs-1.72.2.ebuild | 67 --------------------------------------- 4 files changed, 134 insertions(+), 134 deletions(-) create mode 100644 dev-libs/gjs/gjs-1.72.1-r1.ebuild delete mode 100644 dev-libs/gjs/gjs-1.72.1.ebuild create mode 100644 dev-libs/gjs/gjs-1.72.2-r1.ebuild delete mode 100644 dev-libs/gjs/gjs-1.72.2.ebuild (limited to 'dev-libs/gjs') diff --git a/dev-libs/gjs/gjs-1.72.1-r1.ebuild b/dev-libs/gjs/gjs-1.72.1-r1.ebuild new file mode 100644 index 000000000000..d0f22ad5477d --- /dev/null +++ b/dev-libs/gjs/gjs-1.72.1-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2022 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 ppc64 ~riscv x86" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.66.0:2 + dev-libs/libffi:= + >=dev-libs/gobject-introspection-1.66.1:= + >=dev-lang/spidermonkey-91.3.0:91 + cairo? ( x11-libs/cairo[X,glib,svg(+)] ) + 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) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} diff --git a/dev-libs/gjs/gjs-1.72.1.ebuild b/dev-libs/gjs/gjs-1.72.1.ebuild deleted file mode 100644 index 1bc9ac221ed6..000000000000 --- a/dev-libs/gjs/gjs-1.72.1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2022 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 ppc64 ~riscv x86" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.66.0:2 - dev-libs/libffi:= - >=dev-libs/gobject-introspection-1.66.1:= - >=dev-lang/spidermonkey-91.3.0:91 - cairo? ( x11-libs/cairo[X,glib,svg] ) - 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) - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} diff --git a/dev-libs/gjs/gjs-1.72.2-r1.ebuild b/dev-libs/gjs/gjs-1.72.2-r1.ebuild new file mode 100644 index 000000000000..d0f22ad5477d --- /dev/null +++ b/dev-libs/gjs/gjs-1.72.2-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2022 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 ppc64 ~riscv x86" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.66.0:2 + dev-libs/libffi:= + >=dev-libs/gobject-introspection-1.66.1:= + >=dev-lang/spidermonkey-91.3.0:91 + cairo? ( x11-libs/cairo[X,glib,svg(+)] ) + 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) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} diff --git a/dev-libs/gjs/gjs-1.72.2.ebuild b/dev-libs/gjs/gjs-1.72.2.ebuild deleted file mode 100644 index 1bc9ac221ed6..000000000000 --- a/dev-libs/gjs/gjs-1.72.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2022 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 ppc64 ~riscv x86" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.66.0:2 - dev-libs/libffi:= - >=dev-libs/gobject-introspection-1.66.1:= - >=dev-lang/spidermonkey-91.3.0:91 - cairo? ( x11-libs/cairo[X,glib,svg] ) - 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) - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} -- cgit v1.2.3-65-gdbad