[maxima] RFE: Add patch to allow disabling readline in maxima-runtime-clisp (#837142)

Rex Dieter rdieter at fedoraproject.org
Sun Jul 8 16:03:38 UTC 2012


commit e078df50efb6dbfa9a86ffde2c385af8c8aa764f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Jul 8 11:06:57 2012 -0500

    RFE: Add patch to allow disabling readline in maxima-runtime-clisp (#837142)

 maxima-5.27.0-clisp-noreadline.patch |   23 +++++++++++++++++++++++
 maxima.spec                          |   12 +++++++++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/maxima-5.27.0-clisp-noreadline.patch b/maxima-5.27.0-clisp-noreadline.patch
new file mode 100644
index 0000000..a7fd672
--- /dev/null
+++ b/maxima-5.27.0-clisp-noreadline.patch
@@ -0,0 +1,23 @@
+diff -up maxima-5.27.0/src/maxima.in.orig maxima-5.27.0/src/maxima.in
+--- maxima-5.27.0/src/maxima.in.orig	2012-07-02 20:30:19.795879333 -0400
++++ maxima-5.27.0/src/maxima.in	2012-07-02 20:31:30.947882064 -0400
+@@ -103,6 +103,7 @@ while [ -n "$1" ]; do
+ 	--userdir ) : ; shift;; # noop; handled by process_userdir_argument
+ 	--userdir=*) : ;; # noop; handled by process_userdir_argument
+ 	-v|--verbose ) verbose=true;;
++	--disable-readline ) CLISP_OPTIONS="-disable-readline";;
+ 	*) ;;
+     esac
+     shift
+@@ -135,9 +136,9 @@ if [ "$verbose" = "true" ]; then
+ fi
+ if [ "$MAXIMA_LISP" = "clisp" ]; then
+     if [ "$layout_autotools" = "true" ]; then
+-	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"
++	exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS $CLISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+     else
+-	exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++	exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS $CLISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+     fi
+ elif [ "$MAXIMA_LISP" = "cmucl" ]; then
+     # CMUCL can use either an executable image or a regular lisp core
diff --git a/maxima.spec b/maxima.spec
index 9931db2..0fb9674 100644
--- a/maxima.spec
+++ b/maxima.spec
@@ -3,7 +3,7 @@ Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.27.0
 
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -12,6 +12,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch: %{ix86} x86_64 ppc sparcv9
 
+## upstreamable patches
+# https://bugzilla.redhat.com/show_bug.cgi?id=837142
+# https://sourceforge.net/tracker/?func=detail&aid=3539587&group_id=4933&atid=104933
+Patch50: maxima-5.27.0-clisp-noreadline.patch
+
 %define maxima_ver %{version}%{?beta}
 %define emacs_sitelisp  %{_datadir}/emacs/site-lisp/
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp/
@@ -200,6 +205,8 @@ Maxima compiled with Embeddable Common-Lisp (ecl).
 %prep
 %setup -q  -n %{name}%{!?cvs:-%{version}%{?beta}}
 
+%patch50 -p1 -b .clisp-noreadline
+
 # Extra docs
 install -p -m644 %{SOURCE10} .
 
@@ -450,6 +457,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 08 2012 Rex Dieter <rdieter at fedoraproject.org> 5.27.0-7
+- RFE: Add patch to allow disabling readline in maxima-runtime-clisp (#837142)
+
 * Mon Jul 02 2012 Rex Dieter <rdieter at fedoraproject.org> 5.27.0-6
 - BR: libffi-devel (workaround ecl bug #837102)
 


More information about the scm-commits mailing list