| 1 |
grozin 11/08/31 14:20:28 |
| 2 |
|
| 3 |
Added: maxima-5.25.1.patch maxima-5.25.1-wish.patch |
| 4 |
Removed: maxima-5.25.0-wish.patch maxima-5.25.0.patch |
| 5 |
Log: |
| 6 |
Version bump |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha51/cvs/Linux i686) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sci-mathematics/maxima/files/maxima-5.25.1.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/maxima/files/maxima-5.25.1.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/maxima/files/maxima-5.25.1.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: maxima-5.25.1.patch |
| 17 |
=================================================================== |
| 18 |
diff -r -U1 maxima-5.23.1.orig//configure.in maxima-5.23.1//configure.in |
| 19 |
--- maxima-5.23.1.orig//configure.in 2011-01-15 21:54:46.000000000 +0600 |
| 20 |
+++ maxima-5.23.1//configure.in 2011-01-16 19:50:55.000000000 +0600 |
| 21 |
@@ -294,3 +294,3 @@ |
| 22 |
dnl n.b. openmcl_default_name is hardcoded in "with" message |
| 23 |
-openmcl_default_name=openmcl |
| 24 |
+openmcl_default_name=ccl |
| 25 |
AC_ARG_ENABLE(openmcl, |
| 26 |
diff -r -U1 maxima-5.23.1.orig//src/maxima.in maxima-5.23.1//src/maxima.in |
| 27 |
--- maxima-5.23.1.orig//src/maxima.in 2010-12-05 08:06:03.000000000 +0600 |
| 28 |
+++ maxima-5.23.1//src/maxima.in 2011-01-16 20:07:27.000000000 +0600 |
| 29 |
@@ -137,5 +137,5 @@ |
| 30 |
if [ "$layout_autotools" = "true" ]; then |
| 31 |
- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" |
| 32 |
+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" |
| 33 |
else |
| 34 |
- exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" |
| 35 |
+ exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" |
| 36 |
fi |
| 37 |
@@ -147,5 +147,5 @@ |
| 38 |
if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then |
| 39 |
- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" |
| 40 |
+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" |
| 41 |
else |
| 42 |
- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" |
| 43 |
+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" |
| 44 |
fi |
| 45 |
@@ -155,3 +155,3 @@ |
| 46 |
else |
| 47 |
- exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" |
| 48 |
+ exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" |
| 49 |
fi |
| 50 |
@@ -177,3 +177,3 @@ |
| 51 |
elif [ "$MAXIMA_LISP" = "sbcl" ]; then |
| 52 |
- exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" |
| 53 |
+ exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" |
| 54 |
else |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
1.1 sci-mathematics/maxima/files/maxima-5.25.1-wish.patch |
| 59 |
|
| 60 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/maxima/files/maxima-5.25.1-wish.patch?rev=1.1&view=markup |
| 61 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/maxima/files/maxima-5.25.1-wish.patch?rev=1.1&content-type=text/plain |
| 62 |
|
| 63 |
Index: maxima-5.25.1-wish.patch |
| 64 |
=================================================================== |
| 65 |
diff -r -U1 maxima-5.23.1.orig//configure.in maxima-5.23.1//configure.in |
| 66 |
--- maxima-5.23.1.orig//configure.in 2011-01-15 21:54:46.000000000 +0600 |
| 67 |
+++ maxima-5.23.1//configure.in 2011-01-16 21:00:16.000000000 +0600 |
| 68 |
@@ -777,6 +777,11 @@ |
| 69 |
[ --with-wish=<prog> Use <prog> for Tk wish shell (default wish)], |
| 70 |
- [WISH="${withval}"], |
| 71 |
- [WISH="wish"]) |
| 72 |
+ [], |
| 73 |
+ [with_wish="wish"]) |
| 74 |
+case "${with_wish}" in |
| 75 |
+ no) WISH="none" ;; |
| 76 |
+ yes) WISH="wish" ;; |
| 77 |
+ *) WISH="${with_wish}" ;; |
| 78 |
+esac |
| 79 |
AC_SUBST(WISH) |
| 80 |
- |
| 81 |
+AM_CONDITIONAL(WANT_TK, test x"${with_wish}" != xno) |
| 82 |
|
| 83 |
diff -r -U1 maxima-5.23.1.orig//interfaces/Makefile.am maxima-5.23.1//interfaces/Makefile.am |
| 84 |
--- maxima-5.23.1.orig//interfaces/Makefile.am 2004-04-28 23:34:59.000000000 +0700 |
| 85 |
+++ maxima-5.23.1//interfaces/Makefile.am 2011-01-16 20:41:38.000000000 +0600 |
| 86 |
@@ -1,2 +1,6 @@ |
| 87 |
+if WANT_TK |
| 88 |
SUBDIRS = emacs xmaxima |
| 89 |
+else |
| 90 |
+SUBDIRS = emacs |
| 91 |
+endif |
| 92 |
EXTRA_DIST = bin/xmaxima.iss |
Archives