cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to freemat 3.0

Browse Source 
you need at least 9 days old current system for it (correct
_POSIX_THREAD_ATTR_STACKSIZE define for qt4).
all the patches already got committed upstream.
"please commit!" steven@
This commit is contained in:
martynas 2007-03-24 14:14:50 +00:00
parent ec0058ce82
commit f92a087f6f
30 changed files with 1701 additions and 1542 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
math/freemat/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.5 2006/12/16 12:22:34 espie Exp $
# $OpenBSD: Makefile,v 1.6 2007/03/24 14:14:50 martynas Exp $
COMMENT= "environment for rapid engineering and scientific processing"
VERSION= 2.0
DISTNAME= FreeMat-${VERSION}
PKGNAME= freemat-${VERSION}p1
V= 3.0
DISTNAME= FreeMat-${V}
PKGNAME= freemat-${V}
CATEGORIES= math
CATEGORIES= graphics math
HOMEPAGE= http://freemat.sourceforge.net/
@ -30,22 +30,23 @@ LIB_DEPENDS= avcall::devel/ffcall \
fftw3.>=4::math/fftw3,double \
fftw3f.>=4::math/fftw3,float \
lapack.>=1::math/lapack \
matio::math/matio \
umfpack::math/umfpack \
QtGui,QtOpenGL::x11/qt4
USE_X11= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf no-autoheader
AUTOCONF_VERSION= 2.59
CONFIGURE_ENV= F77=${FC} \
CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/amd -I${LOCALBASE}/include/umfpack -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
PKG_CONFIG_LIBDIR="${LOCALBASE}/lib/qt4"
MAKE_FLAGS= MYDEFS="-DBASEPATH=\\\"../share/${DISTNAME}\\\""
SUBST_VARS= V
post-install:
@rm -f ${PREFIX}/share/${DISTNAME}/mfiles
@cd ${PREFIX}/share/${DISTNAME} && ln -sf help/MFiles mfiles
@cd ${PREFIX}/bin && mv FreeMat freemat
@mv ${PREFIX}/bin/FreeMat ${PREFIX}/bin/freemat
.include <bsd.port.mk>

9
math/freemat/distinfo
View File

@ -1,4 +1,5 @@
MD5 (FreeMat-2.0.tar.gz) = 9325893a4babe0b4912c475afd9729e6
RMD160 (FreeMat-2.0.tar.gz) = 16a4e72a72cce9c7eae26b944fa904ac0b4c05c1
SHA1 (FreeMat-2.0.tar.gz) = d56540137c67215c3466366d7e37962f52003023
SIZE (FreeMat-2.0.tar.gz) = 16338697
MD5 (FreeMat-3.0.tar.gz) = d972d9393227fce4925e810034f02538
RMD160 (FreeMat-3.0.tar.gz) = 43d14276fb43fe1127d284cbc932d6e47de8d9dc
SHA1 (FreeMat-3.0.tar.gz) = 8e4aa8a0f41034028fec0e5fe702e60d88123be8
SHA256 (FreeMat-3.0.tar.gz) = c49ddfe590ebc8497a5d8191dd76c459c2bf9420556c8bdb93ce2f77a28a08cd
SIZE (FreeMat-3.0.tar.gz) = 4592674

47
math/freemat/patches/patch-acinclude_m4 Normal file
View File

