openpkg-packages/js/js.patch

Index: JavaScript-0.55/JavaScript.xs
--- JavaScript-0.55/JavaScript.xs.orig	2005-06-29 21:07:06 +0200
+++ JavaScript-0.55/JavaScript.xs	2006-06-29 19:20:44 +0200
@@ -6,7 +6,7 @@
 #else
 #include <jsapi.h>
 #endif
-#include <malloc.h>
+#include <stdlib.h>
 
 #define _IS_UNDEF(a) (SvANY(a) == SvANY(&PL_sv_undef))
 
Index: JavaScript-0.55/Makefile.PL
--- JavaScript-0.55/Makefile.PL.orig	2005-06-28 23:49:03 +0200
+++ JavaScript-0.55/Makefile.PL	2006-06-29 19:20:44 +0200
@@ -10,30 +10,13 @@
 	$define .= " -DXP_UNIX";
 }
 
-my $inc = '';
-
-if(-f "/etc/gentoo-release") {
-	# Gentoo puts libjs in a slightly hidden spot.
-	$inc = '-I/usr/lib/MozillaFirefox/include/js/ -I/usr/lib/MozillaFirefox/';
-}
-
-#test for debian type include files...
-if (-f "/usr/include/smjs/jsapi.h" or -f "/usr/local/include/smjs/jsapi.h") {
-    $define .= " -DINCLUDES_IN_SMJS"
-}
+my $inc = '-I../js/src';
 
 if($ENV{JS_THREADSAFE}) {
   $define .= " -DJS_THREADSAFE";
 }
 
-my $lib = "-ljs";
-#test for debian type libsmjs
-#this could probably be done better, but I'm not sure how to
-#get this platform independant
-if (-f "/usr/lib/libsmjs.so" or -f "/usr/local/lib/libsmjs.so") {
-    $lib = "-lsmjs";
-}
-
+my $lib = "-L../js/src -ljs";
 
 WriteMakefile(
     'NAME'		=> 'JavaScript',
Index: JavaScript-SpiderMonkey-0.17/Makefile.PL
--- JavaScript-SpiderMonkey-0.17/Makefile.PL.orig	2006-07-22 22:49:27 +0200
+++ JavaScript-SpiderMonkey-0.17/Makefile.PL	2006-07-22 22:51:30 +0200
@@ -27,6 +27,7 @@
 );
 
 my %possible_install_paths = (
+  "../js/.libs"      => "../js/src",
   "../js/src/*"      => "../js/src",
   "/usr/lib"         => "/usr/include",
   "/usr/local/lib"   => "/usr/local/include",
@@ -108,7 +108,6 @@
     'NAME'		=> 'JavaScript::SpiderMonkey',
     'VERSION_FROM'	=> 'SpiderMonkey.pm', # finds $VERSION
     'PREREQ_PM'		=> {
-        'Log::Log4perl' => 0,
         'Data::Dumper'  => 0,
                            }, # e.g., Module::Name => 1.1
     ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
Index: JavaScript-SpiderMonkey-0.17/SpiderMonkey.pm
--- JavaScript-SpiderMonkey-0.17/SpiderMonkey.pm.orig	2006-06-13 15:46:00 +0200
+++ JavaScript-SpiderMonkey-0.17/SpiderMonkey.pm	2006-06-29 19:20:44 +0200
@@ -75,7 +75,6 @@
 use strict;
 use warnings;
 use Data::Dumper;
-use Log::Log4perl qw(:easy);
 
 require Exporter;
 require DynaLoader;
@@ -555,14 +554,7 @@
 ##################################################
 sub debug_enabled {
 ##################################################
-    my $logger = Log::Log4perl::get_logger("JavaScript::SpiderMonkey");
-    if(Log::Log4perl->initialized() and $logger->is_debug()) {
-        # print "DEBUG IS ENABLED\n";
-        return 1;
-    } else {
-        # print "DEBUG IS DISABLED\n";
-        return 0;
-    }
+    return 0;
 }
 
 1;