commit: a0de9f2b43147040db95775dff754daaa608c84e
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 17:13:54 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 10 17:19:46 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=a0de9f2b
dev-libs/gjs: 1.42.0 → 1.43.3
.../gjs/files/gjs-1.42.0-disable-unittest-1.patch | 48 ----------------------
...2.patch => gjs-1.43.3-disable-unittest-1.patch} | 4 +-
...3.patch => gjs-1.43.3-disable-unittest-2.patch} | 4 +-
.../gjs/{gjs-9999.ebuild => gjs-1.43.3.ebuild} | 22 +++++-----
dev-libs/gjs/gjs-9999.ebuild | 2 +-
5 files changed, 15 insertions(+), 65 deletions(-)
diff --git a/dev-libs/gjs/files/gjs-1.42.0-disable-unittest-1.patch
b/dev-libs/gjs/files/gjs-1.42.0-disable-unittest-1.patch
deleted file mode 100644
index 2ec481b..0000000
--- a/dev-libs/gjs/files/gjs-1.42.0-disable-unittest-1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 554c220e78172213e9637f9a901009b4bc964e3a Mon Sep 17 00:00:00 2001
-From: "Jasper St. Pierre" <[email protected]>
-Date: Wed, 15 Jan 2014 17:00:22 -0500
-Subject: [PATCH] gjs-tests: Remove dumpstack test
-
-OK, I lied. This is the most useless test ever.
----
- test/gjs-tests.cpp | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-diff --git a/test/gjs-tests.cpp b/test/gjs-tests.cpp
-index b79b616..6cade7b 100644
---- a/test/gjs-tests.cpp
-+++ b/test/gjs-tests.cpp
-@@ -163,22 +163,6 @@
gjstest_test_func_gjs_jsapi_util_string_js_string_utf8(void)
- }
-
- static void
--gjstest_test_func_gjs_stack_dump(void)
--{
-- GjsContext *context;
--
-- /* TODO this test could be better - maybe expose dumpstack as a JS API
-- * so that we have a JS stack to dump? At least here we're getting some
-- * coverage.
-- */
-- context = gjs_context_new();
--
-- gjs_dumpstack();
-- g_object_unref(context);
-- gjs_dumpstack();
--}
--
--static void
- gjstest_test_func_gjs_jsapi_util_error_throw(void)
- {
- GjsUnitTestFixture fixture;
-@@ -348,7 +332,6 @@ main(int argc,
- g_test_add_func("/gjs/jsutil/strip_shebang/no_shebang",
gjstest_test_strip_shebang_no_advance_for_no_shebang);
- g_test_add_func("/gjs/jsutil/strip_shebang/have_shebang",
gjstest_test_strip_shebang_advance_for_shebang);
- g_test_add_func("/gjs/jsutil/strip_shebang/only_shebang",
gjstest_test_strip_shebang_return_null_for_just_shebang);
-- g_test_add_func("/gjs/stack/dump", gjstest_test_func_gjs_stack_dump);
- g_test_add_func("/util/glib/strv/concat/null",
gjstest_test_func_util_glib_strv_concat_null);
- g_test_add_func("/util/glib/strv/concat/pointers",
gjstest_test_func_util_glib_strv_concat_pointers);
-
---
-2.1.2
-
diff --git a/dev-libs/gjs/files/gjs-1.42.0-disable-unittest-2.patch
b/dev-libs/gjs/files/gjs-1.43.3-disable-unittest-1.patch
similarity index 96%
rename from dev-libs/gjs/files/gjs-1.42.0-disable-unittest-2.patch
rename to dev-libs/gjs/files/gjs-1.43.3-disable-unittest-1.patch
index 2490a63..c6d740a 100644
--- a/dev-libs/gjs/files/gjs-1.42.0-disable-unittest-2.patch
+++ b/dev-libs/gjs/files/gjs-1.43.3-disable-unittest-1.patch
@@ -1,4 +1,4 @@
-From 4ea9fda3f323355d10e946d19d817fe8c4e6b533 Mon Sep 17 00:00:00 2001
+From 115c97bb07f71ac91e20b84f9da6389434d31999 Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <[email protected]>
Date: Sun, 12 Oct 2014 21:57:11 +0200
Subject: [PATCH 1/2] Comment broken unittests
@@ -36,5 +36,5 @@ index 6cade7b..4d6c61e 100644
g_test_run();
--
-2.1.2
+2.3.6
diff --git a/dev-libs/gjs/files/gjs-1.42.0-disable-unittest-3.patch
b/dev-libs/gjs/files/gjs-1.43.3-disable-unittest-2.patch
similarity index 93%
rename from dev-libs/gjs/files/gjs-1.42.0-disable-unittest-3.patch
rename to dev-libs/gjs/files/gjs-1.43.3-disable-unittest-2.patch
index 7b2898b..fe21f92 100644
--- a/dev-libs/gjs/files/gjs-1.42.0-disable-unittest-3.patch
+++ b/dev-libs/gjs/files/gjs-1.43.3-disable-unittest-2.patch
@@ -1,4 +1,4 @@
-From da18a2676477138693e893d3245316f987d74497 Mon Sep 17 00:00:00 2001
+From c9d63c7531a29418c64dc44556519d7bd1664ce4 Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <[email protected]>
Date: Sun, 12 Oct 2014 21:57:45 +0200
Subject: [PATCH 2/2] Comment broken JS unittest
@@ -31,5 +31,5 @@ index b086a66..0c5abb1 100644
function testToLocaleLowerCase() {
JSUnit.assertEquals("aaa", "AAA".toLocaleLowerCase());
--
-2.1.2
+2.3.6
diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-1.43.3.ebuild
similarity index 80%
copy from dev-libs/gjs/gjs-9999.ebuild
copy to dev-libs/gjs/gjs-1.43.3.ebuild
index f73a8c3..6ba4ddb 100644
--- a/dev-libs/gjs/gjs-9999.ebuild
+++ b/dev-libs/gjs/gjs-1.43.3.ebuild
@@ -1,14 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="no"
-inherit gnome2 pax-utils virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
+inherit eutils gnome2 pax-utils virtualx
DESCRIPTION="Javascript bindings for GNOME"
HOMEPAGE="https://wiki.gnome.org/Projects/Gjs";
@@ -16,11 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs";
LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
SLOT="0"
IUSE="+cairo examples gtk test"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="
>=dev-libs/glib-2.36:2
@@ -33,13 +26,18 @@ RDEPEND="
gtk? ( x11-libs/gtk+:3 )
"
DEPEND="${RDEPEND}
+ gnome-base/gnome-common
sys-devel/gettext
virtual/pkgconfig
test? ( sys-apps/dbus )
"
-# Large amount of tests are broken even in master.
-#RESTRICT="test"
+src_prepare() {
+ # Disable broken unittests
+ epatch "${FILESDIR}"/${PN}-1.43.3-disable-unittest-*.patch
+
+ gnome2_src_prepare
+}
src_configure() {
# FIXME: add systemtap/dtrace support, like in glib:2
diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild
index f73a8c3..e31ed96 100644
--- a/dev-libs/gjs/gjs-9999.ebuild
+++ b/dev-libs/gjs/gjs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
