Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv17646
Added Files:
fltk-backend.patch
Log Message:
forgot this patch, this one almost got away
--- NEW FILE: fltk-backend.patch ---
diff -Nurd -x'*~' octave-@OCTVERSION@.orig/src/DLD-FUNCTIONS/__glpk__.cc
octave-@OCTVERSION@/src/DLD-FUNCTIONS/__glpk__.cc
--- octave-@OCTVERSION@.orig/src/DLD-FUNCTIONS/__glpk__.cc 2009-01-16
01:46:23.000000000 -0500
+++ octave-@OCTVERSION@/src/DLD-FUNCTIONS/__glpk__.cc 2010-10-15
17:50:25.000000000 -0400
@@ -59,8 +59,20 @@
#else
-void _glp_lib_print_hook (int (*func)(void *info, char *buf), void *info);
-void _glp_lib_fault_hook (int (*func)(void *info, char *buf), void *info);
+void _glp_lib_print_hook (int (*func)(void *info, char *buf), void *info)
+{ /* stolen from glpk-4.26 */
+ int (*hook)(void *, const char *) = (int(*)(void *, const char *))
+ (func);
+ glp_term_hook(hook, info);
+ return;
+}
+
+void _glp_lib_fault_hook (int (*func)(void *info, char *buf), void *info)
+{ /* stolen from glpk-4.26 */
+ assert(func == func);
+ assert(info == info);
+ return;
+}
#endif
}
diff -Nurd octave-3.2.4/src/Makefile.in octave-3.2.4.patched/src/Makefile.in
--- octave-3.2.4/src/Makefile.in 2009-06-03 08:32:49.000000000 -0400
+++ octave-3.2.4.patched/src/Makefile.in 2011-09-05 13:35:11.000000000
-0400
@@ -63,21 +63,7 @@
OPT_IN := $(addprefix ../liboctave/, $(addsuffix .in, $(OPT_BASE)))
OPT_INC := $(addprefix ../liboctave/, $(addsuffix .h, $(OPT_BASE)))
-DLD_XSRC := amd.cc balance.cc besselj.cc betainc.cc bsxfun.cc \
- cellfun.cc chol.cc ccolamd.cc colamd.cc colloc.cc \
- conv2.cc convhulln.cc daspk.cc dasrt.cc dassl.cc det.cc \
- dispatch.cc dlmread.cc dmperm.cc eig.cc eigs.cc fft.cc \
- fft2.cc fftn.cc fftw.cc filter.cc find.cc fltk_backend.cc \
- gammainc.cc gcd.cc getgrent.cc getpwent.cc getrusage.cc \
- givens.cc hess.cc hex2num.cc inv.cc kron.cc lookup.cc \
- lsode.cc lu.cc luinc.cc matrix_type.cc max.cc md5sum.cc \
- pinv.cc qr.cc quad.cc qz.cc rand.cc rcond.cc regexp.cc \
- schur.cc sparse.cc spparms.cc sqrtm.cc svd.cc syl.cc \
- symrcm.cc symbfact.cc time.cc tsearch.cc typecast.cc \
- urlwrite.cc __contourc__.cc __delaunayn__.cc \
- __dsearchn__.cc __glpk__.cc __lin_interpn__.cc \
- __magick_read__.cc __pchip_deriv__.cc __qp__.cc \
- __voronoi__.cc __convn__.cc
+DLD_XSRC := fltk_backend.cc
DLD_SRC := $(addprefix DLD-FUNCTIONS/, $(DLD_XSRC))
------------------------------------------------------------------------------
Doing More with Less: The Next Generation Virtual Desktop
What are the key obstacles that have prevented many mid-market businesses
from deploying virtual desktops? How do next-generation virtual desktops
provide companies an easier-to-deploy, easier-to-manage and more affordable
virtual desktop model.http://www.accelacomm.com/jaw/sfnl/114/51426474/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
