1 |
commit: aa2cec7d4a0926da65f3830ced1ca945f4dfe96a |
2 |
Author: Guillermo Joandet <gjoandet <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Mar 18 21:34:16 2023 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 19 03:41:08 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa2cec7d |
7 |
|
8 |
dev-libs/gjs: Version bump to 1.76.0 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/900875 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/30224 |
12 |
Signed-off-by: Guillermo Joandet <gjoandet <AT> gmail.com> |
13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
14 |
|
15 |
dev-libs/gjs/Manifest | 1 + |
16 |
...0-move_have_gtk4_to_the_appropriate_place.patch | 38 ++++++++++++ |
17 |
dev-libs/gjs/gjs-1.76.0.ebuild | 72 ++++++++++++++++++++++ |
18 |
3 files changed, 111 insertions(+) |
19 |
|
20 |
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest |
21 |
index ca195b26575b..3b5bf78e27c0 100644 |
22 |
--- a/dev-libs/gjs/Manifest |
23 |
+++ b/dev-libs/gjs/Manifest |
24 |
@@ -1,3 +1,4 @@ |
25 |
DIST gjs-1.74.1.tar.xz 638536 BLAKE2B 375abcaa20a538cfa271f7dcf6f3715e4324ff5a4a9482ce0dd7f78213598a715ebc034f701fe458876f841f72802db4ae2aabf0abc04dc4ac5bb39c917741fd SHA512 346667accb589df0e6a045e30782017eab928115f263d36d521b61b0af38fd268bc518b8ab5ec78e5d25e0194b744a2ee59e65668da679e138b2122858ce0614 |
26 |
DIST gjs-1.74.2.tar.xz 639012 BLAKE2B 12f6f60b801d96a4cff260a0abc5da96c30a5b77d69d31b646b16db20a586761b36b2601c8da8ab7b313c96b8fb2319ed65cb53f3f3ca2d3d255648ceccdbc7c SHA512 738176aabcc8d0147cf77b7af3271c93ca4e8a473b2d35722b4cf9a15dcdc9f87962a29dd949607d947256df9ffcfd499d7189b6eff7ac416bbad594a2bc8ea9 |
27 |
DIST gjs-1.75.90.tar.xz 645228 BLAKE2B 853704b5eed8d14e070fe47ec10a27071ab6d7c6754f61206f03c20a3fba0038105c54fd2b2b2196dfeb0e74aea966a6bd886ad8d77a0c1d1d70bf6eb5bc0a54 SHA512 2bfdb9fb62612505e2f647c164944337257915d427e62c340b1dbe389d22cf309fe4ba4f55c9399c3027136e24b49ed441598b9fbd93389e8596e2de8a6917fc |
28 |
+DIST gjs-1.76.0.tar.xz 645364 BLAKE2B 9987033883e466c983af007c870cba4f2ef70ee08e276777e1b52103ddcebd1285ca9f3ce64c8ef52437a829157f58902cfb921eed06442e53fd9778d9cd9f2b SHA512 fa44431f431f14b82c648c388046b83722808db52d2bbe2deeb8d270d6fbeee9c4ee27feaa4fef425e1ab5ac65a1e68d7aa9457d543044362752810128064ea6 |
29 |
|
30 |
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 |
31 |
new file mode 100644 |
32 |
index 000000000000..2bb80126507f |
33 |
--- /dev/null |
34 |
+++ b/dev-libs/gjs/files/gjs-1.76.0-move_have_gtk4_to_the_appropriate_place.patch |
35 |
@@ -0,0 +1,38 @@ |
36 |
+# https://gitlab.gnome.org/GNOME/gjs/-/issues/532 |
37 |
+# https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/830/diffs?commit_id=83683d093c157828cf7787e53a32c586ae4e85d3 |
38 |
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build |
39 |
+index 6db887d2250face397079b03d215bbd13f455efb..1e953ceb7695356b6e854775e5db005a9c22e053 100644 |
40 |
+--- a/installed-tests/js/meson.build |
41 |
++++ b/installed-tests/js/meson.build |
42 |
+@@ -203,9 +203,13 @@ endif |
43 |
+ # during build should be run using dbus-run-session |
44 |
+ |
45 |
+ dbus_tests = ['GDBus'] |
46 |
+-if have_gtk4 and not get_option('skip_gtk_tests') |
47 |
+- # FIXME: find out why GTK4 tries to acquire a message bus |
48 |
+- dbus_tests += 'Gtk4' |
49 |
++if not get_option('skip_gtk_tests') |
50 |
++ have_gtk4 = dependency('gtk4', required: false).found() |
51 |
++ |
52 |
++ if have_gtk4 |
53 |
++ # FIXME: find out why GTK4 tries to acquire a message bus |
54 |
++ dbus_tests += 'Gtk4' |
55 |
++ endif |
56 |
+ endif |
57 |
+ |
58 |
+ bus_config = files('../../test/test-bus.conf') |
59 |
+diff --git a/meson.build b/meson.build |
60 |
+index 3ac372a16b0bfaa364ed7422119f3e6e4af8971e..5c7703935b68c724347692ef5bf47a3edf868c61 100644 |
61 |
+--- a/meson.build |
62 |
++++ b/meson.build |
63 |
+@@ -679,10 +679,6 @@ endif |
64 |
+ |
65 |
+ ### Tests and test setups ###################################################### |
66 |
+ |
67 |
+-if not get_option('skip_gtk_tests') |
68 |
+- have_gtk4 = dependency('gtk4', required: false).found() |
69 |
+-endif |
70 |
+- |
71 |
+ subdir('installed-tests') |
72 |
+ |
73 |
+ # Note: The test program in test/ needs to be ported |
74 |
|
75 |
diff --git a/dev-libs/gjs/gjs-1.76.0.ebuild b/dev-libs/gjs/gjs-1.76.0.ebuild |
76 |
new file mode 100644 |
77 |
index 000000000000..e7cdaae084f1 |
78 |
--- /dev/null |
79 |
+++ b/dev-libs/gjs/gjs-1.76.0.ebuild |
80 |
@@ -0,0 +1,72 @@ |
81 |
+# Copyright 1999-2023 Gentoo Authors |
82 |
+# Distributed under the terms of the GNU General Public License v2 |
83 |
+ |
84 |
+EAPI=8 |
85 |
+ |
86 |
+inherit flag-o-matic gnome.org meson virtualx |
87 |
+ |
88 |
+DESCRIPTION="Javascript bindings for GNOME" |
89 |
+HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs" |
90 |
+ |
91 |
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" |
92 |
+SLOT="0" |
93 |
+IUSE="+cairo examples readline sysprof test" |
94 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" |
95 |
+RESTRICT="!test? ( test )" |
96 |
+ |
97 |
+RDEPEND=" |
98 |
+ >=dev-libs/glib-2.66.0:2 |
99 |
+ dev-libs/libffi:= |
100 |
+ >=dev-libs/gobject-introspection-1.71.1:= |
101 |
+ >=dev-lang/spidermonkey-102.2.0:102 |
102 |
+ cairo? ( x11-libs/cairo[X,glib] ) |
103 |
+ readline? ( sys-libs/readline:0= ) |
104 |
+" |
105 |
+DEPEND="${RDEPEND} |
106 |
+ sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) |
107 |
+ test? ( |
108 |
+ sys-apps/dbus |
109 |
+ >=x11-libs/gtk+-3.20:3[introspection] |
110 |
+ ) |
111 |
+" |
112 |
+BDEPEND=" |
113 |
+ virtual/pkgconfig |
114 |
+" |
115 |
+ |
116 |
+PATCHES=( |
117 |
+ "${FILESDIR}/${P}-move_have_gtk4_to_the_appropriate_place.patch" |
118 |
+) |
119 |
+ |
120 |
+src_configure() { |
121 |
+ append-cppflags -DG_DISABLE_CAST_CHECKS |
122 |
+ |
123 |
+ # On musl, it's required that either gjs, pixman or gnome-shell to be built |
124 |
+ # with a larger stack otherwise librsvg fails to render a particular SVG, as |
125 |
+ # a result we fail to get gdm or gnome-shell running (greeted with a fail |
126 |
+ # whale screen). The bug has been reported to librsvg. This is ideally just |
127 |
+ # a temporary workaround until we understand what exactly needs a larger |
128 |
+ # stack size, as it's not sufficient to do just librsvg. |
129 |
+ # |
130 |
+ # Please refer to: |
131 |
+ # https://gitlab.gnome.org/GNOME/librsvg/-/issues/686 |
132 |
+ # https://gitlab.gnome.org/GNOME/librsvg/-/issues/874 |
133 |
+ # |
134 |
+ # TODO: Find an actual fix instead of increasing the stack |
135 |
+ use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 |
136 |
+ |
137 |
+ # FIXME: add systemtap/dtrace support, like in glib:2 |
138 |
+ local emesonargs=( |
139 |
+ $(meson_feature cairo) |
140 |
+ $(meson_feature readline) |
141 |
+ $(meson_feature sysprof profiler) |
142 |
+ -Dinstalled_tests=false |
143 |
+ $(meson_use !test skip_dbus_tests) |
144 |
+ $(meson_use !test skip_gtk_tests) |
145 |
+ -Db_pch=True # TODO this has to go |
146 |
+ ) |
147 |
+ meson_src_configure |
148 |
+} |
149 |
+ |
150 |
+src_test() { |
151 |
+ virtx meson_src_test |
152 |
+} |