- drop obsolete and outdated manual inclusion of rpm macros

[packages/freewrl.git] / freewrl-system-js.patch

diff --git a/freewrl-system-js.patch b/freewrl-system-js.patch
index e1a9e60aa49290047ba9a4a39abb04d2c31654ed..d23f217b9a24c97e618f56e7b2e33f9860d1d1f9 100644 (file)
--- a/freewrl-system-js.patch
+++ b/freewrl-system-js.patch
@@ -1,36 +1,107 @@
---- FreeWRL-0.37/JS/Makefile.PL.orig   Fri Dec 20 19:00:04 2002
-+++ FreeWRL-0.37/JS/Makefile.PL        Thu Jan 23 23:09:31 2003
-@@ -30,20 +30,6 @@
- ## Check for required Javascript libraries,
- ## if they don't exist, make them.
+--- freewrl-1.19.8/Makefile.PL.orig    2008-01-12 18:27:02.568622000 +0100
++++ freewrl-1.19.8/Makefile.PL 2008-01-12 19:24:10.279956593 +0100
+@@ -108,8 +108,6 @@
+ ## Handle platform-specific compile options for the Javascript engine
+ ## and others specific to FreeWRL.
  
--$SRCDIR="js/src";
+-my $jsdir = "js1.5/src";
+-my $jsobjdir;
+ my $noStackProtector = "";
+ 
+ my @inc;
+@@ -119,21 +117,6 @@
+ my @jslibs;
+ 
+ 
+-if ($OS eq  "IRIX64") {
+-      $jsobjdir = "$jsdir/IRIX6.5";
+-} elsif ($OS eq "Darwin") {
+-      $jsobjdir = "$jsdir/Darwin";
+-} elsif ($OS eq "SunOS") {
+-      $jsobjdir = "$jsdir/SunOS5.8";
+-} else { ## linux used by default
+-      $jsobjdir = "$jsdir/Linux_All";
+-}
+-
+-#location of the spidermonkey js engine.
+-$jsobjdir .= "_OPT.OBJ";
+-my $libFreeWRLjspath = "./JS/".$jsobjdir."/libFreeWRLjs.so";
 -
--print "Checking for the Mozilla JavaScript Reference library and application.\n";
--if (-e "$SRCDIR/Linux_All_OPT.OBJ/libjs.a"
--      && -e "$SRCDIR/Linux_All_OPT.OBJ/libjs.so"
--      && -e "$SRCDIR/Linux_All_OPT.OBJ/js") {
--    print "The Javascript library and application were found.\n";
--} else {
--    print "The Javascript library and application were not found - make them.\n";
--    chdir("$SRCDIR");
--    system("make -f Makefile.ref BUILD_OPT=1");
--    chdir($pwd);
+-#print "the javascript engine should be located at: $libFreeWRLjspath\n";
+ 
+ 
+ 
+@@ -155,11 +138,8 @@
+       print "this system does not use the -fno-stack-protector flag\n";
+ }
+ 
+-push @inc, $VRML_CONFIG{FREEWRL_INC}, "-IJS/$jsobjdir", "-IJS/$jsdir", "-ICFuncs -ICFrontEnd ";
+-push @libs, $VRML_CONFIG{FREEWRL_LIBS}, "-LJS/$jsobjdir", "-lFreeWRLjs";
+-if ($OS eq "Darwin") {
+-push @ldflags, $VRML_CONFIG{LDFLAGS}, "-LJS/$jsobjdir";
 -}
