* [gentoo-commits] repo/gentoo:master commit in: dev-libs/gjs/, dev-libs/gjs/files/
@ 2017-07-14 8:52 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2017-07-14 8:52 UTC (permalink / raw
To: gentoo-commits
commit: d283059be2ba3668e493ba99aaf38e2222a6a79a
Author: Timo Tambet <ttambet <AT> gmail <DOT> com>
AuthorDate: Sat Apr 22 18:35:01 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 08:50:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d283059b
dev-libs/gjs: bump to 1.48.2
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-libs/gjs/Manifest | 1 +
.../gjs/files/gjs-1.48.2-disable-unittest.patch | 24 ++++++++
dev-libs/gjs/gjs-1.48.2.ebuild | 66 ++++++++++++++++++++++
3 files changed, 91 insertions(+)
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index ef3931deea2..c534edfdc43 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1 +1,2 @@
DIST gjs-1.46.0.tar.xz 490812 SHA256 2283591fa70785443793e1d7db66071b36052d707075f229baeb468d8dd25ad4 SHA512 14af40668e95d269ac87556c75cf45680c41bc8246f04c46726d34bd80e9344045c0a510567f156c2c25c1f10dd474dc38bd50581d1b2e5abe0daa0cf570e2bc WHIRLPOOL 4aaf910c344d7df028a52e43b60b49e4fb0aefd92968e068d0effc4817b0f6b3d388c8287c6f7e3f85bc92c9e5605c03ff4743677ebc95dcd383d5a84d06f4fa
+DIST gjs-1.48.2.tar.xz 595888 SHA256 99c225ab2149bd31f7ac84d6ee1ea9ae843bf9a806ca853786d90e3182c4f4a1 SHA512 f936e2a90dd2ee75b235e3c678c7cc07e02ef4519dd945c7d3a9174e76ae2b2d6429f4ebe269522c7e80762650a198a1085d11c5dbf25cde1a5eae4693aba1b3 WHIRLPOOL 92eb990ddd470334dd100132f5e6b5c7c02df6ff9a8e16dea574206888069c46ab0196569f6063fad1db75bc38ff66e65701ed2420302dbb93652ad9ed761c90
diff --git a/dev-libs/gjs/files/gjs-1.48.2-disable-unittest.patch b/dev-libs/gjs/files/gjs-1.48.2-disable-unittest.patch
new file mode 100644
index 00000000000..3925fed0140
--- /dev/null
+++ b/dev-libs/gjs/files/gjs-1.48.2-disable-unittest.patch
@@ -0,0 +1,24 @@
+commit e9b7360c9a057c4a6718c9561e5cb6dcee279ec2
+Author: Timo Tambet <ttambet@gmail.com>
+Date: Sat Apr 22 22:32:36 2017 +0300
+
+ Comment out broken JS unittest
+
+diff --git a/installed-tests/js/testLocale.js b/installed-tests/js/testLocale.js
+index edd8a6e..0b0847a 100644
+--- a/installed-tests/js/testLocale.js
++++ b/installed-tests/js/testLocale.js
+@@ -4,11 +4,12 @@ describe('JS_SetLocaleCallbacks', function () {
+ });
+
+ // Requesting the weekday name tests locale_to_unicode
++ /*
+ it('toLocaleDateString() works', function () {
+ let date = new Date('12/15/1981');
+ let datestr = date.toLocaleDateString('pt-BR', { weekday: 'long' });
+ expect(datestr).toEqual('terça-feira');
+- });
++ });*/
+
+ it('toLocaleLowerCase() works', function () {
+ expect('AAA'.toLocaleLowerCase()).toEqual('aaa');
diff --git a/dev-libs/gjs/gjs-1.48.2.ebuild b/dev-libs/gjs/gjs-1.48.2.ebuild
new file mode 100644
index 00000000000..a2213d9eac0
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.48.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 pax-utils virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+ >=dev-libs/glib-2.52.1
+ >=dev-libs/gobject-introspection-1.52.1:=
+
+ sys-libs/readline:0
+ dev-lang/spidermonkey:38
+ virtual/libffi
+ cairo? ( x11-libs/cairo[X] )
+ gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+ gnome-base/gnome-common
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? ( sys-apps/dbus )
+"
+
+PATCHES=(
+ # Disable broken unittests, upstream bug #????
+ "${FILESDIR}"/${PN}-1.48.2-disable-unittest.patch
+)
+
+src_configure() {
+ # FIXME: add systemtap/dtrace support, like in glib:2
+ # FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+ # XXX: Do NOT enable coverage, completely useless for portage installs
+ gnome2_src_configure \
+ --disable-systemtap \
+ --disable-dtrace \
+ --disable-coverage \
+ $(use_with cairo cairo) \
+ $(use_with gtk) \
+ $(use_with test dbus-tests) \
+ $(use_with test xvfb-tests)
+}
+
+src_test() {
+ virtx emake check
+}
+
+src_install() {
+ # installation sometimes fails in parallel, bug #???
+ gnome2_src_install -j1
+
+ if use examples; then
+ insinto /usr/share/doc/"${PF}"/examples
+ doins "${S}"/examples/*
+ fi
+
+ # Required for gjs-console to run correctly on PaX systems
+ pax-mark mr "${ED}/usr/bin/gjs-console"
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/gjs/, dev-libs/gjs/files/
@ 2017-07-29 3:04 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2017-07-29 3:04 UTC (permalink / raw
To: gentoo-commits
commit: 26d779cf518de48d1e05a3cb0cb3810f2844da16
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 29 02:53:53 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Jul 29 02:53:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26d779cf
dev-libs/gjs: bump to 1.48.6 for a gnome-shell-3.24 crash fix
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-libs/gjs/Manifest | 2 +-
.../{1.48.5-disable-unittest.patch => 1.48.6-disable-unittest.patch} | 0
dev-libs/gjs/{gjs-1.48.5.ebuild => gjs-1.48.6.ebuild} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index c187e5f41a9..a09b09a1e31 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,2 +1,2 @@
DIST gjs-1.46.0.tar.xz 490812 SHA256 2283591fa70785443793e1d7db66071b36052d707075f229baeb468d8dd25ad4 SHA512 14af40668e95d269ac87556c75cf45680c41bc8246f04c46726d34bd80e9344045c0a510567f156c2c25c1f10dd474dc38bd50581d1b2e5abe0daa0cf570e2bc WHIRLPOOL 4aaf910c344d7df028a52e43b60b49e4fb0aefd92968e068d0effc4817b0f6b3d388c8287c6f7e3f85bc92c9e5605c03ff4743677ebc95dcd383d5a84d06f4fa
-DIST gjs-1.48.5.tar.xz 596484 SHA256 cc37998e283b6e25e1814026aa5bb96e145e1ce902b02133977bbdac8db3e042 SHA512 7b41dfd573fac325fbf3c429a4925ee1c3ae202a8f9a8300824ec4978b3cddcdcaec49abd1fe02098026f55e52e8759dbb44e4439bf8c590c0c565d111828371 WHIRLPOOL 4596dafbd1a25a8bff42599fb5a86bf863947f714feab10fcc24bbcfc9a1357e9f3642308a60e41643345f9be2fff3d7167fa0dfe6d1f6db93703d97eeff4644
+DIST gjs-1.48.6.tar.xz 596964 SHA256 e85f65ba4b38bf80b6174949dfe6fce89e88b8213bbdde4ac1fde473c08bd312 SHA512 29d70bbee722bbb58eb95acf1409d5e34930d11ebd9525f3b7d0050a13b72eb50e357df7c2bb9bc2ba147dcfdbc2dfb1f1f7b710347473d05cd484006b6ea256 WHIRLPOOL e18a79c04b2b49f250d378bbaf43aa461b8673a819ca1fb2ba02c5b0985fec4555e700c07213654eba57e390856b4951ad158ff669f12e24b6325f5ca7f681b6
diff --git a/dev-libs/gjs/files/1.48.5-disable-unittest.patch b/dev-libs/gjs/files/1.48.6-disable-unittest.patch
similarity index 100%
rename from dev-libs/gjs/files/1.48.5-disable-unittest.patch
rename to dev-libs/gjs/files/1.48.6-disable-unittest.patch
diff --git a/dev-libs/gjs/gjs-1.48.5.ebuild b/dev-libs/gjs/gjs-1.48.6.ebuild
similarity index 100%
rename from dev-libs/gjs/gjs-1.48.5.ebuild
rename to dev-libs/gjs/gjs-1.48.6.ebuild
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/gjs/, dev-libs/gjs/files/
@ 2021-11-29 0:56 Mike Gilbert
0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert @ 2021-11-29 0:56 UTC (permalink / raw
To: gentoo-commits
commit: b707dc5311d1c6a1eefb9f6bf28cf4d217136192
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 29 00:51:59 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Nov 29 00:55:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b707dc53
dev-libs/gjs: backport fix for meson-0.60.2
Closes: https://bugs.gentoo.org/827538
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-libs/gjs/files/gjs-1.70.0-meson-0.60.2.patch | 76 ++++++++++++++++++++++++
dev-libs/gjs/gjs-1.70.0.ebuild | 4 ++
2 files changed, 80 insertions(+)
diff --git a/dev-libs/gjs/files/gjs-1.70.0-meson-0.60.2.patch b/dev-libs/gjs/files/gjs-1.70.0-meson-0.60.2.patch
new file mode 100644
index 000000000000..9a051131d98c
--- /dev/null
+++ b/dev-libs/gjs/files/gjs-1.70.0-meson-0.60.2.patch
@@ -0,0 +1,76 @@
+From 59bbb5e4795d2b6e41ce27ae3b18257e75b71a19 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sat, 27 Nov 2021 22:57:11 +0000
+Subject: [PATCH] build: disable gir install via list to pacify meson >= 0.60.2
+
+meson.build:580:0: ERROR: "install_dir" must be specified when installing a target
+installed-tests/js/meson.build:73:0: ERROR: "install_dir" must be specified when installing a target
+installed-tests/js/meson.build:91:4: ERROR: "install_dir" must be specified when installing a target
+installed-tests/js/meson.build:104:0: ERROR: "install_dir" must be specified when installing a target
+installed-tests/js/libgjstesttools/meson.build:13:0: ERROR: "install_dir" must be specified when installing a target
+---
+ installed-tests/js/libgjstesttools/meson.build | 2 +-
+ installed-tests/js/meson.build | 6 +++---
+ meson.build | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/installed-tests/js/libgjstesttools/meson.build b/installed-tests/js/libgjstesttools/meson.build
+index 2e57483a..3ca4d7ed 100644
+--- a/installed-tests/js/libgjstesttools/meson.build
++++ b/installed-tests/js/libgjstesttools/meson.build
+@@ -14,7 +14,7 @@ gjstest_tools_gir = gnome.generate_gir(libgjstesttools,
+ includes: ['GObject-2.0', 'Gio-2.0'], sources: gjstest_tools_sources,
+ namespace: 'GjsTestTools', nsversion: '1.0',
+ symbol_prefix: 'gjs_test_tools_', extra_args: '--warn-error',
+- install: get_option('installed_tests'), install_dir_gir: false,
++ install: get_option('installed_tests'), install_dir_gir: [false],
+ install_dir_typelib: installed_tests_execdir)
+ gjstest_tools_typelib = gjstest_tools_gir[1]
+ libgjstesttools_dep = declare_dependency(
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 2f007351..16b59660 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -74,7 +74,7 @@ regress_gir = gnome.generate_gir(libregress, includes: regress_gir_includes,
+ sources: regress_sources, namespace: 'Regress', nsversion: '1.0',
+ identifier_prefix: 'Regress', symbol_prefix: 'regress_',
+ extra_args: ['--warn-all', '--warn-error'] + regress_gir_c_args,
+- install: get_option('installed_tests'), install_dir_gir: false,
++ install: get_option('installed_tests'), install_dir_gir: [false],
+ install_dir_typelib: installed_tests_execdir)
+ regress_typelib = regress_gir[1]
+
+@@ -91,7 +91,7 @@ if not skip_warnlib
+ warnlib_gir = gnome.generate_gir(libwarnlib, includes: ['Gio-2.0'],
+ sources: warnlib_sources, namespace: 'WarnLib', nsversion: '1.0',
+ symbol_prefix: 'warnlib_', header: 'warnlib.h',
+- install: get_option('installed_tests'), install_dir_gir: false,
++ install: get_option('installed_tests'), install_dir_gir: [false],
+ install_dir_typelib: installed_tests_execdir)
+ warnlib_typelib = warnlib_gir[1]
+ endif
+@@ -105,7 +105,7 @@ gimarshallingtests_gir = gnome.generate_gir(libgimarshallingtests,
+ includes: ['Gio-2.0'], sources: gimarshallingtests_sources,
+ namespace: 'GIMarshallingTests', nsversion: '1.0',
+ symbol_prefix: 'gi_marshalling_tests_', extra_args: '--warn-error',
+- install: get_option('installed_tests'), install_dir_gir: false,
++ install: get_option('installed_tests'), install_dir_gir: [false],
+ install_dir_typelib: installed_tests_execdir)
+ gimarshallingtests_typelib = gimarshallingtests_gir[1]
+
+diff --git a/meson.build b/meson.build
+index 437b3fd3..73d0eaca 100644
+--- a/meson.build
++++ b/meson.build
+@@ -581,7 +581,7 @@ gjs_private_gir = gnome.generate_gir(libgjs,
+ includes: ['GObject-2.0', 'Gio-2.0'], sources: libgjs_private_sources,
+ namespace: 'GjsPrivate', nsversion: '1.0', identifier_prefix: 'Gjs',
+ symbol_prefix: 'gjs_', extra_args: '--warn-error', install: true,
+- install_dir_gir: false, install_dir_typelib: pkglibdir / 'girepository-1.0')
++ install_dir_gir: [false], install_dir_typelib: pkglibdir / 'girepository-1.0')
+ gjs_private_typelib = gjs_private_gir[1]
+
+ ### Build gjs-console interpreter ##############################################
+--
+GitLab
+
diff --git a/dev-libs/gjs/gjs-1.70.0.ebuild b/dev-libs/gjs/gjs-1.70.0.ebuild
index ea422c9bfc60..6560dd57d686 100644
--- a/dev-libs/gjs/gjs-1.70.0.ebuild
+++ b/dev-libs/gjs/gjs-1.70.0.ebuild
@@ -31,6 +31,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}/gjs-1.70.0-meson-0.60.2.patch"
+)
+
src_configure() {
append-cppflags -DG_DISABLE_CAST_CHECKS
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/gjs/, dev-libs/gjs/files/
@ 2022-11-24 3:08 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-11-24 3:08 UTC (permalink / raw
To: gentoo-commits
commit: 59aefbdbc113f8093239729eaef56b44ccef035e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 04:25:42 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 03:08:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59aefbdb
dev-libs/gjs: drop 1.64.5
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/gjs/Manifest | 1 -
dev-libs/gjs/files/gjs-1.64.5-gcc-11-support.patch | 129 ---------------------
dev-libs/gjs/gjs-1.64.5.ebuild | 51 --------
3 files changed, 181 deletions(-)
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 8e7789c777d4..968140abcd22 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,4 +1,3 @@
-DIST gjs-1.64.5.tar.xz 422548 BLAKE2B dcc0b7327cbc6a1108be031c8807e61ebd3c8392916750078aaa0d82cb3bf9f7ff0e1876c250e5ddf6e9d7bb6a17d9d1fe34c1c77ff534b7ec1dd54fa05a2d1b SHA512 41a3c79888792674b2bccbf254507ed02497eb571c8ca7f47aab406d2ee29b73c98b1c7d59c33ed33bad90c6989df944d78b86d2f7e9824d598b62e29769b6dc
DIST gjs-1.72.2.tar.xz 620380 BLAKE2B 5ea15bdf25c36fa0236f03adea5b2261db3923190005754119eacd070830e7baedfa842ab273219055f67f7af535d31d5844c76eddfb03a8ec1cab57297ec258 SHA512 0dd10f40e8811bbb79c541cf3dc4e3759c0e025485e4b8ad2870dc30ac8030573300bc178c78bf2d396b86733e36b33210bfbdeead6a314e592d5b3c250a16a2
DIST gjs-1.74.0.tar.xz 638064 BLAKE2B d44f323aef9b696c7dab53fb46d6bbf142f83636bff81fe68bd30f1f897a778836d7a388c946cb86e84df15b3908d8ff14f0d994854eb2dce7af2c4e54da299b SHA512 a17947664a2bb83363ec564dcb5e619f241d0b547512042f2c0e49fbbc8ca4217b90e6b22bc2e4004e8f27e013f8520674a493f7cf3b808437b855eee3eb0408
DIST gjs-1.74.1.tar.xz 638536 BLAKE2B 375abcaa20a538cfa271f7dcf6f3715e4324ff5a4a9482ce0dd7f78213598a715ebc034f701fe458876f841f72802db4ae2aabf0abc04dc4ac5bb39c917741fd SHA512 346667accb589df0e6a045e30782017eab928115f263d36d521b61b0af38fd268bc518b8ab5ec78e5d25e0194b744a2ee59e65668da679e138b2122858ce0614
diff --git a/dev-libs/gjs/files/gjs-1.64.5-gcc-11-support.patch b/dev-libs/gjs/files/gjs-1.64.5-gcc-11-support.patch
deleted file mode 100644
index 3808b6d7862b..000000000000
--- a/dev-libs/gjs/files/gjs-1.64.5-gcc-11-support.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 757d42d87e8a3b52a0782bc9cbd33c788ecc34e4 Mon Sep 17 00:00:00 2001
-From: Philip Chimento <philip.chimento@gmail.com>
-Date: Mon, 15 Feb 2021 20:40:43 -0800
-Subject: [PATCH 1/2] GjsPrivate: Remove volatile from g_once_init_enter flag
-
-On platforms where g_once_init_enter() is defined to use C11 atomic
-builtins, passing a pointer to a volatile value will generate a warning
-in GCC 11 and later.
-
-More info about the GCC change:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95378
-https://gcc.gnu.org/pipermail/gcc-patches/2020-June/548283.html
-
-More info about changes made in GLib:
-https://gitlab.gnome.org/GNOME/glib/-/issues/600
-
-See: #376
-(cherry picked from commit 989ac9ac723dc1c8b6b8961292f236c558f5c0f0)
----
- libgjs-private/gjs-util.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libgjs-private/gjs-util.c b/libgjs-private/gjs-util.c
-index 20a732d5..f7f3189a 100644
---- a/libgjs-private/gjs-util.c
-+++ b/libgjs-private/gjs-util.c
-@@ -57,8 +57,8 @@ gjs_format_int_alternative_output(int n)
- GType
- gjs_locale_category_get_type(void)
- {
-- static volatile size_t g_define_type_id__volatile = 0;
-- if (g_once_init_enter(&g_define_type_id__volatile)) {
-+ static size_t gjs_locale_category_get_type = 0;
-+ if (g_once_init_enter(&gjs_locale_category_get_type)) {
- static const GEnumValue v[] = {
- { GJS_LOCALE_CATEGORY_ALL, "GJS_LOCALE_CATEGORY_ALL", "all" },
- { GJS_LOCALE_CATEGORY_COLLATE, "GJS_LOCALE_CATEGORY_COLLATE", "collate" },
-@@ -72,9 +72,9 @@ gjs_locale_category_get_type(void)
- GType g_define_type_id =
- g_enum_register_static(g_intern_static_string("GjsLocaleCategory"), v);
-
-- g_once_init_leave(&g_define_type_id__volatile, g_define_type_id);
-+ g_once_init_leave(&gjs_locale_category_get_type, g_define_type_id);
- }
-- return g_define_type_id__volatile;
-+ return gjs_locale_category_get_type;
- }
-
- /**
---
-2.35.1
-
-From dade6ee66e07a1865dc380060abe921eaeeae763 Mon Sep 17 00:00:00 2001
-From: Philip Chimento <philip.chimento@gmail.com>
-Date: Sun, 14 Feb 2021 12:20:09 -0800
-Subject: [PATCH 2/2] maint: Avoid g_once_init_enter error in GCC 11
-
-On platforms where g_once_init_enter() is defined to use C11 atomic
-builtins, passing a pointer to a volatile value is an error in GCC 11 and
-later, in C++.
-
-More info about the GCC change:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95378
-https://gcc.gnu.org/pipermail/gcc-patches/2020-June/548283.html
-
-However, it's my understanding that in modern C++ there is no longer a
-need to guard the initialization of these variables. Since C++11, static
-local variables in a function are guaranteed to be initialized only once,
-the first time control passes through that function. So we can just remove
-the g_once_init_enter guard.
-
-More info:
-https://en.cppreference.com/w/cpp/language/storage_duration#Static_local_variables
-
-Stack Overflow answers with quotations from the C++ standard:
-https://stackoverflow.com/a/58804/172999
-https://stackoverflow.com/a/8102145/172999
-
-Closes: #376
-(cherry picked from commit f02eaf3a9d3465915eb849428c2d9615e2184a4c)
----
- gjs/error-types.cpp | 32 +++++++++++++-------------------
- 1 file changed, 13 insertions(+), 19 deletions(-)
-
-diff --git a/gjs/error-types.cpp b/gjs/error-types.cpp
-index 86cb8789..5eba61b2 100644
---- a/gjs/error-types.cpp
-+++ b/gjs/error-types.cpp
-@@ -31,24 +31,18 @@ G_DEFINE_QUARK(gjs-js-error-quark, gjs_js_error)
- // clang-format on
-
- GType gjs_js_error_get_type(void) {
-- static volatile GType g_type_id;
--
-- if (g_once_init_enter(&g_type_id)) {
-- static GEnumValue errors[] = {
-- { GJS_JS_ERROR_ERROR, "Error", "error" },
-- { GJS_JS_ERROR_EVAL_ERROR, "EvalError", "eval-error" },
-- { GJS_JS_ERROR_INTERNAL_ERROR, "InternalError", "internal-error" },
-- { GJS_JS_ERROR_RANGE_ERROR, "RangeError", "range-error" },
-- { GJS_JS_ERROR_REFERENCE_ERROR, "ReferenceError", "reference-error" },
-- { GJS_JS_ERROR_STOP_ITERATION, "StopIteration", "stop-iteration" },
-- { GJS_JS_ERROR_SYNTAX_ERROR, "SyntaxError", "syntax-error" },
-- { GJS_JS_ERROR_TYPE_ERROR, "TypeError", "type-error" },
-- { GJS_JS_ERROR_URI_ERROR, "URIError", "uri-error" },
-- { 0, nullptr, nullptr }
-- };
--
-- g_type_id = g_enum_register_static("GjsJSError", errors);
-- }
--
-+ static const GEnumValue errors[] = {
-+ {GJS_JS_ERROR_ERROR, "Error", "error"},
-+ {GJS_JS_ERROR_EVAL_ERROR, "EvalError", "eval-error"},
-+ {GJS_JS_ERROR_INTERNAL_ERROR, "InternalError", "internal-error"},
-+ {GJS_JS_ERROR_RANGE_ERROR, "RangeError", "range-error"},
-+ {GJS_JS_ERROR_REFERENCE_ERROR, "ReferenceError", "reference-error"},
-+ {GJS_JS_ERROR_STOP_ITERATION, "StopIteration", "stop-iteration"},
-+ {GJS_JS_ERROR_SYNTAX_ERROR, "SyntaxError", "syntax-error"},
-+ {GJS_JS_ERROR_TYPE_ERROR, "TypeError", "type-error"},
-+ {GJS_JS_ERROR_URI_ERROR, "URIError", "uri-error"},
-+ {0, nullptr, nullptr}};
-+ // Initialization of static local variable guaranteed only once in C++11
-+ static GType g_type_id = g_enum_register_static("GjsJSError", errors);
- return g_type_id;
- }
---
-2.35.1
-
diff --git a/dev-libs/gjs/gjs-1.64.5.ebuild b/dev-libs/gjs/gjs-1.64.5.ebuild
deleted file mode 100644
index c9acc67c8466..000000000000
--- a/dev-libs/gjs/gjs-1.64.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples readline +sysprof test"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 sparc x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/glib-2.58.0
- dev-libs/libffi:=
- >=dev-libs/gobject-introspection-1.61.2:=
- dev-lang/spidermonkey:68
- cairo? ( x11-libs/cairo[X] )
- readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
- sysprof? ( >=dev-util/sysprof-capture-3.33.2:3 )
- virtual/pkgconfig
- test? ( sys-apps/dbus
- >=x11-libs/gtk+-3.20:3[introspection] )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gcc-11-support.patch
-)
-
-src_configure() {
- # 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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/gjs/, dev-libs/gjs/files/
@ 2024-03-02 22:51 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2024-03-02 22:51 UTC (permalink / raw
To: gentoo-commits
commit: ecabd6ebc05d773a44ec7db77220512c5fb9b2b2
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 2 22:43:25 2024 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Mar 2 22:50:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecabd6eb
dev-libs/gjs: drop 1.76.2, 1.78.0, 1.78.3
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
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(-)
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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-03-02 22:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-29 0:56 [gentoo-commits] repo/gentoo:master commit in: dev-libs/gjs/, dev-libs/gjs/files/ Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2024-03-02 22:51 Mart Raudsepp
2022-11-24 3:08 Sam James
2017-07-29 3:04 Mart Raudsepp
2017-07-14 8:52 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox