summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2015-11-25 11:44:03 +0100
committerGilles Dartiguelongue <eva@gentoo.org>2015-11-26 11:50:45 +0100
commit43b79b97ec1b2b8f55852ed26ba60029083af6d9 (patch)
tree7ede7b88ff6c43fde6165bcc6320349d3b468cce /dev-libs/gjs/files
parentdev-cpp/cairomm: fix automagic dependency on cairo libs (diff)
downloadgentoo-43b79b97ec1b2b8f55852ed26ba60029083af6d9.tar.gz
gentoo-43b79b97ec1b2b8f55852ed26ba60029083af6d9.tar.bz2
gentoo-43b79b97ec1b2b8f55852ed26ba60029083af6d9.zip
dev-libs/gjs: drop old revisions
Package-Manager: portage-2.2.25
Diffstat (limited to 'dev-libs/gjs/files')
-rw-r--r--dev-libs/gjs/files/gjs-1.40.1-ownership-transfer.patch72
-rw-r--r--dev-libs/gjs/files/gjs-1.40.1-ratelimit-rss.patch45
-rw-r--r--dev-libs/gjs/files/gjs-1.42.0-disable-unittest-1.patch48
-rw-r--r--dev-libs/gjs/files/gjs-1.42.0-disable-unittest-2.patch40
-rw-r--r--dev-libs/gjs/files/gjs-1.42.0-disable-unittest-3.patch35
5 files changed, 0 insertions, 240 deletions
diff --git a/dev-libs/gjs/files/gjs-1.40.1-ownership-transfer.patch b/dev-libs/gjs/files/gjs-1.40.1-ownership-transfer.patch
deleted file mode 100644
index 2a05e0e9465a..000000000000
--- a/dev-libs/gjs/files/gjs-1.40.1-ownership-transfer.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From a432e83f967f3d15ef14cfa8040f868af13d1e74 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Tue, 6 May 2014 19:03:15 +0200
-Subject: function: respect ownership transfer of instance parameters
-
-When calling a method that is (transfer full) on the instance
-parameter we need to make an extra ref/copy.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=729545
-
-diff --git a/gi/function.cpp b/gi/function.cpp
-index 859ea44..792778c 100644
---- a/gi/function.cpp
-+++ b/gi/function.cpp
-@@ -543,6 +543,7 @@ gjs_fill_method_instance (JSContext *context,
- GIBaseInfo *container = g_base_info_get_container((GIBaseInfo *) function->info);
- GIInfoType type = g_base_info_get_type(container);
- GType gtype = g_registered_type_info_get_g_type ((GIRegisteredTypeInfo *)container);
-+ GITransfer transfer = g_callable_info_get_instance_ownership_transfer (function->info);
-
- switch (type) {
- case GI_INFO_TYPE_STRUCT:
-@@ -553,6 +554,8 @@ gjs_fill_method_instance (JSContext *context,
- return JS_FALSE;
-
- out_arg->v_pointer = gjs_gerror_from_error(context, obj);
-+ if (transfer == GI_TRANSFER_EVERYTHING)
-+ out_arg->v_pointer = g_error_copy ((GError*) out_arg->v_pointer);
- } else {
- if (!gjs_typecheck_boxed(context, obj,
- container, gtype,
-@@ -560,6 +563,14 @@ gjs_fill_method_instance (JSContext *context,
- return JS_FALSE;
-
- out_arg->v_pointer = gjs_c_struct_from_boxed(context, obj);
-+ if (transfer == GI_TRANSFER_EVERYTHING) {
-+ if (gtype != G_TYPE_NONE)
-+ out_arg->v_pointer = g_boxed_copy (gtype, out_arg->v_pointer);
-+ else {
-+ gjs_throw (context, "Cannot transfer ownership of instance argument for non boxed structure");
-+ return JS_FALSE;
-+ }
-+ }
- }
- break;
-
-@@ -569,6 +580,8 @@ gjs_fill_method_instance (JSContext *context,
- return JS_FALSE;
-
- out_arg->v_pointer = gjs_c_union_from_union(context, obj);
-+ if (transfer == GI_TRANSFER_EVERYTHING)
-+ out_arg->v_pointer = g_boxed_copy (gtype, out_arg->v_pointer);
- break;
-
- case GI_INFO_TYPE_OBJECT:
-@@ -577,10 +590,14 @@ gjs_fill_method_instance (JSContext *context,
- if (!gjs_typecheck_object(context, obj, gtype, JS_TRUE))
- return JS_FALSE;
- out_arg->v_pointer = gjs_g_object_from_object(context, obj);
-+ if (transfer == GI_TRANSFER_EVERYTHING)
-+ g_object_ref (out_arg->v_pointer);
- } else if (gjs_typecheck_is_fundamental(context, obj, JS_FALSE)) {
- if (!gjs_typecheck_fundamental(context, obj, gtype, JS_TRUE))
- return JS_FALSE;
- out_arg->v_pointer = gjs_g_fundamental_from_object(context, obj);
-+ if (transfer == GI_TRANSFER_EVERYTHING)
-+ gjs_fundamental_ref (context, out_arg->v_pointer);
- } else {
- gjs_throw_custom(context, "TypeError",
- "%s.%s is not an object instance neither a fundamental instance of a supported type",
---
-cgit v0.10.1
diff --git a/dev-libs/gjs/files/gjs-1.40.1-ratelimit-rss.patch b/dev-libs/gjs/files/gjs-1.40.1-ratelimit-rss.patch
deleted file mode 100644
index f4a95b8b371d..000000000000
--- a/dev-libs/gjs/files/gjs-1.40.1-ratelimit-rss.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 791b1a33424897549f487eb75a80f13c4f94437a Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Fri, 11 Apr 2014 18:38:57 +0200
-Subject: Ratelimit RSS-triggered GCs
-
-When loading a lot of data in memory (for example in the shell
-opening the overview, which loads all the desktop files and icons)
-the RSS can increase a lot, so we would trigger GCs continously
-without any hope of freeing memory, so ratelimit full GCs to at
-most one every 5 frames.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=728048
-
---- a/gjs/jsapi-util.cpp
-+++ b/gjs/jsapi-util.cpp
-@@ -1176,6 +1176,7 @@
- }
-
- static gulong linux_rss_trigger;
-+static gint64 last_gc_time;
- #endif
-
- /**
-@@ -1193,6 +1194,13 @@
- /* We initiate a GC if VM or RSS has grown by this much */
- gulong vmsize;
- gulong rss_size;
-+ gint64 now;
-+
-+ /* We rate limit GCs to at most one per 5 frames.
-+ One frame is 16666 microseconds (1000000/60)*/
-+ now = g_get_monotonic_time();
-+ if (now - last_gc_time < 5 * 16666)
-+ return;
-
- _linux_get_self_process_size (&vmsize, &rss_size);
-
-@@ -1209,6 +1217,7 @@
- if (rss_size > linux_rss_trigger) {
- linux_rss_trigger = (gulong) MIN(G_MAXULONG, rss_size * 1.25);
- JS_GC(JS_GetRuntime(context));
-+ last_gc_time = now;
- } else if (rss_size < (0.75 * linux_rss_trigger)) {
- /* If we've shrunk by 75%, lower the trigger */
- linux_rss_trigger = (rss_size * 1.25);
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 2ec481bc8ecb..000000000000
--- 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" <jstpierre@mecheye.net>
-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.42.0-disable-unittest-2.patch
deleted file mode 100644
index 2490a63fea90..000000000000
--- a/dev-libs/gjs/files/gjs-1.42.0-disable-unittest-2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 4ea9fda3f323355d10e946d19d817fe8c4e6b533 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-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/dev-libs/gjs/files/gjs-1.42.0-disable-unittest-3.patch b/dev-libs/gjs/files/gjs-1.42.0-disable-unittest-3.patch
deleted file mode 100644
index 7b2898b75cf5..000000000000
--- a/dev-libs/gjs/files/gjs-1.42.0-disable-unittest-3.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From da18a2676477138693e893d3245316f987d74497 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-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
-