rpms/nyquist/devel nyqsrc301-inc.patch, NONE, 1.1 nyqsrc301-javafix.patch, NONE, 1.1

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/pkgs/rpms/nyquist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv700

Added Files:
	nyqsrc301-inc.patch nyqsrc301-javafix.patch 
Log Message:


nyqsrc301-inc.patch:

--- NEW FILE nyqsrc301-inc.patch ---
diff -up nyquist/nyqstk/src/FileRead.cpp.inc nyquist/nyqstk/src/FileRead.cpp
--- nyquist/nyqstk/src/FileRead.cpp.inc	2008-07-07 23:12:46.000000000 +0200
+++ nyquist/nyqstk/src/FileRead.cpp	2008-07-07 23:12:53.000000000 +0200
@@ -33,6 +33,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <cmath>
+#include <cstring>
 
 FileRead :: FileRead()
   : fd_(0)
diff -up nyquist/nyqstk/src/Modal.cpp.inc nyquist/nyqstk/src/Modal.cpp
--- nyquist/nyqstk/src/Modal.cpp.inc	2008-07-07 23:14:50.000000000 +0200
+++ nyquist/nyqstk/src/Modal.cpp	2008-07-07 23:15:03.000000000 +0200
@@ -12,6 +12,7 @@
 /***************************************************/
 
 #include "Modal.h"
+#include <cstdlib>
 
 Modal :: Modal(unsigned int modes)
   : nModes_(modes)
diff -up nyquist/nyqstk/src/Stk.cpp.inc nyquist/nyqstk/src/Stk.cpp
--- nyquist/nyqstk/src/Stk.cpp.inc	2008-07-07 23:13:50.000000000 +0200
+++ nyquist/nyqstk/src/Stk.cpp	2008-07-07 23:14:12.000000000 +0200
@@ -13,6 +13,7 @@
 /***************************************************/
 
 #include "Stk.h"
+#include <cstdlib>
 
 StkFloat Stk :: srate_ = (StkFloat) SRATE;
 std::string Stk :: rawwavepath_ = RAWWAVE_PATH;

nyqsrc301-javafix.patch:

--- NEW FILE nyqsrc301-javafix.patch ---
diff -up nyquist/jnyqide/NyquistThread.java.javafix nyquist/jnyqide/NyquistThread.java
--- nyquist/jnyqide/NyquistThread.java.javafix	2008-01-07 16:30:33.000000000 +0100
+++ nyquist/jnyqide/NyquistThread.java	2008-07-08 00:03:20.000000000 +0200
@@ -74,7 +74,7 @@ public class NyquistThread extends Threa
 
             // find full path to instruments.txt
             String cwd = System.getProperty("user.dir");
-            soundBrowser = cwd.concat("/lib/instruments.txt");
+            soundBrowser = "/usr/share/nyquist/lib/instruments.txt";
             System.out.println("soundBrowser file is " + soundBrowser);
 
             // build XLISPPATH environment specification
@@ -104,10 +104,10 @@ public class NyquistThread extends Threa
 	    System.out.println("envp has " + systemroot);
 
             try {
-                myProcess = Runtime.getRuntime().exec( "./ny", envp );
+                myProcess = Runtime.getRuntime().exec( "ny", envp );
             } catch (Exception e3) {
-                System.out.println("no ./ny found, trying ./nyquist");
-                myProcess = Runtime.getRuntime().exec("./nyquist", envp);
+                System.out.println("no ny found, trying nyquist");
+                myProcess = Runtime.getRuntime().exec("nyquist", envp);
                 // if this one fails, we'll take the exception below
             }
             System.out.print("myProcess: " + myProcess);
diff -up nyquist/jnyqide/WordList.java.javafix nyquist/jnyqide/WordList.java
--- nyquist/jnyqide/WordList.java.javafix	2008-01-26 03:21:38.000000000 +0100
+++ nyquist/jnyqide/WordList.java	2008-07-07 23:52:16.000000000 +0200
@@ -2,7 +2,7 @@ package jnyqide;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
-import java.io.IOException;
+import java.io.*;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -47,13 +47,8 @@ public class WordList {
         //System.out.println("initializing WordList.java");
         try {
             BufferedReader inf;
-            try {
-                inf = new BufferedReader(new FileReader("NyquistWords.txt"));
-                System.out.println("\n\n***********************Opened NyquistWords.txt*********\n\n");
-            } catch (IOException e) {
-                System.out.println("could not find NyquistWords.txt, trying jnyqide/NyquistWords.txt");
-                inf = new BufferedReader(new FileReader("jnyqide/NyquistWords.txt"));
-            }
+            inf = new BufferedReader(new InputStreamReader(WordList.class.getResourceAsStream("NyquistWords.txt")));
+            System.out.println("\n\n***********************Opened NyquistWords.txt*********\n\n");
             String word, link;
             while ((word = inf.readLine()) != null) {                
                 //wordsTrie.addWord(word);
diff -up nyquist/sys/unix/linux/Makefile.javafix nyquist/sys/unix/linux/Makefile
--- nyquist/sys/unix/linux/Makefile.javafix	2008-01-17 23:27:37.000000000 +0100
+++ nyquist/sys/unix/linux/Makefile	2008-07-07 23:52:16.000000000 +0200
@@ -42,7 +42,7 @@ jnyqide/jNyqIDE.jar: $(JAVASRC)
 	javac jnyqide/*.java
 	mv jnyqide/SpecialMacHandler.hidden jnyqide/SpecialMacHandler.java
 	rm -rf jnyqide/jNyqIDE.jar
-	jar -cfm jnyqide/jNyqIDE.jar jnyqide/manifest.txt jnyqide/*.class
+	jar -cfm jnyqide/jNyqIDE.jar jnyqide/manifest.txt jnyqide/*.class jnyqide/*.txt
 
 # Standard list of includes (common to all unix versions)
 INCL = -Inyqsrc -Itran -Ixlisp -Isys/unix -Icmt -Isnd -Ifft \
@@ -62,12 +62,12 @@ CC = gcc
 # ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o
 #
 # to use OSS:
-USE_ALSA = 
-ALSA_OBJECTS = 
+USE_ALSA = -DPA_USE_ALSA=1 
+ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o 
 
 # to enable command line editing, use -DREADLINE. WARNING: THIS WILL DISABLE THE
 # ABILITY TO INTERRUPT LISP AND USE SOME OTHER HANDY CONTROL CHARACTERS
-CFLAGS = -DOSC -DCMTSTUFF -DPA_LITTLE_ENDIAN -g $(INCL) -DHAVE_LIBPTHREAD=1 \
+CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables  -DOSC -DCMTSTUFF -DPA_LITTLE_ENDIAN -g $(INCL) -DHAVE_LIBPTHREAD=1 \
      -DPA_USE_OSS=1 $(USE_ALSA) -DSTK_NYQUIST
 LN = g++
 # to disable command line editing, take out -lreadline -lcurses