Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25406/10.7/stable/main/finkinfo/sci
Modified Files:
octave-3.0.5.info octave-3.2.4.info octave-3.4.3.info
octave-3.6.0.info octave-3.6.1.info octave-3.6.2.info
octave-3.6.3.info
Log Message:
Disable functions in __magick_finfo__() which don't work, and return
placeholder values instead.
Also some cleanup.
Index: octave-3.6.0.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octave-3.6.0.info,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- octave-3.6.0.info 14 Nov 2012 17:19:09 -0000 1.25
+++ octave-3.6.0.info 17 Feb 2013 23:33:30 -0000 1.26
@@ -1,8 +1,8 @@
Info2: <<
Package: octave%type_pkg[-blas]%type_pkg[-x11]
-Type: -blas (-atlas -ref .), oct(3.6.0), gcc (4.7), -x11 (boolean), lapack
(3.4.2)
+Type: -blas (. -atlas -ref), oct(3.6.0), gcc (4.7), -x11 (boolean), lapack
(3.4.2)
Version: 3.6.0
-Revision: 12
+Revision: 13
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
BuildDepends: <<
@@ -26,7 +26,7 @@
flag-sort,
(%type_raw[-x11] != -x11) fltk13-aqua,
(%type_raw[-x11] = -x11) fltk-x11,
- (%type_raw[-x11] = -x11) x11-dev,
+ (%type_raw[-x11] = -x11) x11-dev,
(%type_raw[-blas] = .) arpack-ng (>=3.0.1-2) |
(%type_raw[-blas] = .) arpack-ng-mpi,
(%type_raw[-blas] = .) qrupdate (>=1.1.1-5),
(%type_raw[-blas] = -atlas) atlas (>= 3.9.76-1),
@@ -144,6 +144,12 @@
sed -i.orig -e '/truncate_int/s|\(return\) \(truncate_int\)|\1
octave_int_base<T>::\2|' \
liboctave/oct-inttypes.h
sed -i.orig -e 's|template static|template|g' liboctave/eigs-base.cc
+
+ # Until somebody figures out why the "view" and "tileName" options
cause malloc()
+ # errors and segfaults in __magick_finfo__(), disable them:
+ perl -pi -e 's|(.*View.*)|//\1|g; s|(.*TileName.*)|//\1|g'
src/DLD-FUNCTIONS/__magick_read__.cc
+ # put in placeholder values so as not to break people's scripts
+ perl -pi -e "s/(.*__magick_finfo__.*)/\1\n\tinfo.TileName = 'Not
supported in this build';\n\tinfo.View = 'Not supported in this build';\n/"
scripts/image/imfinfo.m
<<
GCC: 4.0
@@ -500,7 +506,7 @@
%p/share/%{Ni}/%v/scripts/oct-compiler.in > %p/bin/oct-cxx
chmod a+x oct-cc oct-cxx ;;
9) if [ "%m" = "x86_64" ]
- # use 10.6 compiler wrappers on
10.5/x86_64
+ # use 10.6 gcc-4.2 compiler wrappers on
10.5/x86_64
then
perl -p -e
's,COMPILER,%p/var/lib/fink/path-prefix-10.6/gcc-4.2,' \
%p/share/%{Ni}/%v/scripts/oct-compiler.in > %p/bin/oct-cc
@@ -797,6 +803,18 @@
%p/share/octave/%v/m/startup/octaverc into ConfFiles.
Have the option to run the Octave Forge package install and removal scripts
under 'xvfb-run' if that is installed.
+
+As of revision 13:
+"imfinfo" gives malloc() errors associated with the "view" and tileName
functions
+and then crashes on 64-bit platforms:
+
+http://savannah.gnu.org/bugs/?38280
+
+Changing the compiler, optimizations, or *magick didn't change anything.
+Nothing seems suspicious in Fink's *magick packages, so pending upstream
+resolution of the bug report one way or the other, disable these functions
+in magick_finfo.oct and put placeholder values for them in imfinfo.m so
+as not to break people's scripts.
<<
Homepage: http://www.gnu.org/software/octave/
License: GPL3+
Index: octave-3.2.4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octave-3.2.4.info,v
retrieving
revi ot/fink/dists/10.7/stable/main/finkinfo/sci/octave-3.2.4.info,v s
build';\n\tinfo.View = 'Not supported in this build';\n/"
scripts/image/imfinfo.m Õ
²µ* È ³µ* °Çzÿ à>³µ*
¼zÿ p»zÿ kÐÿ±µ* 6
è è ! è ! @Çzÿ °Çzÿ x ³µ*
½zÿ ²ÿ±µ* Ðÿ±µ* @Çzÿ `²ÿ±µ* Çzÿ À³µ* uºÿ±µ* p³µ* Øt³µ* ¨y³µ* Ú ²µ* x ³µ*
½zÿ p¼zÿ kÐÿ±µ* à! à! @Çzÿ °Çzÿ HNü²µ* ¾zÿ ²ÿ±µ* Ðÿ±µ* @Çzÿ `²ÿ±µ* Çzÿ pÇzÿ hÇzÿ 8Û
²µ* p °Çzÿ uºÿ±µ* Ú ²µ* ¾zÿ P½zÿ kÐÿ±µ* G H I J K M N O P @Çzÿ °Çzÿ HÓ²µ*
Àzÿ ²ÿ±µ* Ðÿ±µ* @Çzÿ 0³µ* uºÿ±µ* ³µ*
9°²µ* p³µ* Øt³µ* ¨y³µ* Ú ²µ* HÓ²µ*
Àzÿ `¾zÿ kÐÿ±µ* 8Ó²µ*
Àzÿ ¾zÿ kÐÿ±µ* (Ó²µ*
Àzÿ À¾zÿ kÐÿ±µ* Ó²µ* Àzÿ ð¾zÿ kÐÿ±µ*
¨~³µ* uºÿ±µ* ¨y³µ* p¹zÿ °²µ* e¹ÿ±µ* Øt³µ* ¿zÿ y°²µ* e¹ÿ±µ* p³µ* À¿zÿ Z°²µ* e¹ÿ±µ* Ø4°²µ* ³µ*
9°²µ* p³µ* Ø ³µ* Øt³µ* ¨y³µ* Ú ²µ* 8Û
²µ* ý{²µ* °Çzÿ p˯²µ* pÁzÿ @Àzÿ kÐÿ±µ* 5 6 7 8 : < = > ? @ B D @Çzÿ °Çzÿ
y²µ* °Çzÿ uºÿ±µ* Õ
²µ* ð¿zÿ ý{²µ* e¹ÿ±µ* Õ ²µ* Õ_@f ÆS
Qöl±í ìH²µ* °Çzÿ
y²µ* Âzÿ PÁzÿ kÐÿ±µ* u]ÞÓ 4Q
÷U^Qʧ ¶uª¹ñìò*Äv@Çzÿ °Çzÿ HNE²µ* Äzÿ ²ÿ±µ* Ðÿ±µ* @Çzÿ `²ÿ±µ* Çzÿ pÇzÿ hÇzÿ ³µ* uºÿ±µ* Ø ³µ*
³µ* Ú ²µ* Äzÿ @Âzÿ kÐÿ±µ* 8NE²µ* Äzÿ pÂzÿ kÐsion
1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- octave-3.2.4.info 14 Nov 2012 17:19:09 -0000 1.63
+++ octave-3.2.4.info 17 Feb 2013 23:33:30 -0000 1.64
@@ -1,8 +1,8 @@
Info2: <<
Package: octave%type_pkg[-blas]%type_pkg[-x11]
-Type: -blas (-atlas -ref .), oct(3.2.4), gcc (4.7), -x11 (boolean), lapack
(3.4.2)
+Type: -blas (. -atlas -ref), oct(3.2.4), gcc (4.7), -x11 (boolean), lapack
(3.4.2)
Version: 3.2.4
-Revision: 3025
+Revision: 3026
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
BuildDepends: <<
@@ -146,6 +146,12 @@
sed -i.orig -e '/truncate_int/s|\(return\) \(truncate_int\)|\1
octave_int_base<T>::\2|' \
liboctave/oct-inttypes.h
sed -i.orig -e 's|template static|template|g' liboctave/eigs-base.cc
+
+ # Until somebody figures out why the "view" and "tileName" options
cause malloc()
+ # errors and segfaults in __magick_finfo__(), disable them:
+ perl -pi -e 's|(.*View.*)|//\1|g; s|(.*TileName.*)|//\1|g'
src/DLD-FUNCTIONS/__magick_read__.cc
+ # put in placeholder values so as not to break people's scripts
+ perl -pi -e "s/(.*__magick_finfo__.*)/\1\n\tinfo.TileName = 'Not
supported in this build';\n\tinfo.View = 'Not supported in this build';\n/"
scripts/image/imfinfo.m
<<
GCC: 4.0
@@ -849,6 +855,18 @@
%p/share/octave/%v/m/startup/octaverc into ConfFiles.
Have the option to run the Octave Forge package install and removal scripts
under 'xvfb-run' if that is installed.
+
+As of revision 3026:
+"imfinfo" gives malloc() errors associated with the "view" and tileName
functions
+and then crashes on 64-bit platforms:
+
+http://savannah.gnu.org/bugs/?38280
+
+Changing the compiler, optimizations, or *magick didn't change anything.
+Nothing seems suspicious in Fink's *magick packages, so pending upstream
+resolution of the bug report one way or the other, disable these functions
+in magick_finfo.oct and put placeholder values for them in imfinfo.m so
+as not to break people's scripts.
<<
Homepage: http://www.gnu.org/software/octave/
License: GPL3
Index: octave-3.4.3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octave-3.4.3.info,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- octave-3.4.3.info 14 Nov 2012 17:19:09 -0000 1.35
+++ octave-3.4.3.info 17 Feb 2013 23:33:30 -0000 1.36
@@ -1,8 +1,8 @@
Info2: <<
Package: octave%type_pkg[-blas]%type_pkg[-x11]
-Type: -blas (-atlas -ref .), oct(3.4.3), gcc (4.7), -x11 (boolean), lapack
(3.4.2)
+Type: -blas (. -atlas -ref), oct(3.4.3), gcc (4.7), -x11 (boolean), lapack
(3.4.2)
Version: 3.4.3
-Revision: 321
+Revision: 322
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
BuildDepends: <<
@@ -147,6 +147,12 @@
sed -i.orig -e '/truncate_int/s|\(return\) \(truncate_int\)|\1
octave_int_base<T>::\2|' \
liboctave/oct-inttypes.h
sed -i.orig -e 's|template static|template|g' liboctave/eigs-base.cc
+
+ # Until somebody figures out why the "view" and "tileName" options
cause malloc()
+ # errors and segfaults in __magick_finfo__(), disable them:
+ perl -pi -e 's|(.*View.*)|//\1|g; s|(.*TileName.*)|//\1|g'
src/DLD-FUNCTIONS/__magick_read__.cc
+ # put in placeholder values so as not to break people's scripts
+ perl -pi -e "s/(.*__magick_finfo__.*)/\1\n\tinfo.TileName = 'Not
supported in this build';\n\tinfo.View = 'Not supported in this build';\n/"
scripts/image/imfinfo.m
<<
GCC: 4.0
@@ -506,7 +512,7 @@
%p/share/%{Ni}/%v/scripts/oct-compiler.in > %p/bin/oct-cxx
chmod a+x oct-cc oct-cxx
else
- # Compilers on powerpc and i386 build
with proper arch.
+ # default compilers on on powerpc and
i386 build with proper arch.
ln -s /usr/bin/gcc-4.2 oct-cc
ln -s /usr/bin/g++-4.2 oct-cxx
fi ;;
@@ -825,6 +831,18 @@
%p/share/octave/%v/m/startup/octaverc into ConfFiles.
Have the option to run the Octave Forge package install and removal scripts
under 'xvfb-run' if that is installed.
+
+As of revision 322:
+"imfinfo" gives malloc() errors associated with the "view" and tileName
functions
+and then crashes on 64-bit platforms:
+
+http://savannah.gnu.org/bugs/?38280
+
+Changing the compiler, optimizations, or *magick didn't change anything.
+Nothing seems suspicious in Fink's *magick packages, so pending upstream
+resolution of the bug report one way or the other, disable these functions
+in magick_finfo.oct and put placeholder values for them in imfinfo.m so
+as not to break people's scripts.
<<
Homepage: http://www.gnu.org/software/octave/
License: GPL3+
Index: octave-3.0.5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octave-3.0.5.info,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- octave-3.0.5.info 14 Nov 2012 17:19:09 -0000 1.57
+++ octave-3.0.5.info 17 Feb 2013 23:33:30 -0000 1.58
@@ -1,6 +1,6 @@
Info2: <<
Package: octave%type_pkg[-blas]
-Type: -blas (-atlas -ref .), oct(3.0.5), gcc (4.7), lapack (3.4.2)
+Type: -blas (. -atlas -ref), oct(3.0.5), gcc (4.7), lapack (3.4.2)
Version: 3.0.5
Revision: 3024
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
@@ -82,7 +82,7 @@
#Fink-specific structural changes
sed -e 's/@OCTVERSION@/%v/g' -e 's|@FINKPREFIX@|%p|g' %{PatchFile3} |
patch -p1
# Put in the Fink tree.
- sed -i.orig -e 's|@FINKPREFIX@|%p|g' %{Ni}-forge* %{Ni}rc
doc/interpreter/*.1 mkoctfile*in
+ sed -i.orig -e 's|@FINKPREFIX@|%p|g' doc/interpreter/*.1 mkoctfile*in
# Put OS-version-invariant links to compilers into oct-conf.h, which in
# turn gets harcoded into the Octave interpreter's 'octave_config_info'
# function, which is then used by some of the octave-forge packages at
Index: octave-3.6.3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octave-3.6.3.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- octave-3.6.3.info 14 Nov 2012 17:19:09 -0000 1.6
+++ octave-3.6.3.info 17 Feb 2013 23:33:30 -0000 1.7
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-blas]%type_pkg[-x11]
Type: -blas (. -atlas -ref), oct(3.6.3), gcc (4.7), -x11 (boolean), lapack
(3.4.2)
Version: 3.6.3
-Revision: 3
+Revision: 4
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
BuildDepends: <<
@@ -119,7 +119,7 @@
's|(#include \<)(Magick\+\+\.h\>)|\1GraphicsMagick/\2\nusing
namespace Magick;|' \
src/DLD-FUNCTIONS/__magick_read__.cc
- # fix lack of CGDisplayBitsPerPixel on 10.7
+ # fix lack of CGDisplayBitsPerPixel on 10.7+
osversion=`uname -r | cut -d. -f1`
if [ $osversion -ge 10 ]
then
@@ -150,6 +150,12 @@
sed -i.orig -e 's|template static|template|g' liboctave/eigs-base.cc
patch -p1 < %{PatchFile6}
patch -p1 < %{PatchFile7}
+
+ # Until somebody figures out why the "view" and "tileName" options
cause malloc()
+ # errors and segfaults in __magick_finfo__(), disable them:
+ perl -pi -e 's|(.*View.*)|//\1|g; s|(.*TileName.*)|//\1|g'
src/DLD-FUNCTIONS/__magick_read__.cc
+ # put in placeholder values so as not to break people's scripts
+ perl -pi -e "s/(.*__magick_finfo__.*)/\1\n\tinfo.TileName = 'Not
supported in this build';\n\tinfo.View = 'Not supported in this build';\n/"
scripts/image/imfinfo.m
<<
GCC: 4.0
@@ -185,7 +191,7 @@
CompileScript: <<
#!/bin/sh -ev
export CFLAGS='-O3 -MD'
- export CXXFLAGS="-O3 -MD -I/usr/X11R6/include"
+ export CXXFLAGS="-O3 -MD -I/usr/X11/include"
export F77=%p/bin/gfortran-fsf-%type_raw[gcc]
FLIBDIR="%p/lib/gcc%type_raw[gcc]/lib"
export FLIBS="-L${FLIBDIR} -lgfortran"
@@ -506,7 +512,7 @@
%p/share/%{Ni}/%v/scripts/oct-compiler.in > %p/bin/oct-cxx
chmod a+x oct-cc oct-cxx ;;
9) if [ "%m" = "x86_64" ]
- # use 10.6 compiler wrappers on
10.5/x86_64
+ # user 10.6 gcc-4.2 compiler wrappers
on 10.5/x86_64
then
perl -p -e
's,COMPILER,%p/var/lib/fink/path-prefix-10.6/gcc-4.2,' \
%p/share/%{Ni}/%v/scripts/oct-compiler.in > %p/bin/oct-cc
@@ -788,6 +794,18 @@
%p/share/octave/%v/m/startup/octaverc into ConfFiles.
Have the option to run the Octave Forge package install and removal scripts
under 'xvfb-run' if that is installed.
+
+As of revision 4:
+"imfinfo" gives malloc() errors associated with the "view" and tileName
functions
+and then crashes on 64-bit platforms:
+
+http://savannah.gnu.org/bugs/?38280
+
+Changing the compiler, optimizations, or *magick didn't change anything.
+Nothing seems suspicious in Fink's *magick packages, so pending upstream
+resolution of the bug report one way or the other, disable these functions
+in magick_finfo.oct and put placeholder values for them in imfinfo.m so
+as not to break people's scripts.
<<
Homepage: http://www.gnu.org/software/octave/
License: GPL3+
Index: octave-3.6.1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octave-3.6.1.info,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- octave-3.6.1.info 14 Nov 2012 17:19:09 -0000 1.21
+++ octave-3.6.1.info 17 Feb 2013 23:33:30 -0000 1.22
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-blas]%type_pkg[-x11]
Type: -blas (. -atlas -ref), oct(3.6.1), gcc (4.7), -x11 (boolean), lapack
(3.4.2)
Version: 3.6.1
-Revision: 12
+Revision: 13
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
BuildDepends: <<
@@ -26,7 +26,7 @@
flag-sort,
(%type_raw[-x11] != -x11) fltk13-aqua,
(%type_raw[-x11] = -x11) fltk-x11,
- (%type_raw[-x11] = -x11) x11-dev,
+ (%type_raw[-x11] = -x11) x11-dev,
(%type_raw[-blas] = .) arpack-ng (>=3.0.1-2) |
(%type_raw[-blas] = .) arpack-ng-mpi,
(%type_raw[-blas] = .) qrupdate (>=1.1.1-5),
(%type_raw[-blas] = -atlas) atlas (>= 3.9.76-1),
@@ -115,7 +115,7 @@
's|(#include \<)(Magick\+\+\.h\>)|\1GraphicsMagick/\2\nusing
namespace Magick;|' \
src/DLD-FUNCTIONS/__magick_read__.cc
- # fix lack of CGDisplayBitsPerPixel on 10.7
+ # fix lack of CGDisplayBitsPerPixel on 10.7+
osversion=`uname -r | cut -d. -f1`
if [ $osversion -ge 10 ]
then
@@ -144,6 +144,12 @@
sed -i.orig -e '/truncate_int/s|\(return\) \(truncate_int\)|\1
octave_int_base<T>::\2|' \
liboctave/oct-inttypes.h
sed -i.orig -e 's|template static|template|g' liboctave/eigs-base.cc
+
+ # Until somebody figures out why the "view" and "tileName" options
cause malloc()
+ # errors and segfaults in __magick_finfo__(), disable them:
+ perl -pi -e 's|(.*View.*)|//\1|g; s|(.*TileName.*)|//\1|g'
src/DLD-FUNCTIONS/__magick_read__.cc
+ # put in placeholder values so as not to break people's scripts
+ perl -pi -e "s/(.*__magick_finfo__.*)/\1\n\tinfo.TileName = 'Not
supported in this build';\n\tinfo.View = 'Not supported in this build';\n/"
scripts/image/imfinfo.m
<<
GCC: 4.0
@@ -156,8 +162,8 @@
(%type_raw[-blas] = .) --with-blas=-Wl,-framework,Accelerate \
(%type_raw[-blas] = -atlas) --with-lapack="-lptlapack" \
(%type_raw[-blas] = -atlas) --with-blas="-lptcblas -lptf77blas
-latlas" \
- (%type_raw[-blas] = -ref) --with-lapack="-L%p/lib/lapack/3.4.1
-lreflapack" \
- (%type_raw[-blas] = -ref) --with-blas="-L%p/lib/lapack/3.4.1
-lrefblas" \
+ (%type_raw[-blas] = -ref)
--with-lapack="-L%p/lib/lapack/%type_raw[lapack] -lreflapack" \
+ (%type_raw[-blas] = -ref)
--with-blas="-L%p/lib/lapack/%type_raw[lapack] -lrefblas" \
(%type_raw[-x11] != -x11) --with-framework-carbon \
(%type_raw[-x11] = -x11) --without-framework-carbon \
--with-x \
@@ -179,7 +185,7 @@
CompileScript: <<
#!/bin/sh -ev
export CFLAGS='-O3 -MD'
- export CXXFLAGS="-O3 -MD -I/usr/X11R6/include"
+ export CXXFLAGS="-O3 -MD -I/usr/X11/include"
export F77=%p/bin/gfortran-fsf-%type_raw[gcc]
FLIBDIR="%p/lib/gcc%type_raw[gcc]/lib"
export FLIBS="-L${FLIBDIR} -lgfortran"
@@ -500,7 +506,7 @@
%p/share/%{Ni}/%v/scripts/oct-compiler.in > %p/bin/oct-cxx
chmod a+x oct-cc oct-cxx ;;
9) if [ "%m" = "x86_64" ]
- # use 10.6 compiler wrappers on
10.5/x86_64
+ # user 10.6 gcc-4.2 compiler wrappers
on 10.5/x86_64
then
perl -p -e
's,COMPILER,%p/var/lib/fink/path-prefix-10.6/gcc-4.2,' \
%p/share/%{Ni}/%v/scripts/oct-compiler.in > %p/bin/oct-cc
@@ -797,6 +803,18 @@
%p/share/octave/%v/m/startup/octaverc into ConfFiles.
Have the option to run the Octave Forge package install and removal scripts
under 'xvfb-run' if that is installed.
+
+As of revision 13:
+"imfinfo" gives malloc() errors associated with the "view" and tileName
functions
+and then crashes on 64-bit platforms:
+
+http://savannah.gnu.org/bugs/?38280
+
+Changing the compiler, optimizations, or *magick didn't change anything.
+Nothing seems suspicious in Fink's *magick packages, so pending upstream
+resolution of the bug report one way or the other, disable these functions
+in magick_finfo.oct and put placeholder values for them in imfinfo.m so
+as not to break people's scripts.
<<
Homepage: http://www.gnu.org/software/octave/
License: GPL3+
Index: octave-3.6.2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octave-3.6.2.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- octave-3.6.2.info 14 Nov 2012 17:19:09 -0000 1.14
+++ octave-3.6.2.info 17 Feb 2013 23:33:30 -0000 1.15
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-blas]%type_pkg[-x11]
Type: -blas (. -atlas -ref), oct(3.6.2), gcc (4.7), -x11 (boolean), lapack
(3.4.2)
Version: 3.6.2
-Revision: 8
+Revision: 10
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
BuildDepends: <<
@@ -26,7 +26,7 @@
flag-sort,
(%type_raw[-x11] != -x11) fltk13-aqua,
(%type_raw[-x11] = -x11) fltk-x11,
- (%type_raw[-x11] = -x11) x11-dev,
+ (%type_raw[-x11] = -x11) x11-dev,
(%type_raw[-blas] = .) arpack-ng (>=3.0.1-2) |
(%type_raw[-blas] = .) arpack-ng-mpi,
(%type_raw[-blas] = .) qrupdate (>=1.1.1-5),
(%type_raw[-blas] = -atlas) atlas (>= 3.9.76-1),
@@ -115,7 +115,7 @@
's|(#include \<)(Magick\+\+\.h\>)|\1GraphicsMagick/\2\nusing
namespace Magick;|' \
src/DLD-FUNCTIONS/__magick_read__.cc
- # fix lack of CGDisplayBitsPerPixel on 10.7
+ # fix lack of CGDisplayBitsPerPixel on 10.7+
osversion=`uname -r | cut -d. -f1`
if [ $osversion -ge 10 ]
then
@@ -144,6 +144,12 @@
sed -i.orig -e '/truncate_int/s|\(return\) \(truncate_int\)|\1
octave_int_base<T>::\2|' \
liboctave/oct-inttypes.h
sed -i.orig -e 's|template static|template|g' liboctave/eigs-base.cc
+
+ # Until somebody figures out why the "view" and "tileName" options
cause malloc()
+ # errors and segfaults in __magick_finfo__(), disable them:
+ perl -pi -e 's|(.*View.*)|//\1|g; s|(.*TileName.*)|//\1|g'
src/DLD-FUNCTIONS/__magick_read__.cc
+ # put in placeholder values so as not to break people's scripts
+ perl -pi -e "s/(.*__magick_finfo__.*)/\1\n\tinfo.TileName = 'Not
supported in this build';\n\tinfo.View = 'Not supported in this build';\n/"
scripts/image/imfinfo.m
<<
GCC: 4.0
@@ -179,7 +185,7 @@
CompileScript: <<
#!/bin/sh -ev
export CFLAGS='-O3 -MD'
- export CXXFLAGS="-O3 -MD -I/usr/X11R6/include"
+ export CXXFLAGS="-O3 -MD -I/usr/X11/include"
export F77=%p/bin/gfortran-fsf-%type_raw[gcc]
FLIBDIR="%p/lib/gcc%type_raw[gcc]/lib"
export FLIBS="-L${FLIBDIR} -lgfortran"
@@ -500,7 +506,7 @@
%p/share/%{Ni}/%v/scripts/oct-compiler.in > %p/bin/oct-cxx
chmod a+x oct-cc oct-cxx ;;
9) if [ "%m" = "x86_64" ]
- # use 10.6 compiler wrappers on
10.5/x86_64
+ # user 10.6 gcc-4.2 compiler wrappers
on 10.5/x86_64
then
perl -p -e
's,COMPILER,%p/var/lib/fink/path-prefix-10.6/gcc-4.2,' \
%p/share/%{Ni}/%v/scripts/oct-compiler.in > %p/bin/oct-cc
@@ -790,6 +796,18 @@
%p/share/octave/%v/m/startup/octaverc into ConfFiles.
Have the option to run the Octave Forge package install and removal scripts
under 'xvfb-run' if that is installed.
+
+As of revision 10:
+"imfinfo" gives malloc() errors associated with the "view" and tileName
functions
+and then crashes on 64-bit platforms:
+
+http://savannah.gnu.org/bugs/?38280
+
+Changing the compiler, optimizations, or *magick didn't change anything.
+Nothing seems suspicious in Fink's *magick packages, so pending upstream
+resolution of the bug report one way or the other, disable these functions
+in magick_finfo.oct and put placeholder values for them in imfinfo.m so
+as not to break people's scripts.
<<
Homepage: http://www.gnu.org/software/octave/
License: GPL3+
------------------------------------------------------------------------------
The Go Parallel Website, sponsored by Intel - in partnership with Geeknet,
is your hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials, tech docs,
whitepapers, evaluation guides, and opinion stories. Check out the most
recent posts - join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
