Re: char to int conversion problem

[Quentin Spencer]

David Bateman wrote:
> Alessandro Brezzi wrote:
>   
> > David,
> >
> > 2007/4/29, David Bateman <address@hidden <mailto:address@hidden>>:
> >
> >     Try the attached patch, it works for me :-)... Note that with "" it
> >     worked before in any case..
> >
> >
> > I've tried without success to apply the patch to the SRPM (Fedora Core
> > 6); after putting your patch in the SOURCES directory and having
> > modified the octave.spec to point to the saved patch, the rpmbuild -ba
> > return:
> >
> > Patch #0 (octave-2007.04.29.david.patch):
> > + patch -p0 -s
> > 1 out of 2 hunks FAILED -- saving rejects to file
> > ./src/OPERATORS/op-int-conv.cc.rej
> >
> > This is what I've in the op-int-conv.cc.rej:
> >
> > ***************
> > *** 188,195 ****
> >    INSTALL_CONVOPS (bool)
> >    INSTALL_CONVOPS (bool_matrix)
> >    INSTALL_CONVOPS (range)
> > !   INSTALL_CONVOPS (char_matrix_sq_str)
> > !   INSTALL_CONVOPS (char_matrix_dq_str)
> >
> >    INSTALL_INT_CONV_FUNCTIONS (int8)
> >    INSTALL_INT_CONV_FUNCTIONS (int16)
> > --- 178,184 ----
> >    INSTALL_CONVOPS (bool)
> >    INSTALL_CONVOPS (bool_matrix)
> >    INSTALL_CONVOPS (range)
> > !   INSTALL_CONVOPS (char_matrix_str)
> >
> >    INSTALL_INT_CONV_FUNCTIONS (int8)
> >    INSTALL_INT_CONV_FUNCTIONS (int16)
> >
> > What is wrong? The Fedora Core6 Extra source RPM is octave.2.9.9
> >
> > Thanks in advance
> >
> >     
>
> I suspect that Fedora has an added patch, as op-int-onv.cc hasn't been
> changed for 2 years.. Can't you force it into the file, regenerate the
> patch and then rebuild? In any case I'm always based against the latest
> CVS and so I'll have a hard time trying to debug this for you..
>   

The octave-2.9.9 in Fedora 6 is unpatched. I tried the patch and it 
worked for me. I saved it as octave-2.9.9.patch, and used the following 
modifications to the .spec file:




Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-6/octave.spec,v
retrieving revision 1.48
diff -u -r1.48 octave.spec
--- octave.spec 3 Oct 2006 18:32:54 -0000       1.48
+++ octave.spec 30 Apr 2007 13:59:58 -0000
@@ -1,12 +1,13 @@
 Name:           octave
 Version:        2.9.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6

 Group:          Applications/Engineering
 License:        GPL
 Source:         
ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
+Patch:          octave-2.9.9.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo
 Requires(post): /sbin/install-info
@@ -49,6 +50,7 @@

 %prep
 %setup -q
+%patch -p0


 %build