From bd7908c6630f38067350d396ac5d18c3cc2434a0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 29 Oct 2017 11:22:34 +0000 Subject: gentoo resync : 29.10.2017 --- .../JavaScript-SpiderMonkey-0.210.0-r1.ebuild | 10 +- dev-perl/JavaScript-SpiderMonkey/Manifest | 5 +- ...avaScript-SpiderMonkey-0.210.0-no-dot-inc.patch | 167 +++++++++++++++++++++ .../JavaScript-SpiderMonkey/files/mozjs185.patch | 96 +++++++----- 4 files changed, 234 insertions(+), 44 deletions(-) create mode 100644 dev-perl/JavaScript-SpiderMonkey/files/JavaScript-SpiderMonkey-0.210.0-no-dot-inc.patch (limited to 'dev-perl/JavaScript-SpiderMonkey') diff --git a/dev-perl/JavaScript-SpiderMonkey/JavaScript-SpiderMonkey-0.210.0-r1.ebuild b/dev-perl/JavaScript-SpiderMonkey/JavaScript-SpiderMonkey-0.210.0-r1.ebuild index 1bcd74535a3f..f706b2f4e578 100644 --- a/dev-perl/JavaScript-SpiderMonkey/JavaScript-SpiderMonkey-0.210.0-r1.ebuild +++ b/dev-perl/JavaScript-SpiderMonkey/JavaScript-SpiderMonkey-0.210.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -18,9 +18,9 @@ RDEPEND="dev-perl/Log-Log4perl DEPEND="${RDEPEND} dev-perl/ExtUtils-PkgConfig" -src_prepare() { - epatch "${FILESDIR}"/mozjs185.patch - perl-module_src_prepare -} +PATCHES=( + "${FILESDIR}/mozjs185.patch" + "${FILESDIR}/${P}-no-dot-inc.patch" +) SRC_TEST=do diff --git a/dev-perl/JavaScript-SpiderMonkey/Manifest b/dev-perl/JavaScript-SpiderMonkey/Manifest index f54752f87c3d..126020386fb8 100644 --- a/dev-perl/JavaScript-SpiderMonkey/Manifest +++ b/dev-perl/JavaScript-SpiderMonkey/Manifest @@ -1,6 +1,7 @@ -AUX mozjs185.patch 13492 SHA256 d6ff0ff942088d6984f23f34257a314b5572100825c933ebf33c00817ce3c42f SHA512 237e804612e37d6347291e08bd2cfb5469c990f437ad3fbb4c4c7692fdd3ad7775a9f7571d343a1e8f5ce8552b05f6e396c4035c1fdca2a43cdcd4e997aff947 WHIRLPOOL 739c72b78e2a97074a41bac640f24622dd25902227245309df891f830d251655b60fa93f897a70d173bd5eeb4d8ded49e310dfd23dd0f95e1c17718ff3344f0f +AUX JavaScript-SpiderMonkey-0.210.0-no-dot-inc.patch 3235 SHA256 965d21a5ae52ed6f7d9c90147e636864c9737a8e89f2a9fefa1d894ab0fbd121 SHA512 92c89a8e8c3e1a295ec40567b207c20f0c8f10bc36ef1327a97629da541bf924ff91bc4ff6d3d82c54a4889f3571b4f6f6d56a1dabdb81629f6b72293384cd2b WHIRLPOOL 548f9fb3c000620ba91f456d39792997e87e76418566c36a9600766f26db4eadb0b99ba87830b97d91478d3fba9ec7ba028b87a2d04cd5d3f7d0cf41b41888fc +AUX mozjs185.patch 14890 SHA256 9db5e7cfb449d51e4ba90b35706cfcf6a048ab8c7fc6ae0cfe4065b392fafb6a SHA512 23c111d840b59fd6663dd642c2fa17a1abba719b0bc797de06f002c8f7e53f83d2ad3d4eba0923adb0f42c57abfce8d3e35b22e725c0857b319c79a392b9e2f9 WHIRLPOOL c270d23a47fe917f1ba708e5e2fcedbceebe9df8ea41d321d66334cb300f12f1fb41711a071ef821daf0c62c0775eec1a117cf57de5435645ef096fb4efe6ae0 DIST JavaScript-SpiderMonkey-0.21.tar.gz 19494 SHA256 7bd1879afaf4d73f37adaab6464611a466c1b93d4fe23509d81eedf428809a1a SHA512 5a1e26d8ee15c73a566715ac150ac597e6bbf542629bf1884ae623478ed6dd1085b4afc02ab6a152c7407239ba46a9d30f9472fc6375fab823815b38372fb1ec WHIRLPOOL f7eee6e66a6945468060fded8a0b195c0a1b33df044aab1dd1cf8d630533746c11b8fa978371ee6030d1ff0c60805d4f742cd22547126080b05bcf11ab9cb6a0 -EBUILD JavaScript-SpiderMonkey-0.210.0-r1.ebuild 490 SHA256 a57943e45589815beef9dc828a8269d9c017069d021040a2c31d185ff1812c5a SHA512 41448daec28cbcc185fdde09034d437ca770ee2c9c08409abc39cc22416df0d8ebf2618a81b35edd9a683c26a74533e637fd403d8b30524ee55ede3e12b01a05 WHIRLPOOL 86333a092a7b0066261a59659251675d903f254c98137ee1c3cb6d7b93f2ac346850c32746e17da0bad5fd35cc502068ba40194539acde5701c41ec7e85a5fd1 +EBUILD JavaScript-SpiderMonkey-0.210.0-r1.ebuild 489 SHA256 52c6e759f3ae8c68737fca3b6b0ad27f85425625d059db2fa9f6a3966ba71ec4 SHA512 661bb5146d328d5d1ebde3856e2982b981e9f4013a9c3b629ef77c13015aad446c57cfecba0a1a512de1d5c1da614d86e7a37838f41bb159f6ba99378cef25be WHIRLPOOL bb9e5303a19e176608c6c7f2384a70b0311ab542190d763adc1bf2fc810d45f725264563c782f8e7bb068d2f1996b3106436c8d4e6e886c7f0404df84ff83e98 MISC ChangeLog 2679 SHA256 f5a64f3816ea1816653f4ae0d505748a1b984246e8d4300b50b7771225a0bcb7 SHA512 3ffd59949572d3861fd1abfebcc6b4b22109153d747b141f78d9caf2c772e08edfd06b6a0a634f376c47196bee4d666c2a56b57cbeceb7083de7042ed44fc22a WHIRLPOOL 31868285d91137bb34e6d90d7ee6daab7abc3ffd14e3b67c5e1bb5ccd37c5c94ccbf469324b8894dc58e89e1e5d57a1abcba9242e7e5a650c5c0116184732942 MISC ChangeLog-2015 2082 SHA256 35835bae4cc52e847c8e52e6963585a6b6c14efe8c7a42148af647f9e8a8a959 SHA512 d681a8ef47142b8f29193c4ec49ee0e2d583a7f6a7d0743708b98eb82e1ad001821a9cf5d4b87355fcf058ceae79cc46dcfbcb0bad5f71d9bee369d923c1300f WHIRLPOOL 5d9438026055dd8b5f364ee5ad41087810535bc2957df63f1f66b510a797ad24e8096ce8833e78b5ceb5badb83d6369ec8ebef56f35844d4e692fa03b8845314 MISC metadata.xml 418 SHA256 4cdd1097ea72756d0a02aaaa8b1cd206051eee4a36557cc8601595d1dc15e478 SHA512 272a2732f91a987ddc8859d39b1589f453ad1bd4f5c410c6c014b680670368a48a4835eb92ef0eb764e57e53ca8e688179db420056097d7ff2cf7cd4ec3b47db WHIRLPOOL 471d77d7bdbe8c3e2cb4242437b43541fa641d4210158fcd638e0b0ef8c24a7926b9af7ae38dfc7608991cfbded76c62421f567779e87f4389081015633fb69a diff --git a/dev-perl/JavaScript-SpiderMonkey/files/JavaScript-SpiderMonkey-0.210.0-no-dot-inc.patch b/dev-perl/JavaScript-SpiderMonkey/files/JavaScript-SpiderMonkey-0.210.0-no-dot-inc.patch new file mode 100644 index 000000000000..f76aaa95a1ce --- /dev/null +++ b/dev-perl/JavaScript-SpiderMonkey/files/JavaScript-SpiderMonkey-0.210.0-no-dot-inc.patch @@ -0,0 +1,167 @@ +From c89a871ead0a961f8a0125d875cbe28974e23f29 Mon Sep 17 00:00:00 2001 +From: Kent Fredric +Date: Thu, 26 Oct 2017 18:50:34 +1300 +Subject: Fix test failures without '.' in @INC + +Bug: https://bugs.gentoo.org/617006 +Bug: https://rt.cpan.org/Ticket/Display.html?id=121452 +--- + t/00array.t | 2 +- + t/01doc-href.t | 2 +- + t/02nav-appv.t | 2 +- + t/03doc-write.t | 2 +- + t/04loop.t | 2 +- + t/05form.t | 2 +- + t/06form2.t | 2 +- + t/07func.t | 2 +- + t/08func2.t | 2 +- + t/09meth.t | 2 +- + t/10elobj.t | 2 +- + 11 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/t/00array.t b/t/00array.t +index 3bd85a6..ba36807 100755 +--- a/t/00array.t ++++ b/t/00array.t +@@ -5,7 +5,7 @@ + print "1..1\n"; + + $init = ""; +-require "t/init.pl"; ++require "./t/init.pl"; + + $js->array_by_path("document.form"); + +diff --git a/t/01doc-href.t b/t/01doc-href.t +index 7f79c95..c545ca7 100755 +--- a/t/01doc-href.t ++++ b/t/01doc-href.t +@@ -6,7 +6,7 @@ print "1..1\n"; + + $init = ""; + +-require "t/init.pl"; ++require "./t/init.pl"; + + my $source = <array_by_path("document.array"); + my $e = $js->array_set_element($a, 0, "gurkenhobel"); +diff --git a/t/07func.t b/t/07func.t +index c0f95cc..9b12633 100644 +--- a/t/07func.t ++++ b/t/07func.t +@@ -6,7 +6,7 @@ print "1..1\n"; + + $init = ""; + $buffer = ""; +-require "t/init.pl"; ++require "./t/init.pl"; + + my $source = < +Date: Fri, 12 Oct 2012 08:09:57 +1300 +Subject: Support spidermonkey 1.8.5 and newer + +Fix support for x86_64 + +Bug: https://bugs.gentoo.org/404129 +--- + Makefile.PL | 44 ++++++++++++----- + SpiderMonkey.pm | 5 +- + SpiderMonkey.xs | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + t/error.t | 2 +- + 4 files changed, 180 insertions(+), 21 deletions(-) + +diff --git a/Makefile.PL b/Makefile.PL +index 901b773..6095dcd 100644 +--- a/Makefile.PL ++++ b/Makefile.PL @@ -12,6 +12,7 @@ ###################################################################### @@ -9,8 +25,8 @@ diff -ur a/Makefile.PL b/Makefile.PL use Getopt::Long; # Get the right lib and include dirs for different platforms -@@ -37,7 +38,7 @@ - "/usr/lib/firefox" => "/usr/include/firefox", +@@ -39,7 +40,7 @@ my %possible_install_paths = ( + "/opt/local/lib" => "/opt/local/include", # MacPorts ); -my ($JS_LIB_DIR, @JS_INCL_DIRS, $JS_LIB_NAME); @@ -18,7 +34,7 @@ diff -ur a/Makefile.PL b/Makefile.PL #### Determine compile options ############################## -@@ -57,6 +58,19 @@ +@@ -59,6 +60,19 @@ GetOptions( "JS_LIB_DIR=s" => \$JS_LIB_DIR, "JS_LIB_NAME=s" => \$JS_LIB_NAME, ); @@ -38,7 +54,7 @@ diff -ur a/Makefile.PL b/Makefile.PL if ($JS_LIB_DIR) { push @JS_INCL_DIRS, $JS_LIB_DIR; } -@@ -78,13 +92,15 @@ +@@ -80,13 +94,15 @@ foreach my $install_path(keys %possible_install_paths) { } } if (scalar(@JS_INCL_DIRS) == scalar(@c_header_files)) { @@ -55,7 +71,7 @@ diff -ur a/Makefile.PL b/Makefile.PL last; } else { @JS_INCL_DIRS = (); -@@ -94,15 +110,22 @@ +@@ -96,15 +112,22 @@ foreach my $install_path(keys %possible_install_paths) { } last if $JS_LIB_DIR; } @@ -79,7 +95,7 @@ diff -ur a/Makefile.PL b/Makefile.PL print <= 5.005 ? ## Add these new keywords supported since 5.005 (ABSTRACT_FROM => 'SpiderMonkey.pm', # retrieve abstract from module AUTHOR => 'Mike Schilli ') : ()), @@ -114,10 +130,11 @@ diff -ur a/Makefile.PL b/Makefile.PL # Un-comment this if you add C files to link with later: # 'OBJECT' => '$(O_FILES)', # link all the C files too ); -diff -ur a/SpiderMonkey.pm b/SpiderMonkey.pm ---- a/SpiderMonkey.pm 2010-05-29 02:49:31.000000000 -0400 -+++ b/SpiderMonkey.pm 2012-10-11 14:56:18.000000000 -0400 -@@ -161,9 +161,8 @@ +diff --git a/SpiderMonkey.pm b/SpiderMonkey.pm +index 223204a..de210c3 100644 +--- a/SpiderMonkey.pm ++++ b/SpiderMonkey.pm +@@ -162,9 +162,8 @@ sub init { $self->{global_class} = JavaScript::SpiderMonkey::JS_GlobalClass(); $self->{global_object} = @@ -129,9 +146,10 @@ diff -ur a/SpiderMonkey.pm b/SpiderMonkey.pm JavaScript::SpiderMonkey::JS_InitStandardClasses($self->{context}, $self->{global_object}); -diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs ---- a/SpiderMonkey.xs 2010-05-29 02:49:31.000000000 -0400 -+++ b/SpiderMonkey.xs 2012-10-11 14:56:18.000000000 -0400 +diff --git a/SpiderMonkey.xs b/SpiderMonkey.xs +index 4d97117..1cfc9a5 100644 +--- a/SpiderMonkey.xs ++++ b/SpiderMonkey.xs @@ -20,10 +20,13 @@ #define snprintf _snprintf #endif @@ -147,7 +165,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub }; -@@ -67,10 +70,18 @@ +@@ -67,10 +70,18 @@ JSBool getsetter_dispatcher( * I hope all reasonable machines can hold an address in * an int. */ @@ -167,7 +185,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs PUTBACK; call_pv("JavaScript::SpiderMonkey::getsetter_dispatcher", G_DISCARD); FREETMPS; -@@ -83,10 +94,21 @@ +@@ -83,10 +94,21 @@ JSBool getsetter_dispatcher( JSBool getter_dispatcher( JSContext *cx, JSObject *obj, @@ -189,7 +207,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs return getsetter_dispatcher(cx, obj, id, vp, "getter"); } -@@ -94,10 +116,22 @@ +@@ -94,10 +116,22 @@ JSBool getter_dispatcher( JSBool setter_dispatcher( JSContext *cx, JSObject *obj, @@ -212,7 +230,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs return getsetter_dispatcher(cx, obj, id, vp, "setter"); } -@@ -128,10 +162,19 @@ +@@ -128,10 +162,19 @@ int debug_enabled( /* --------------------------------------------------------------------- */ static JSBool @@ -232,7 +250,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs SV *sv; char *n_jstr; int n_jnum; -@@ -149,12 +192,20 @@ +@@ -149,12 +192,20 @@ FunctionDispatcher(JSContext *cx, JSObject *obj, uintN argc, ENTER ; SAVETMPS ; PUSHMARK(SP); @@ -255,7 +273,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs } PUTBACK; count = call_pv("JavaScript::SpiderMonkey::function_dispatcher", G_SCALAR); -@@ -174,7 +225,11 @@ +@@ -174,7 +225,11 @@ FunctionDispatcher(JSContext *cx, JSObject *obj, uintN argc, if(Debug) fprintf(stderr, "DEBUG: %lx is a ref!\n", (long) sv); @@ -268,7 +286,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs } else if(SvIOK(sv)) { /* It appears that we have been sent an int return -@@ -183,7 +238,11 @@ +@@ -183,7 +238,11 @@ FunctionDispatcher(JSContext *cx, JSObject *obj, uintN argc, n_jnum=SvIV(sv); if(Debug) fprintf(stderr, "DEBUG: %lx is an int (%d)\n", (long) sv,n_jnum); @@ -280,7 +298,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs } else if(SvNOK(sv)) { /* It appears that we have been sent an double return * value. Thats fine we can give javascript an double -@@ -192,11 +251,20 @@ +@@ -192,11 +251,20 @@ FunctionDispatcher(JSContext *cx, JSObject *obj, uintN argc, if(Debug) fprintf(stderr, "DEBUG: %lx is a double(%f)\n", (long) sv,n_jdbl); @@ -301,7 +319,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs } } -@@ -240,8 +308,13 @@ +@@ -240,8 +308,13 @@ ErrorReporter(JSContext *cx, const char *message, JSErrorReport *report) { } /* --------------------------------------------------------------------- */ @@ -315,7 +333,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs /* --------------------------------------------------------------------- */ PJS_Context* pcx = (PJS_Context*) JS_GetContextPrivate(cx); -@@ -374,11 +447,46 @@ +@@ -374,11 +447,46 @@ JS_NewObject(cx, class, proto, parent) JSObject *obj; CODE: { @@ -362,7 +380,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs } OUTPUT: RETVAL -@@ -404,6 +512,9 @@ +@@ -404,6 +512,9 @@ JS_InitClass(cx, iobj, parent_proto, clasp, constructor, nargs, ps, fs, static_p na = (uintN) nargs; CODE: { @@ -372,7 +390,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs obj = JS_InitClass(cx, iobj, parent_proto, clasp, constructor, nargs, ps, fs, static_ps, static_fs); -@@ -411,6 +522,9 @@ +@@ -411,6 +522,9 @@ JS_InitClass(cx, iobj, parent_proto, clasp, constructor, nargs, ps, fs, static_p XSRETURN_UNDEF; } RETVAL = obj; @@ -382,7 +400,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs } OUTPUT: RETVAL -@@ -469,11 +583,17 @@ +@@ -469,11 +583,17 @@ JS_InitStandardClasses(cx, gobj) JSBool rc; CODE: { @@ -400,7 +418,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs } OUTPUT: RETVAL -@@ -582,10 +702,18 @@ +@@ -582,10 +702,18 @@ JS_GetProperty(cx, obj, name) rc = JS_GetProperty(cx, obj, name, &vp); if(rc) { str = JS_ValueToString(cx, vp); @@ -419,7 +437,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs } } else { sv = &PL_sv_undef; -@@ -675,10 +803,18 @@ +@@ -675,10 +803,18 @@ JS_GetElement(cx, obj, idx) rc = JS_GetElement(cx, obj, idx, &vp); if(rc) { str = JS_ValueToString(cx, vp); @@ -438,7 +456,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs } } else { sv = &PL_sv_undef; -@@ -718,7 +854,11 @@ +@@ -718,7 +854,11 @@ JS_SetMaxBranchOperations(cx, max_branch_operations) PJS_Context* pcx = (PJS_Context *) JS_GetContextPrivate(cx); pcx->branch_count = 0; pcx->branch_max = max_branch_operations; @@ -450,10 +468,11 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs } OUTPUT: -diff -ur a/t/error.t b/t/error.t ---- a/t/error.t 2010-05-28 13:02:43.000000000 -0400 -+++ b/t/error.t 2012-10-11 14:56:18.000000000 -0400 -@@ -9,7 +9,7 @@ +diff --git a/t/error.t b/t/error.t +index 732226c..de977a1 100644 +--- a/t/error.t ++++ b/t/error.t +@@ -9,7 +9,7 @@ my $js1 = JavaScript::SpiderMonkey->new (); $js1->init (); ok (!$js1->eval ($jscode1)); ok ($@ !~ "\n"); @@ -462,3 +481,6 @@ diff -ur a/t/error.t b/t/error.t #print "$@\n"; my $jscode2 =<