SOURCES: freewrl-system-js.patch - for version 1.17.4

[wolvverine]

Author: wolvverine                   Date: Tue Jun  6 00:45:51 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- for version 1.17.4

---- Files affected:
SOURCES:
   freewrl-system-js.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/freewrl-system-js.patch
diff -u SOURCES/freewrl-system-js.patch:1.4 SOURCES/freewrl-system-js.patch:1.5
--- SOURCES/freewrl-system-js.patch:1.4	Sat Aug 13 22:07:31 2005
+++ SOURCES/freewrl-system-js.patch	Tue Jun  6 02:45:46 2006
@@ -1,80 +1,5 @@
 --- FreeWRL-1.13/Makefile.PL.orig	2005-04-25 15:47:19.000000000 +0200
 +++ FreeWRL-1.13/Makefile.PL	2005-04-28 22:16:18.330867064 +0200
-@@ -76,8 +76,6 @@
- 
- my $sitearchjsdir = "\$(INSTALLPRIVLIB)/auto/VRML/JS";
- 
--my $jsdir = "js1.5/src";
--my $jsobjdir;
- my $BUILD_OPT;
- 
- my $warnings_high = qq{-Wunreachable-code -Wshadow -Wcast-align};
-@@ -88,25 +86,11 @@
- my @inc;
- my @libs;
- my @ldflags;
--my @jsinc;
--my @jslibs;
- 
- 
--if ($VRML_CONFIG{PLATFORM} =~ /irix/i) {
--	$jsobjdir = "$jsdir/IRIX6.5";
--} elsif ($OS eq "Darwin") {
--	$jsobjdir = "$jsdir/Darwin_All";
--} elsif ($VRML_CONFIG{PLATFORM} =~ /sunos/i) {
--	$jsobjdir = "$jsdir/SunOS5.8";
--} else { ## linux used by default
--	$jsobjdir = "$jsdir/Linux_All";
--}
--
- if ($VRML_CONFIG{DEBUG} eq "on") {
--	$jsobjdir .= "_DBG.OBJ";
- 	$BUILD_OPT = 0;
- } else {
--	$jsobjdir .= "_OPT.OBJ";
- 	$BUILD_OPT = 1;
- }
- 
-@@ -151,9 +135,8 @@
- }
- 
- push @inc, $VRML_CONFIG{FREEWRL_INC},
--	"-I../JS/$jsobjdir", "-IJS/$jsobjdir", "-IJS/$jsdir", "-I../JS/$jsdir -ICFuncs";
--push @libs, $VRML_CONFIG{FREEWRL_LIBS}, "-L../JS/$jsobjdir", "-LJS/$jsobjdir", "-Lblib/arch/auto/VRML/VRMLFunc/", "-ljs";
--push @ldflags, $VRML_CONFIG{LDFLAGS}, "-LJS/$jsobjdir", "-Lblib/arch/auto/VRML/VRMLFunc/";
-+	"-I/usr/include/js", "-ICFuncs";
-+push @libs, $VRML_CONFIG{FREEWRL_LIBS}, "-ljs";
- 
- # push build directory, for running standalone
- 
-@@ -244,16 +227,6 @@
- 
- print STDERR "Checking for the Mozilla JavaScript Reference library and application.\n";
- 
--if (-e "JS/$jsobjdir/libjs.a" && -e "JS/$jsobjdir/libjs.so" && -e "JS/$jsobjdir/js") {
--    print STDERR "The Javascript library and application were found.\n";
--} else {
--    print STDERR "The Javascript library and application were not found - make them.\n";
--
--    chdir("JS/$jsdir");
--    system("make -f Makefile.ref BUILD_OPT=$BUILD_OPT");
--    chdir($pwd);
--}
--
- print "Done, now doing writeMakefile\n";
- 
- use ExtUtils::MakeMaker;
-@@ -402,9 +375,8 @@
- 		# Copy fonts over, etc.
- 		push(@postamble, join(
- 				  "\n",
--				qq{\# copy fonts, libjs.so over\n},
-+				qq{\# copy fonts over\n},
- 				qq{\tcp -r fonts \$(DESTINSTALLPRIVLIB)/VRML\n},
--				qq{\tcp JS/$jsobjdir/libjs.so \$(DESTDIR)$LIB_DIR\n},
- 				qq{\# copy copy the initialization file over\n},
- 				qq{\tcp CFrontEnd/fw2init.pl \$(DESTINSTALLPRIVLIB)/VRML\n},
- 				));
 @@ -412,8 +384,6 @@
  			push(@postamble, join(
  				"\n",
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/freewrl-system-js.patch?r1=1.4&r2=1.5&f=u