From d4bd6695641f6d2ec7ff8681913d304e995902f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 May 2018 03:22:09 +0100 Subject: gentoo resync : 29.05.2018 --- gnome-extra/cjs/Manifest | 9 --- gnome-extra/cjs/cjs-3.0.1.ebuild | 71 ---------------------- gnome-extra/cjs/cjs-3.4.1.ebuild | 67 -------------------- gnome-extra/cjs/cjs-3.4.4.ebuild | 67 -------------------- .../cjs/files/cjs-2.4.0-disable-unittest-1.patch | 48 --------------- .../cjs/files/cjs-2.4.0-disable-unittest-2.patch | 40 ------------ .../cjs/files/cjs-2.4.0-disable-unittest-3.patch | 35 ----------- 7 files changed, 337 deletions(-) delete mode 100644 gnome-extra/cjs/cjs-3.0.1.ebuild delete mode 100644 gnome-extra/cjs/cjs-3.4.1.ebuild delete mode 100644 gnome-extra/cjs/cjs-3.4.4.ebuild delete mode 100644 gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-1.patch delete mode 100644 gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch delete mode 100644 gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch (limited to 'gnome-extra/cjs') diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest index a71b3aa23ad3..6f1d3b633360 100644 --- a/gnome-extra/cjs/Manifest +++ b/gnome-extra/cjs/Manifest @@ -1,13 +1,4 @@ -AUX cjs-2.4.0-disable-unittest-1.patch 1702 BLAKE2B fc1235ff92b72fa6f1abb86879e08073a9274829c00b6020ce4410e29ff433442d488de124ea8809e1c1e4ccc50996fd954840a780dc21b069bd47b6eaf6fb2e SHA512 c19b4738a1b99a916ed8a1be5817c39b3436718655d38b748c00b68d94a033f0eac2a91f4c1b3604272d23175f93839aead446ae594789b5b7938e3f27411078 -AUX cjs-2.4.0-disable-unittest-2.patch 2128 BLAKE2B f5e162bbeda9bdbcddbdccd5bb8186e9a7b8927fcb46521198f2ac7ac0eaff594382df1b016be50ac145df8961cb22e99cdfa761efc7c6555a3e079a6a04dd02 SHA512 69c40eae62f9bb5a4944d8e8d63b0ba43346d0c0547df58c4693eddf149d735d7288b2857cb1c0a652be92e8c74142f15415ff1afe17445fdc63074d5335638a -AUX cjs-2.4.0-disable-unittest-3.patch 1119 BLAKE2B ce37d0d0d9d223411de31c21be827f14b0158e07fc75b26639b3662b2e50a7b6d593d3897f4129340ea23b49fb99e7fb8f340fac3760db925762cc697dbd4151 SHA512 c94e7248c5d9623a15fa8ff4c629029a2ca976300381ae03462ae53ce9c55dcb7ec2ce9b669dfc3ab9ccc03a56f58114c9eb43cbfb22fb40b937a4e08b3569a0 AUX cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch 860 BLAKE2B 267f2ade6aeb3178f98f68a7350cfdf3bdb6b421c10f064b4decf63e98c13438d73ea3447bb351b8f4605873c35c7a5612a16898e96e37356dbb7cb1d48fefa4 SHA512 8505482101109f4f7fbc8d81084fda1c22ebaf14036138c3812ce3e7b8434edc8b0b47930652e66f11a2d5fe04f004e62791088871267b7dc43396aa026778b6 -DIST cjs-3.0.1.tar.gz 325349 BLAKE2B 084713cb4b8b32fdcc21284af798016e6ad58bdb06b3960913c1721807d89bf55ff90e1a523fbc5cc9d456a176365770d5c75d3c25fddd38abc383f9bb9dcb3f SHA512 3980e60ca005e616be264ec5bf6cb920452eec538da266dc0645ec1c340506b864886007b371b96830efa379e8ed9dd9127dc205b45e004705fd5c181d82e538 -DIST cjs-3.4.1.tar.gz 425003 BLAKE2B 6910c6658ffeaf88e671a6fa6863aa7edc48c6f053170ca735faf4ce843146e3a2d593c37828a81e33a5ec332bdbf47167b5346e5aa06f4003993efd9e2e6b3f SHA512 aab752aa03862979374bfe883d62968efab6b9137914b7ab9fcca2025bab6a6ae536db59aaee6deeeba06d2ff8c433d7f769ae0a4c0e2542e7c9a58f723d8690 -DIST cjs-3.4.4.tar.gz 426665 BLAKE2B 18e232b446945ae296d1dcf4b4624ff10b733f023da99315ba9aeee72228e115a634eb7a31a7c6192c3d1bfb8af1cd89488a9e7fe81edfa3a729bd62061e3581 SHA512 318a1beef6f6a827266170f0c5c1cfaa8bf48908f96e0ce625aee20ddcd648ea967f09f465ed504f21f923830017d3c4a01f62bab26a1cb84181a96131058d33 DIST cjs-3.6.1.tar.gz 426279 BLAKE2B b9d99e06b580b81178d0b4e2e3d854769357f28277500aed9f5bc2672f26ec72f584576c53d7aa6069737ae81bd0b1bf05d56d39c947de1206c506d72c8da075 SHA512 648997c76acb11885a53a73aa456989784fe5f5a12e0f349bce658c1eb3e3ce2b5c576ace488962c9b012fc85c2c3dd828f61f857cc9da7b60ee5fcdd7d25155 -EBUILD cjs-3.0.1.ebuild 1664 BLAKE2B ee654aebaec13f1e43f5ca10e493b18af368ce6f67cb7b20bcf59c0da29aef93d3e6c8752f34f708cff632e6a0d4b167e2eafb6729656406bb6daaa659a45349 SHA512 59de06e7315032403e0a831168ae45e5cd0da3026bd8ff583dc48d325ee4faa47951f30aa18eeb15cbcae501ab51faa7b4df81f263ad2fbb3f44ac159418fa7c -EBUILD cjs-3.4.1.ebuild 1511 BLAKE2B 49b7799669495fae66139a2e2de3a246ff5705e7cdb0ef95302331b17494f40b4f4ee5a86d6b21391cc2a6f16ae278f6074d05ef918371aec9f2d01f8f24c620 SHA512 864f3058675865af299fc7cb57d562d3c20e13f5afd3c4b807cbd579c960c2192ee96b3dc60917be4f9aa12c2690098c16481e4dd14bdb48674325ceb6f1455e -EBUILD cjs-3.4.4.ebuild 1511 BLAKE2B 49b7799669495fae66139a2e2de3a246ff5705e7cdb0ef95302331b17494f40b4f4ee5a86d6b21391cc2a6f16ae278f6074d05ef918371aec9f2d01f8f24c620 SHA512 864f3058675865af299fc7cb57d562d3c20e13f5afd3c4b807cbd579c960c2192ee96b3dc60917be4f9aa12c2690098c16481e4dd14bdb48674325ceb6f1455e EBUILD cjs-3.6.1.ebuild 2099 BLAKE2B 09dbb18fe6444150291372bdacac0a73ff6530e59f874cd2220df9a682f5af74beed4d632c6cd13c2abda6b571ef2cab4caef08111c8e3ba13e3d23e9ba37301 SHA512 9fc82a49feece084bb937045928ca3e1d33d2585bf9aaa822b4a9329e17179a3f71b3b7f83b263a5e36f3de3b1118aca81b20848dce04632ca9445d4987e7771 MISC metadata.xml 330 BLAKE2B 9fd63621288d25f6643471279d5f5be01cc61d40ad7de618ba140add34415ecacceed969c7f57f70b55b20646947b658f4451f0427aa38a82ec0c36f7ceff2d2 SHA512 04f852b262c14801c718e80553018fbb5a48725200eb3bc502f0feb552881d0d75b9aca97bc6cd4247ce753b3b6cf95c8e6a8d9214059aeed4da39a6b12e6158 diff --git a/gnome-extra/cjs/cjs-3.0.1.ebuild b/gnome-extra/cjs/cjs-3.0.1.ebuild deleted file mode 100644 index b56d402ca7ad..000000000000 --- a/gnome-extra/cjs/cjs-3.0.1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools gnome2 pax-utils virtualx - -DESCRIPTION="Linux Mint's fork of gjs for Cinnamon" -HOMEPAGE="http://cinnamon.linuxmint.com/" -SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" -SLOT="0" -IUSE="+cairo examples gtk test" -KEYWORDS="amd64 x86" - -RDEPEND=" - dev-lang/spidermonkey:24 - >=dev-libs/glib-2.37.3:2 - >=dev-libs/gobject-introspection-1.38:= - sys-libs/readline:0 - virtual/libffi - cairo? ( x11-libs/cairo[X,glib] ) - gtk? ( x11-libs/gtk+:3 ) -" -DEPEND="${RDEPEND} - gnome-base/gnome-common - sys-devel/gettext - virtual/pkgconfig - test? ( sys-apps/dbus ) -" -# Cinnamon 2.2 does not work with this release. -RDEPEND="${RDEPEND} - ! -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/gs-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/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch deleted file mode 100644 index 2490a63fea90..000000000000 --- a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4ea9fda3f323355d10e946d19d817fe8c4e6b533 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Sun, 12 Oct 2014 21:57:11 +0200 -Subject: [PATCH 1/2] Comment broken unittests - ---- - test/gjs-tests.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/test/gjs-tests.cpp b/test/gjs-tests.cpp -index 6cade7b..4d6c61e 100644 ---- a/test/gjs-tests.cpp -+++ b/test/gjs-tests.cpp -@@ -324,18 +324,18 @@ main(int argc, - - g_test_init(&argc, &argv, NULL); - -- g_test_add_func("/gjs/context/construct/destroy", gjstest_test_func_gjs_context_construct_destroy); -+ /* g_test_add_func("/gjs/context/construct/destroy", gjstest_test_func_gjs_context_construct_destroy); */ - g_test_add_func("/gjs/context/construct/eval", gjstest_test_func_gjs_context_construct_eval); -- g_test_add_func("/gjs/jsapi/util/array", gjstest_test_func_gjs_jsapi_util_array); -- g_test_add_func("/gjs/jsapi/util/error/throw", gjstest_test_func_gjs_jsapi_util_error_throw); -- g_test_add_func("/gjs/jsapi/util/string/js/string/utf8", gjstest_test_func_gjs_jsapi_util_string_js_string_utf8); -+ /* g_test_add_func("/gjs/jsapi/util/array", gjstest_test_func_gjs_jsapi_util_array); */ -+ /* g_test_add_func("/gjs/jsapi/util/error/throw", gjstest_test_func_gjs_jsapi_util_error_throw); */ -+ /* g_test_add_func("/gjs/jsapi/util/string/js/string/utf8", gjstest_test_func_gjs_jsapi_util_string_js_string_utf8); */ - 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("/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); - -- gjs_test_add_tests_for_coverage (); -+ /* gjs_test_add_tests_for_coverage (); */ - - g_test_run(); - --- -2.1.2 - diff --git a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch deleted file mode 100644 index 7b2898b75cf5..000000000000 --- a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch +++ /dev/null @@ -1,35 +0,0 @@ -From da18a2676477138693e893d3245316f987d74497 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Sun, 12 Oct 2014 21:57:45 +0200 -Subject: [PATCH 2/2] Comment broken JS unittest - ---- - installed-tests/js/testLocale.js | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/installed-tests/js/testLocale.js b/installed-tests/js/testLocale.js -index b086a66..0c5abb1 100644 ---- a/installed-tests/js/testLocale.js -+++ b/installed-tests/js/testLocale.js -@@ -1,14 +1,14 @@ - // tests for JS_SetLocaleCallbacks(). - const JSUnit = imports.jsUnit; - --function testToLocaleDateString() { -- let date = new Date(); -+//function testToLocaleDateString() { -+ //let date = new Date(); - // %A is the weekday name, this tests locale_to_unicode - // we're basically just testing for a non-crash, since - // we'd have to run in a specific locale to have any - // idea about the result. -- date.toLocaleDateString("%A"); --} -+ //date.toLocaleDateString("%A"); -+//} - - function testToLocaleLowerCase() { - JSUnit.assertEquals("aaa", "AAA".toLocaleLowerCase()); --- -2.1.2 - -- cgit v1.2.3