OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-May-2008 07:02:07
Branch: HEAD Handle: 2008050906020501
Modified files:
openpkg-src/js js.patch js.spec
Log:
modifying package: js-1.6.20070208 20080508 -> 20080509
Summary:
Revision Changes Path
1.24 +30 -30 openpkg-src/js/js.patch
1.71 +2 -2 openpkg-src/js/js.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/js/js.patch
============================================================================
$ cvs diff -u -r1.23 -r1.24 js.patch
--- openpkg-src/js/js.patch 8 May 2008 12:02:37 -0000 1.23
+++ openpkg-src/js/js.patch 9 May 2008 05:02:05 -0000 1.24
@@ -1,16 +1,16 @@
-Index: JavaScript-1.07/Makefile.PL
---- JavaScript-1.07/Makefile.PL.orig 2008-04-19 18:59:06 +0200
-+++ JavaScript-1.07/Makefile.PL 2008-05-07 09:08:08 +0200
-@@ -92,7 +92,7 @@
- # Override with $ENV{JS_LIB} and $ENV{JS_INC}
+Index: JavaScript-1.08/Makefile.PL
+--- JavaScript-1.08/Makefile.PL.orig 2008-05-08 15:23:20 +0200
++++ JavaScript-1.08/Makefile.PL 2008-05-09 06:58:41 +0200
+@@ -93,7 +93,7 @@
if (exists $ENV{JS_LIB}) {
@libs = get_paths($ENV{JS_LIB});
+ $ENV{DYLD_LIBRARY_PATH} = $ENV{LD_LIBRARY_PATH} = $ENV{JS_LIB};
- $lib = "js";
+ $lib = "js -lm";
}
if (exists $ENV{JS_INC}) {
@incs = get_paths($ENV{JS_INC});
-@@ -107,7 +107,7 @@
+@@ -108,7 +108,7 @@
push @defines, "JS_THREADSAFE" if $ENV{JS_THREADSAFE};
}
else {
@@ -19,7 +19,7 @@
push @defines, "JS_THREADSAFE" if $enable_threadsafe eq "y";
}
-@@ -116,7 +116,7 @@
+@@ -117,7 +117,7 @@
push @defines, "JS_C_STRINGS_ARE_UTF8" if $ENV{JS_UTF8};
}
else {
@@ -28,7 +28,7 @@
push @defines, "JS_C_STRINGS_ARE_UTF8" if $enable_utf8 eq "y";
}
-@@ -128,7 +128,7 @@
+@@ -129,7 +129,7 @@
}
}
else {
@@ -37,30 +37,30 @@
if ($enable_e4x eq "y") {
push @extra_headers, "jsxml";
push @defines, "JS_ENABLE_E4X";
-@@ -164,7 +164,7 @@
- END_OF_SOURCE
- close $test_script;
- my $exe = tmpnam();
--system($Config{cc}, $libs, @ccflags, "-l${lib}", "-o", $exe, (map { "-I$_"
} @incs), "test_js.c");
-+system($Config{cc}, @ccflags, (map { "-I$_" } @incs), "-o", $exe,
"test_js.c", $libs, split(/\s+/, "-l${lib}"));
- if ($?) {
- print "Failed compiling test_js.c. ABORTING\n";
- exit 0;
-@@ -174,11 +174,6 @@
- # Get js version and require 1.7 or later
- my ($engine, $version, $date) = split/\s+/, qx($exe);
- my ($v2) = $version =~ /^(\d+\.\d+)/;
--if ($v2 < 1.7) {
-- if (prompt("I require SpiderMonkey version 1.7 or later but found
${version}. Try anyways? [y/N]", "N") ne "y") {
-- exit 0;
+@@ -167,7 +167,7 @@
+ close $test_script;
+
+ my $exe = tmpnam();;
+- my $cc = join(" ", $Config{cc}, $libs, @ccflags, "-l${lib}", "-o",
$exe, (map { "-I$_" } @incs), "test_js.c");
++ my $cc = join(" ", $Config{cc}, @ccflags, (map { "-I$_" } @incs), "-o",
$exe, "test_js.c", $libs, split(/\s+/, "-l${lib}"));
+ qx($cc);
+ if ($?) {
+ print "Failed compiling test_js.c. ABORTING\n";
+@@ -178,11 +178,6 @@
+ # Get js version and require 1.7 or later
+ my ($engine, $version, $date) = split/\s+/, qx($exe);
+ my ($v2) = $version =~ /^(\d+\.\d+)/;
+- if ($v2 < 1.7) {
+- if (prompt("I require SpiderMonkey version 1.7 or later but found
${version}. Try anyways? [y/N]", "N") ne "y") {
+- exit 0;
+- }
- }
--}
- # Dispose temp stuff
- unlink($exe);
+ # Dispose temp stuff
+ unlink($exe);
Index: JavaScript-SpiderMonkey-0.19/Makefile.PL
--- JavaScript-SpiderMonkey-0.19/Makefile.PL.orig 2007-06-08 21:03:08
+0200
-+++ JavaScript-SpiderMonkey-0.19/Makefile.PL 2008-05-07 09:06:01 +0200
++++ JavaScript-SpiderMonkey-0.19/Makefile.PL 2008-05-09 06:56:29 +0200
@@ -31,6 +31,7 @@
);
@@ -79,7 +79,7 @@
($] >= 5.005 ? ## Add these new keywords supported since 5.005
Index: JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm
--- JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm.orig 2007-09-05
14:00:17 +0200
-+++ JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm 2008-05-07 09:06:01
+0200
++++ JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm 2008-05-09 06:56:29
+0200
@@ -75,7 +75,6 @@
use strict;
use warnings;
@@ -106,7 +106,7 @@
1;
Index: js-1.6.20070208/src/perlconnect/Makefile.PL.in
--- js-1.6.20070208/src/perlconnect/Makefile.PL.in.orig 2006-07-24
21:53:02 +0200
-+++ js-1.6.20070208/src/perlconnect/Makefile.PL.in 2008-05-08 13:58:18
+0200
++++ js-1.6.20070208/src/perlconnect/Makefile.PL.in 2008-05-09 06:56:29
+0200
@@ -7,5 +7,6 @@
INC => "-I..",
LIBS => "-L../../.libs -ljs @LIBS@",
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/js/js.spec
============================================================================
$ cvs diff -u -r1.70 -r1.71 js.spec
--- openpkg-src/js/js.spec 8 May 2008 12:02:37 -0000 1.70
+++ openpkg-src/js/js.spec 9 May 2008 05:02:06 -0000 1.71
@@ -23,7 +23,7 @@
# package version
%define V_js 1.6.20070208
-%define V_javascript 1.07
+%define V_javascript 1.08
%define V_javascript_spidermonkey 0.19
%define V_javascript_squish 0.07
%define V_javascript_code 0.08
@@ -42,7 +42,7 @@
Group: Language
License: MPL/GPL/LGPL
Version: %{V_js}
-Release: 20080508
+Release: 20080509
# package options
%option with_file yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
