rpms/octave-forge/devel octave-forge-20090607-java-build.patch, NONE, 1.1 octave-forge.spec, 1.78, 1.79

[alexlan]

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23744

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-20090607-java-build.patch 
Log Message:
* Thu Aug 20 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-8
- Add patch from upstream SVN (r6098) to fix 'java' build.
- Disable spanish package: doesn't build with Octave 3.2


octave-forge-20090607-java-build.patch:
 __java__.cc |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE octave-forge-20090607-java-build.patch ---
--- extra/java-1.2.6/src/__java__.cc	2009/08/15 18:44:39	6097
+++ extra/java-1.2.6/src/__java__.cc	2009/08/16 14:24:11	6098
@@ -31,6 +31,7 @@
 
 #include <algorithm>
 #include <map>
+#include <iostream>
 #include <fstream>
 
 typedef jint (JNICALL *JNI_CreateJavaVM_t) (JavaVM **pvm, JNIEnv **penv, void *args);
@@ -584,9 +585,9 @@
       idx_vector v = idx(i).index_vector ();
       if (! error_state)
         {
-          jintArray_ref i_array (jni_env, jni_env->NewIntArray (v.capacity ()));
+          jintArray_ref i_array (jni_env, jni_env->NewIntArray (v.length ()));
           jint *buf = jni_env->GetIntArrayElements (i_array, 0);
-          for (int k=0; k<v.capacity (); k++)
+          for (int k=0; k<v.length (); k++)
             buf[k] = v(k);
           jni_env->ReleaseIntArrayElements (i_array, buf, 0);
           jni_env->SetObjectArrayElement (retval, i, i_array);
@@ -676,7 +677,7 @@
   }
 
   string_vector v (name_list);
-  return v.qsort (true);
+  return v.sort (true);
 }
 
 static octave_value convert_to_string (JNIEnv *jni_env, jobject java_object, bool force, char type)


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- octave-forge.spec	20 Aug 2009 04:12:22 -0000	1.78
+++ octave-forge.spec	20 Aug 2009 04:33:54 -0000	1.79
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -21,6 +21,7 @@ Source0:        %{name}-bundle-%{version
 Patch0:		octave-forge-20090607-includes.patch
 Patch1:		octave-forge-20090607-ann-swig-build.patch
 Patch2:		octave-forge-20090607-parallel-build.patch
+Patch3:		octave-forge-20090607-java-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  octave-devel >= 6:3.0.0-1
@@ -96,7 +97,7 @@ Provides: octave-generate_html = 0.0.9
 # Provides: octave-graceplot = 1.0.8
 Provides: octave-integration = 1.0.7
 # temporarily disable: doesn't yet build
-# Provides: octave-java = 1.2.6
+Provides: octave-java = 1.2.6
 # octave-jhandles is removed
 Provides: octave-mapping = 1.0.7
 Provides: octave-msh = 0.1.1
@@ -116,7 +117,8 @@ Provides: octave-tsa = 4.0.1
 Provides: octave-xraylib = 1.0.8
 
 # Language
-Provides: octave-spanish = 1.0.1
+# temporarily disable, doesn't build
+# Provides: octave-spanish = 1.0.1
 Provides: octave-pt_br = 1.0.8
 
 
@@ -149,8 +151,9 @@ rm main/parallel-*.tar.gz
 # 8. exclude graceplot --  doesn't build against Octave 3.2
 rm extra/graceplot-*.tar.gz
 # 9. exclude java --  doesn't build against Octave 3.2
-rm extra/java-*.tar.gz
-
+#rm extra/java-*.tar.gz
+# 10. exclude spanish -- doesn't build against Octave 3.2
+rm language/spanish-*.tar.gz
 
 #Unpack everything
 for pkg in main extra language
@@ -172,6 +175,7 @@ done
 %patch1 -p0
 #disable patch for the moment, not building 'parallel'
 #patch2 -p0
+%patch3 -p0
 
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
@@ -245,6 +249,10 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* Thu Aug 20 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-8
+- Add patch from upstream SVN (r6098) to fix 'java' build.
+- Disable spanish package: doesn't build with Octave 3.2
+
 * Thu Aug 20 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-7
 - More build failures: remove java, report upstream as (yet) another
   broken package.