commit: aa2cec7d4a0926da65f3830ced1ca945f4dfe96a Author: Guillermo Joandet <gjoandet <AT> gmail <DOT> com> AuthorDate: Sat Mar 18 21:34:16 2023 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun Mar 19 03:41:08 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa2cec7d
dev-libs/gjs: Version bump to 1.76.0 Closes: https://bugs.gentoo.org/900875 Closes: https://github.com/gentoo/gentoo/pull/30224 Signed-off-by: Guillermo Joandet <gjoandet <AT> gmail.com> Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> dev-libs/gjs/Manifest | 1 + ...0-move_have_gtk4_to_the_appropriate_place.patch | 38 ++++++++++++ dev-libs/gjs/gjs-1.76.0.ebuild | 72 ++++++++++++++++++++++ 3 files changed, 111 insertions(+) diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest index ca195b26575b..3b5bf78e27c0 100644 --- a/dev-libs/gjs/Manifest +++ b/dev-libs/gjs/Manifest @@ -1,3 +1,4 @@ DIST gjs-1.74.1.tar.xz 638536 BLAKE2B 375abcaa20a538cfa271f7dcf6f3715e4324ff5a4a9482ce0dd7f78213598a715ebc034f701fe458876f841f72802db4ae2aabf0abc04dc4ac5bb39c917741fd SHA512 346667accb589df0e6a045e30782017eab928115f263d36d521b61b0af38fd268bc518b8ab5ec78e5d25e0194b744a2ee59e65668da679e138b2122858ce0614 DIST gjs-1.74.2.tar.xz 639012 BLAKE2B 12f6f60b801d96a4cff260a0abc5da96c30a5b77d69d31b646b16db20a586761b36b2601c8da8ab7b313c96b8fb2319ed65cb53f3f3ca2d3d255648ceccdbc7c SHA512 738176aabcc8d0147cf77b7af3271c93ca4e8a473b2d35722b4cf9a15dcdc9f87962a29dd949607d947256df9ffcfd499d7189b6eff7ac416bbad594a2bc8ea9 DIST gjs-1.75.90.tar.xz 645228 BLAKE2B 853704b5eed8d14e070fe47ec10a27071ab6d7c6754f61206f03c20a3fba0038105c54fd2b2b2196dfeb0e74aea966a6bd886ad8d77a0c1d1d70bf6eb5bc0a54 SHA512 2bfdb9fb62612505e2f647c164944337257915d427e62c340b1dbe389d22cf309fe4ba4f55c9399c3027136e24b49ed441598b9fbd93389e8596e2de8a6917fc +DIST gjs-1.76.0.tar.xz 645364 BLAKE2B 9987033883e466c983af007c870cba4f2ef70ee08e276777e1b52103ddcebd1285ca9f3ce64c8ef52437a829157f58902cfb921eed06442e53fd9778d9cd9f2b SHA512 fa44431f431f14b82c648c388046b83722808db52d2bbe2deeb8d270d6fbeee9c4ee27feaa4fef425e1ab5ac65a1e68d7aa9457d543044362752810128064ea6 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 new file mode 100644 index 000000000000..2bb80126507f --- /dev/null +++ b/dev-libs/gjs/files/gjs-1.76.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 diff --git a/dev-libs/gjs/gjs-1.76.0.ebuild b/dev-libs/gjs/gjs-1.76.0.ebuild new file mode 100644 index 000000000000..e7cdaae084f1 --- /dev/null +++ b/dev-libs/gjs/gjs-1.76.0.ebuild @@ -0,0 +1,72 @@ +# 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 ~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}/${P}-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 +}