++push @inc, $VRML_CONFIG{FREEWRL_INC}, "-I/usr/include/js", "-ICFuncs -ICFrontEnd ";
++push @libs, $VRML_CONFIG{FREEWRL_LIBS}, "-ljs";
+ 
+ # push build directory, for running standalone
+ 
+@@ -314,10 +294,7 @@
+       }
+       if ($OS eq "Linux") {
+               print MK "\tinstall -D libFreeWRLFunc.so \$(DESTDIR)\$(LIB_DIR)/libFreeWRLFunc.so\n";
+-              print MK "\tinstall -D $libFreeWRLjspath \$(DESTDIR)\$(LIB_DIR)/libFreeWRLjs.so\n";
+-
+               if ($CHCON ne "") {
+-                      print MK "\t-$CHCON -t texrel_shlib_t  \$(DESTDIR)\$(LIB_DIR)/libFreeWRLjs.so\n";
+                       print MK "\t-$CHCON -t texrel_shlib_t  \$(DESTDIR)\$(LIB_DIR)/libFreeWRLFunc.so\n";
+               }
+               if ($HAVE_UBUNTU eq "NO") {
+@@ -461,11 +438,9 @@
+ }
+ 
+ sub write_linux_makefile_javascript() {
+-      #############################################################################
+-      ## make the Javascript libraries if needed
+     
+       print MK "Javascript:\n";
+-      print MK "\tcd JS/$jsdir; make -f Makefile.ref BUILD_OPT=1 STACKPROT=$noStackProtector; cd $pwd\n";
++      print MK "\n";
+ }
+ 
+ 
+@@ -556,7 +531,6 @@
+               print MK "\techo \"%files\" >> $specfile\n";
+               print MK "\techo \"%defattr(-,root,root)\" >> $specfile\n";
+               print MK "\techo \"\$(DESTDIR)\$(LIB_DIR)/libFreeWRLFunc.so\" >> $specfile\n";
+-              print MK "\techo \"\$(DESTDIR)\$(LIB_DIR)/libFreeWRLjs.so\" >> $specfile\n";
+               print MK "\techo \"\$(DESTDIR)\$(FRONTEND_DIR)/FreeWRL_Message\" >> $specfile\n";
+               print MK "\techo \"\$(DESTDIR)\$(FRONTEND_DIR)/freewrl\" >> $specfile\n";
+               print MK "\techo \"\$(DESTDIR)\$(FRONTEND_DIR)/FreeWRL_SoundServer\" >> $specfile\n";
+@@ -597,19 +571,11 @@
+       print MK "      rm -f java/classes/sai/eai/*class\n";
+       print MK "      rm -f java/classes/org/web3d/x3d/sai/*class\n";
+       print MK "      rm -f java/classes/vrml.jar\n";
+-      print MK "      rm -rf JS/$jsobjdir\n";
+ 
+       if ($OS eq "Darwin") {
+               print MK "      rm -f /usr/local/lib/libFreeWRLFunc.dylib\n";
+-              print MK "      rm -f /usr/local/lib/libFreeWRLjs.dylib\n";
+       }
+ 
+-      # remove other JS directories
+-      $jsobjdir =~s/src/src\/editline/;
+-      print MK "      rm -rf JS/$jsobjdir\n";
+-      $jsobjdir =~ s/editline/fdlibm/;
+-      print MK "      rm -rf JS/$jsobjdir\n";
 -
- use ExtUtils::MakeMaker;
- 
- ## get rid of -W eventually
---- FreeWRL-0.37/vrml.conf.orig        Thu Jan 23 22:58:15 2003
-+++ FreeWRL-0.37/vrml.conf     Thu Jan 23 23:10:54 2003
-@@ -28,8 +28,8 @@
- 
- ############################################################################
- # Javascript lib & include (relative to the JS/ directory)
--    JS_LIBS => '-Ljs/src/Linux_All_OPT.OBJ -ljs',
--    JS_INC => '-Ijs/src/Linux_All_OPT.OBJ -Ijs/src',
-+    JS_LIBS => '-ljs',
-+    JS_INC => '-I/usr/include/js',
- 
- ############################################################################
- # Saxon location - required for x3d running.
+       print MK "\n#remove installed images\n";
+       print MK "distclean:    clean\n";
+       print MK "\trm -f \$(DESTDIR)\$(FRONTEND_DIR)/freewrl\n";
+@@ -617,7 +583,6 @@
+       
+       if ($OS eq "Linux") {
+               print MK "\trm -f \$(DESTDIR)\$(LIB_DIR)/libFreeWRLFunc.so\n";
+-              print MK "\trm -f \$(DESTDIR)\$(LIB_DIR)/libFreeWRLjs.so\n";
+               if ($HAVE_UBUNTU eq "NO") {
+ #                     print MK "\t/sbin/ldconfig\n";
+               }