@ -0,0 +1,47 @@
$OpenBSD: patch-acinclude_m4,v 1.1 2007/03/24 14:14:50 martynas Exp $
--- acinclude.m4.orig Thu Dec 28 16:03:20 2006
+++ acinclude.m4 Sat Mar 3 14:26:35 2007
@@ -302,6 +302,22 @@ if test x"$found_amd" == xyes; then
LIBS="-lamd $LIBS"
fi
+# umfpack depends on blas.
+if test x"$is_osx" == xyes; then
+ LIBS="$LIBS -framework vecLib"
+ found_blas="yes"
+ found_lapack="yes"
+else
+ ACX_BLAS(found_blas="yes",found_blas="no")
+ if test x"$found_blas" == xyes; then
+ LIBS="$BLAS_LIBS $LIBS"
+ fi
+ ACX_LAPACK(found_lapack="yes",found_lapack="no")
+ if test x"$found_lapack" == xyes; then
+ LIBS="$LAPACK_LIBS $LIBS"
+ fi
+fi
+
AC_CHECK_LIB(umfpack,umfpack_zl_solve,found_umfpack="yes",found_umfpack="no")
AC_CHECK_HEADER(umfpack.h,[],found_umfpack="no")
@@ -328,20 +344,6 @@ if test x"$found_fftw3" == xyes; then
AC_DEFINE(HAVE_FFTW, 1, [Set to 1 if you have the double precision version of FFTW installed])
fi
-if test x"$is_osx" == xyes; then
- LIBS="$LIBS -framework vecLib"
- found_blas="yes"
- found_lapack="yes"
-else
- ACX_BLAS(found_blas="yes",found_blas="no")
- if test x"$found_blas" == xyes; then
- LIBS="$BLAS_LIBS $LIBS"
- fi
- ACX_LAPACK(found_lapack="yes",found_lapack="no")
- if test x"$found_lapack" == xyes; then
- LIBS="$LAPACK_LIBS $LIBS"
- fi
-fi
AC_F77_FUNC(znaupd)
if test x"$znaupd" == x"unknown"; then
znaupd="znaupd_"

32
math/freemat/patches/patch-configure
View File

@ -1,32 +0,0 @@
$OpenBSD: patch-configure,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- configure.orig Tue Jun 6 03:29:51 2006
+++ configure Thu Oct 19 11:44:29 2006
@@ -4887,8 +4887,8 @@ esac
eval $_lcl_result_var='$_lcl_result_tmp'
done
-CPPFLAGS="$CPPFLAGS -I$cdir/extern/Root/include -DBASEPATH=\\\"$bin_to_data/FreeMat-$VERSION\\\""
-FOO=`echo $QT_LIBS | sed -e 's/-L/-Wl,-rpath,/g' | sed -e 's/-l\w*//g'`
+CPPFLAGS="$CPPFLAGS -I$cdir/extern/Root/include"
+FOO=`echo $QT_LIBS`
{ echo "$as_me:$LINENO: Extra lib flags added $FOO" >&5
echo "$as_me: Extra lib flags added $FOO" >&6;}
LDFLAGS="$LDFLAGS -L$cdir/extern/Root/lib $FOO"
@@ -5476,7 +5476,7 @@ if test "${ac_cv_lib_umfpack_umfpack_zl_
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lumfpack $LIBS"
+LIBS="-lumfpack -lblas $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5541,7 +5541,7 @@ else
fi
if test x"$found_umfpack" == xyes; then
- LIBS="-lumfpack $LIBS"
+ LIBS="-lumfpack -lblas $LIBS"
fi
echo "$as_me:$LINENO: checking for fftwf_malloc in -lfftw3f" >&5
echo $ECHO_N "checking for fftwf_malloc in -lfftw3f... $ECHO_C" >&6

15
math/freemat/patches/patch-configure_in Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-configure_in,v 1.1 2007/03/24 14:14:50 martynas Exp $
--- configure.in.orig Tue Jan 9 06:32:57 2007
+++ configure.in Sat Mar 24 15:46:51 2007
@@ -62,9 +62,8 @@ if (test "$cross_compiling" = "no") && (test "$is_mac"
fi
is_win32="false"
platform="--linux"
- FOO=`echo $QT_LIBS | sed -e 's/-L/-Wl,-rpath,/' | sed -e 's/-L.*//'`
- AC_MSG_NOTICE([Extra lib flags added $FOO])
- LDFLAGS="$LDFLAGS $FOO"
+ AC_MSG_NOTICE([Extra lib flags added $QT_LIBS])
+ LDFLAGS="$LDFLAGS $QT_LIBS"
fi
if (test "$cross_compiling" = "yes"); then

14
math/freemat/patches/patch-libs_libCore_Analyze_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-libs_libCore_Analyze_cpp,v 1.1 2007/03/24 14:14:50 martynas Exp $
--- libs/libCore/Analyze.cpp.orig Sat Mar 3 13:21:28 2007
+++ libs/libCore/Analyze.cpp Sat Mar 3 13:23:47 2007
@@ -55,6 +55,10 @@ double getcurrenttime() {
#include "LAPACK.hpp"
#include "MemPtr.hpp"
+/* some systems do not have abs() for 64-bit integers */
+int64 abs(int64 a) {
+ return a < 0 ? -a : a;
+}
ArrayVector HandleEmpty(Array arg) {
ArrayVector retArray;

24
math/freemat/patches/patch-libs_libCore_Directory_cpp
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-libs_libCore_Directory_cpp,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- libs/libCore/Directory.cpp.orig Thu Oct 19 14:33:10 2006
+++ libs/libCore/Directory.cpp Thu Oct 19 14:33:19 2006
@@ -238,7 +238,7 @@ namespace FreeMat {
//@>
//!
ArrayVector PrintWorkingDirectoryFunction(int nargout, const ArrayVector& arg) {
- char buffer[1000];
+ char buffer[PATH_MAX];
getcwd(buffer,sizeof(buffer));
ArrayVector retval;
retval.push_back(Array::stringConstructor(buffer));
$OpenBSD: patch-libs_libCore_Directory_cpp,v 1.2 2007/03/24 14:14:50 martynas Exp $
--- libs/libCore/Directory.cpp.orig Thu Dec 28 16:02:21 2006
+++ libs/libCore/Directory.cpp Sat Mar 24 15:46:48 2007
@@ -249,7 +249,7 @@ ArrayVector DirSepFunction(int nargout, const ArrayVec
//@>
//!
ArrayVector PrintWorkingDirectoryFunction(int nargout, const ArrayVector& arg) {
- char buffer[1000];
+ char buffer[PATH_MAX];
getcwd(buffer,sizeof(buffer));
ArrayVector retval;
retval.push_back(Array::stringConstructor(buffer));

26
math/freemat/patches/patch-libs_libCore_IO_cpp
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-libs_libCore_IO_cpp,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- libs/libCore/IO.cpp.orig Mon May 29 22:24:21 2006
+++ libs/libCore/IO.cpp Thu Oct 19 14:13:39 2006
@@ -31,6 +31,13 @@
#include "matio.h"
#include "Sparse.hpp"
+/* expecting an earlier version of matio, which includes these
+ prototypes in matio.h */
+EXTERN int mat_snprintf(char *str,size_t count,const char *fmt,...);
+EXTERN int mat_asprintf(char **ptr,const char *format, ...);
+EXTERN int mat_vsnprintf(char *str,size_t count,const char *fmt,va_list args);
+EXTERN int mat_vasprintf(char **ptr,const char *format,va_list ap);
+
namespace FreeMat {
class FilePtr {
public:
@@ -2189,7 +2196,7 @@ namespace FreeMat {
Mat_LogInit("dummy");
mat_t *mat = Mat_Open(fname, MAT_ACC_RDONLY);
if (!mat) {
- mat = Mat_Open(fname, MAT_ACC_RDONLY | MAT_V4);
+ mat = Mat_Open(fname, MAT_ACC_RDONLY | MAT_FT_MAT4);
}
if (mat) {
matvar_t *matvar;

24
math/freemat/patches/patch-libs_libCore_Inspect_cpp
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-libs_libCore_Inspect_cpp,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- libs/libCore/Inspect.cpp.orig Tue Jun 6 01:31:17 2006
+++ libs/libCore/Inspect.cpp Sat Oct 21 18:17:34 2006
@@ -149,7 +149,7 @@ namespace FreeMat {
if (inBundleMode()) {
dir = QDir(QString(io->getAppPath().c_str()) + "/../Resources/help/html");
} else {
- dir = QDir(QString(BASEPATH)+"/html");
+ dir = QDir(QApplication::applicationDirPath()+"/"+QString(BASEPATH)+"/help/html");
}
HelpWindow *m_helpwin = new HelpWindow(dir.canonicalPath());
m_helpwin->show();
$OpenBSD: patch-libs_libCore_Inspect_cpp,v 1.2 2007/03/24 14:14:50 martynas Exp $
--- libs/libCore/Inspect.cpp.orig Thu Dec 28 16:02:21 2006
+++ libs/libCore/Inspect.cpp Sat Mar 24 15:46:48 2007
@@ -149,7 +149,7 @@ ArrayVector HelpWinFunction(int nargout, const ArrayVe
dir = QDir(QString(qApp->applicationDirPath() + "/../Resources/help/html"));
} else {
QSettings settings("FreeMat","FreeMat");
- dir = QDir(QString(settings.value("root").toString())+"/help/html");
+ dir = QDir(QString(settings.value("root", RESOURCEDIR).toString())+"/help/html");
}
HelpWindow *m_helpwin = new HelpWindow(dir.canonicalPath());
m_helpwin->show();

32
math/freemat/patches/patch-libs_libCore_Makefile_in
View File

@ -1,12 +1,20 @@
$OpenBSD: patch-libs_libCore_Makefile_in,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- libs/libCore/Makefile.in.orig Tue Jun 6 03:29:48 2006
+++ libs/libCore/Makefile.in Thu Oct 19 12:40:54 2006
@@ -66,7 +66,7 @@ DEFAULT_INCLUDES = -I. -I$(srcdir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ $(AM_CPPFLAGS) $(MYDEFS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-o $@
$OpenBSD: patch-libs_libCore_Makefile_in,v 1.2 2007/03/24 14:14:50 martynas Exp $
--- libs/libCore/Makefile.in.orig Tue Jan 9 06:33:13 2007
+++ libs/libCore/Makefile.in Sat Mar 3 15:21:40 2007
@@ -94,7 +94,7 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = @CPPFLAGS@ -DRESOURCEDIR=\"$(resourcedir)\"
CXX = @CXX@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
@@ -192,6 +192,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+resourcedir = $(datadir)/$(PACKAGE)-$(VERSION)
noinst_LIBRARIES = libCore.a
INCLUDES = -I@top_srcdir@/libs/libFreeMat -I@top_srcdir@/libs/libMex -I@top_srcdir@/libs/libXP -I@top_builddir@/libs/libXP
libCore_a_MOC = helpwidget.moc.cpp

12
math/freemat/patches/patch-libs_libCore_helpwidget_moc_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libs_libCore_helpwidget_moc_cpp,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- libs/libCore/helpwidget.moc.cpp.orig Wed Oct 18 11:01:47 2006
+++ libs/libCore/helpwidget.moc.cpp Wed Oct 18 11:01:55 2006
@@ -7,7 +7,7 @@
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "../../../libs/libCore/helpwidget.hpp"
+#include "helpwidget.hpp"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'helpwidget.hpp' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 59

11
math/freemat/patches/patch-libs_libFreeMat_Interpreter_cpp Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-libs_libFreeMat_Interpreter_cpp,v 1.1 2007/03/24 14:14:50 martynas Exp $
--- libs/libFreeMat/Interpreter.cpp.orig Tue Jan 9 06:26:33 2007
+++ libs/libFreeMat/Interpreter.cpp Sat Mar 3 13:46:47 2007
@@ -21,6 +21,7 @@
#include <stack>
#include <math.h>
#include <stdio.h>
+#include <unistd.h>
#include "Exception.hpp"
#include "Math.hpp"
#include "Array.hpp"

22
math/freemat/patches/patch-libs_libFreeMat_Module_cpp
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-libs_libFreeMat_Module_cpp,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- libs/libFreeMat/Module.cpp.orig Thu Oct 19 14:16:02 2006
+++ libs/libFreeMat/Module.cpp Thu Oct 19 14:16:16 2006
@@ -366,7 +366,7 @@ namespace FreeMat {
"return type, argument list");
libfile = arg[0].getContentsAsCString();
libfullpath = psearch.ResolvePath(libfile);
- char buffer[1000];
+ char buffer[PATH_MAX];
// Prepend the current working directory... ugly, but necessary
$OpenBSD: patch-libs_libFreeMat_Module_cpp,v 1.2 2007/03/24 14:14:50 martynas Exp $
--- libs/libFreeMat/Module.cpp.orig Thu Dec 28 16:02:26 2006
+++ libs/libFreeMat/Module.cpp Sat Mar 24 15:46:48 2007
@@ -379,7 +379,7 @@ ArrayVector ImportFunction(int nargout, const ArrayVec
"return type, argument list");
libfile = arg[0].getContentsAsCString();
libfullpath = psearch.ResolvePath(libfile);
- char buffer[1000];
+ char buffer[PATH_MAX];
// Prepend the current working directory... ugly, but necessary
#ifdef WIN32
_getcwd(buffer,sizeof(buffer));
_getcwd(buffer,sizeof(buffer));

12
math/freemat/patches/patch-libs_libFreeMat_Print_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libs_libFreeMat_Print_cpp,v 1.1 2007/03/24 14:14:50 martynas Exp $
--- libs/libFreeMat/Print.cpp.orig Tue Jan 2 00:31:44 2007
+++ libs/libFreeMat/Print.cpp Sat Mar 24 15:46:48 2007
@@ -417,7 +417,7 @@ void PrintSheet(ArrayFormat format, Interpreter*io, in
// the terminal width
int colsPerPage;
if (aclass != FM_STRING)
- colsPerPage = (int) floor((termWidth-1)/((float) format.width + 3));
+ colsPerPage = (int) floor((termWidth-1)/((double) format.width + 3));
else
colsPerPage = termWidth;
colsPerPage = (colsPerPage < 1) ? 1 : colsPerPage;

11
math/freemat/patches/patch-libs_libFreeMat_WalkTree_cpp
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-libs_libFreeMat_WalkTree_cpp,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- libs/libFreeMat/WalkTree.cpp.orig Wed Oct 18 09:49:23 2006
+++ libs/libFreeMat/WalkTree.cpp Wed Oct 18 09:49:36 2006
@@ -21,6 +21,7 @@
#include <stack>
#include <math.h>
#include <stdio.h>
+#include <unistd.h>
#include "Exception.hpp"
#include "Math.hpp"
#include "Reserved.hpp"

6
math/freemat/patches/patch-libs_libGraphics_HandleAxis_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libs_libGraphics_HandleAxis_cpp,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- libs/libGraphics/HandleAxis.cpp.orig Wed Oct 18 11:15:41 2006
+++ libs/libGraphics/HandleAxis.cpp Wed Oct 18 11:16:31 2006
$OpenBSD: patch-libs_libGraphics_HandleAxis_cpp,v 1.2 2007/03/24 14:14:50 martynas Exp $
--- libs/libGraphics/HandleAxis.cpp.orig Thu Dec 28 16:02:22 2006
+++ libs/libGraphics/HandleAxis.cpp Fri Mar 2 11:28:22 2007
@@ -28,6 +28,8 @@
#include "HandleCommands.hpp"
#include <qgl.h>

12
math/freemat/patches/patch-libs_libXP_Editor_moc_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libs_libXP_Editor_moc_cpp,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- libs/libXP/Editor.moc.cpp.orig Wed Oct 18 10:03:38 2006
+++ libs/libXP/Editor.moc.cpp Wed Oct 18 10:03:45 2006
@@ -7,7 +7,7 @@
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "../../../libs/libXP/Editor.hpp"
+#include "Editor.hpp"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'Editor.hpp' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 59

12
math/freemat/patches/patch-libs_libXP_FileTool_moc_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libs_libXP_FileTool_moc_cpp,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- libs/libXP/FileTool.moc.cpp.orig Wed Oct 18 10:06:37 2006
+++ libs/libXP/FileTool.moc.cpp Wed Oct 18 10:06:43 2006
@@ -7,7 +7,7 @@
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "../../../libs/libXP/FileTool.hpp"
+#include "FileTool.hpp"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'FileTool.hpp' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 59

12
math/freemat/patches/patch-libs_libXP_HistoryWidget_moc_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libs_libXP_HistoryWidget_moc_cpp,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- libs/libXP/HistoryWidget.moc.cpp.orig Wed Oct 18 10:08:35 2006
+++ libs/libXP/HistoryWidget.moc.cpp Wed Oct 18 10:08:41 2006
@@ -7,7 +7,7 @@
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "../../../libs/libXP/HistoryWidget.hpp"
+#include "HistoryWidget.hpp"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'HistoryWidget.hpp' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 59

10
math/freemat/patches/patch-libs_libXP_KeyManager_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-libs_libXP_KeyManager_cpp,v 1.1 2006/11/17 23:31:45 steven Exp $
--- libs/libXP/KeyManager.cpp.orig Sat Nov 18 00:12:35 2006
+++ libs/libXP/KeyManager.cpp Sat Nov 18 00:13:14 2006
@@ -136,7 +136,7 @@ int KeyManager::DisplayedStringWidth(std
$OpenBSD: patch-libs_libXP_KeyManager_cpp,v 1.2 2007/03/24 14:14:50 martynas Exp $
--- libs/libXP/KeyManager.cpp.orig Tue Jan 9 01:59:38 2007
+++ libs/libXP/KeyManager.cpp Sat Mar 24 15:46:48 2007
@@ -152,7 +152,7 @@ int KeyManager::DisplayedStringWidth(string s, int nc,
void KeyManager::InsertString(int pos, std::string s) {
void KeyManager::InsertString(int pos, string s) {
int len = s.size();
- for (int i=4096-len;i>pos;i--)
+ for (int i=4096-len;i>pos && i>=len;i--)

12
math/freemat/patches/patch-libs_libXP_KeyManager_moc_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libs_libXP_KeyManager_moc_cpp,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- libs/libXP/KeyManager.moc.cpp.orig Wed Oct 18 10:01:50 2006
+++ libs/libXP/KeyManager.moc.cpp Wed Oct 18 10:02:02 2006
@@ -7,7 +7,7 @@
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "../../../libs/libXP/KeyManager.hpp"
+#include "KeyManager.hpp"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'KeyManager.hpp' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 59

12
math/freemat/patches/patch-libs_libXP_PathTool_moc_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libs_libXP_PathTool_moc_cpp,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- libs/libXP/PathTool.moc.cpp.orig Wed Oct 18 10:04:48 2006
+++ libs/libXP/PathTool.moc.cpp Wed Oct 18 10:04:55 2006
@@ -7,7 +7,7 @@
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "../../../libs/libXP/PathTool.hpp"
+#include "PathTool.hpp"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'PathTool.hpp' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 59

19
math/freemat/patches/patch-libs_libXP_QTTerm_cpp Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-libs_libXP_QTTerm_cpp,v 1.1 2007/03/24 14:14:50 martynas Exp $
--- libs/libXP/QTTerm.cpp.orig Thu Dec 28 16:02:27 2006
+++ libs/libXP/QTTerm.cpp Sat Mar 24 15:46:48 2007
@@ -207,11 +207,11 @@ void QTTerm::PaintRectangle(QPainter *paint, QRect rec
paint->eraseRect(rect);
int col_start, col_stop;
int row_start, row_stop;
- col_start = (int)floor(rect.left()/m_char_w);
- col_stop = (int)ceil(rect.right()/m_char_w);
+ col_start = (int)floor((double)rect.left()/m_char_w);
+ col_stop = (int)ceil((double)rect.right()/m_char_w);
col_stop = qMin(col_stop,m_width-1);
- row_start = (int)ceil(rect.top()/m_char_h);
- row_stop = (int)floor(rect.bottom()/m_char_h);
+ row_start = (int)ceil((double)rect.top()/m_char_h);
+ row_stop = (int)floor((double)rect.bottom()/m_char_h);
row_stop = qMin(row_stop,m_height-1);

12
math/freemat/patches/patch-libs_libXP_QTTerm_moc_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libs_libXP_QTTerm_moc_cpp,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- libs/libXP/QTTerm.moc.cpp.orig Wed Oct 18 10:02:59 2006
+++ libs/libXP/QTTerm.moc.cpp Wed Oct 18 10:03:08 2006
@@ -7,7 +7,7 @@
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "../../../libs/libXP/QTTerm.hpp"
+#include "QTTerm.hpp"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'QTTerm.hpp' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 59

12
math/freemat/patches/patch-libs_libXP_ToolDock_moc_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libs_libXP_ToolDock_moc_cpp,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- libs/libXP/ToolDock.moc.cpp.orig Wed Oct 18 10:05:13 2006
+++ libs/libXP/ToolDock.moc.cpp Wed Oct 18 10:05:19 2006
@@ -7,7 +7,7 @@
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "../../../libs/libXP/ToolDock.hpp"
+#include "ToolDock.hpp"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'ToolDock.hpp' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 59

12
math/freemat/patches/patch-libs_libXP_VariablesTool_moc_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libs_libXP_VariablesTool_moc_cpp,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- libs/libXP/VariablesTool.moc.cpp.orig Wed Oct 18 10:05:30 2006
+++ libs/libXP/VariablesTool.moc.cpp Wed Oct 18 10:05:36 2006
@@ -7,7 +7,7 @@
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "../../../libs/libXP/VariablesTool.hpp"
+#include "VariablesTool.hpp"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'VariablesTool.hpp' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 59

12
math/freemat/patches/patch-libs_libXP_highlighter_moc_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libs_libXP_highlighter_moc_cpp,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- libs/libXP/highlighter.moc.cpp.orig Wed Oct 18 10:05:47 2006
+++ libs/libXP/highlighter.moc.cpp Wed Oct 18 10:05:56 2006
@@ -7,7 +7,7 @@
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "../../../libs/libXP/highlighter.hpp"
+#include "highlighter.hpp"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'highlighter.hpp' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 59

29
math/freemat/patches/patch-src_MainApp_cpp Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-src_MainApp_cpp,v 1.1 2007/03/24 14:14:50 martynas Exp $
--- src/MainApp.cpp.orig Thu Dec 28 16:02:20 2006
+++ src/MainApp.cpp Sat Mar 3 15:19:53 2007
@@ -263,12 +263,12 @@ int MainApp::Run() {
}
} else {
QSettings settings("FreeMat","FreeMat");
- QDir dir1(QString(settings.value("root").toString())+"/toolbox");
+ QDir dir1(QString(settings.value("root", RESOURCEDIR).toString())+"/toolbox");
if (dir1.exists()) {
QString path1(dir1.canonicalPath());
basePath += GetRecursiveDirList(path1);
}
- QDir dir2(QString(settings.value("root").toString())+"/help/text");
+ QDir dir2(QString(settings.value("root", RESOURCEDIR).toString())+"/help/text");
if (dir2.exists()) {
QString path2(dir2.canonicalPath());
basePath += GetRecursiveDirList(path2);
@@ -295,6 +295,10 @@ int MainApp::Run() {
m_keys->SetCompletionContext(context);
m_eval->setTerminalWidth(m_keys->getTerminalWidth());
m_eval->setGreetingFlag(skipGreeting);
+#ifdef __OpenBSD__
+ /* 64 frames / calls deep */
+ m_eval->setStackSize(262144);
+#endif
m_eval->start();
emit Initialize();
return 0;

32
math/freemat/patches/patch-src_Makefile_in
View File

@ -1,12 +1,20 @@
$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2006/10/28 19:53:05 steven Exp $
--- src/Makefile.in.orig Tue Jun 6 03:29:49 2006
+++ src/Makefile.in Thu Oct 19 12:40:35 2006
@@ -79,7 +79,7 @@ DEFAULT_INCLUDES = -I. -I$(srcdir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ $(AM_CPPFLAGS) $(MYDEFS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-o $@
$OpenBSD: patch-src_Makefile_in,v 1.2 2007/03/24 14:14:50 martynas Exp $
--- src/Makefile.in.orig Sat Mar 3 15:08:47 2007
+++ src/Makefile.in Sat Mar 3 15:21:21 2007
@@ -105,7 +105,7 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = @CPPFLAGS@ -DRESOURCEDIR=\"$(resourcedir)\"
CXX = @CXX@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
@@ -203,6 +203,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+resourcedir = $(datadir)/$(PACKAGE)-$(VERSION)
INCLUDES = -I@top_srcdir@/libs/libFreeMat -I@top_srcdir@/libs/libMex -I@top_srcdir@/libs/libXP -I@top_srcdir@/libs/libCore -I@top_srcdir@/libs/libGraphics -I@top_srcdir@/libs/libFN -I@top_srcdir@/src -I@top_builddir@/libs/libXP
EXTRA_DIST = appIcon.icns freemat.ico freematv2.ico
FreeMat_HFILES = \

2725
math/freemat/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff