Test update to hg source code from 2016/11/28

OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/clisp?expand=0&rev=56

clisp-2.49-clx_demos.dif

@@ -1,10 +1,24 @@
 ---
+ modules/clx/new-clx/demos/README         |    4 +--
  modules/clx/new-clx/demos/clx-demos.lisp |    2 -
  modules/clx/new-clx/demos/koch.lisp      |   29 +++++++++++++++++++++++++-
  modules/clx/new-clx/demos/qix.lisp       |   30 ++++++++++++++++++++++++++-
  modules/clx/new-clx/demos/sokoban.lisp   |   34 +++++++++++++++++++++++++++++--
- 4 files changed, 90 insertions(+), 5 deletions(-)
+ 5 files changed, 92 insertions(+), 7 deletions(-)
 
+--- a/modules/clx/new-clx/demos/README
++++ b/modules/clx/new-clx/demos/README
+@@ -3,8 +3,8 @@ Most came with the original CLX and has
+ Some are original with CLISP (notably sokoban).
+ 
+ To try them, do
+-$ clisp -i clx-demos
++$ clisp -K full -i clx-demos
+ and read the instructions.
+ 
+ To try them all, one by one, do
+-$ clisp -i clx-demos -x '(clx-demos:run-all-demos)'
++$ clisp -K full -i clx-demos -x '(clx-demos:run-all-demos)'
 --- a/modules/clx/new-clx/demos/clx-demos.lisp
 +++ b/modules/clx/new-clx/demos/clx-demos.lisp
 @@ -13,7 +13,7 @@

clisp-2.49-configure.dif

@@ -1,12 +1,8 @@
----
- configure          |    4 ++--
- src/lispbibl.d     |   16 +++++++++++-----
- src/makemake.in    |   10 +++++++++-
- utils/modprep.lisp |    2 +-
- 4 files changed, 23 insertions(+), 9 deletions(-)
 
---- a/configure
-+++ b/configure
+
+diff --git a/clisp-536a48a9/configure b/clisp-536a48a9/configure
+--- a/clisp-536a48a9/configure
++++ b/clisp-536a48a9/configure
 @@ -392,11 +392,11 @@ do
          passnext=both ;;
  
@@ -21,8 +17,9 @@
          makemake_args="$makemake_args --vimdir="
          prev=vimdir
          passnext=both ;;
---- a/src/lispbibl.d
-+++ b/src/lispbibl.d
+diff --git a/clisp-536a48a9/src/lispbibl.d b/clisp-536a48a9/src/lispbibl.d
+--- a/clisp-536a48a9/src/lispbibl.d
++++ b/clisp-536a48a9/src/lispbibl.d
 @@ -66,7 +66,7 @@
    #define PC386 /* IBMPC-compatible with 80386/80486-processor */
  #endif
@@ -69,8 +66,9 @@
      #endif
    #elif !(oint_addr_shift==0)
      #define type_data_object(type,data)  \
---- a/src/makemake.in
-+++ b/src/makemake.in
+diff --git a/clisp-536a48a9/src/makemake.in b/clisp-536a48a9/src/makemake.in
+--- a/clisp-536a48a9/src/makemake.in
++++ b/clisp-536a48a9/src/makemake.in
 @@ -246,6 +246,9 @@ verbose=${CLISP_MAKEMAKE_VERBOSE:-false}
  # Handle --with-... arguments
  while test -z "$endofargs"; do
@@ -81,7 +79,23 @@
      -verb* | --verb* )
        verbose=`echol "$1"|sed 's/-*v[^=]*=*//'`
        test -n "${verbose}" || verbose=true
-@@ -1272,6 +1275,10 @@ if [ $XCC_GCC = true ] ; then
+@@ -1115,6 +1118,7 @@ else
+ fi
+ 
+ # Main cpu dependencies:
++set -x
+ cpu=$host_cpu_c_abi
+ if test -z "$cpu"; then
+   echo "$0: WARNING: host_cpu_c_abi is void; using host_cpu=${host_cpu}" >&2
+@@ -1125,6 +1129,7 @@ if test -z "$cpu"; then
+     * ) cpu=${host_cpu}
+   esac
+ fi
++set +x
+ 
+ test "${verbose}" = true -o "${verbose}" = yes && \
+   cat <<EOF >&2
+@@ -1272,6 +1277,10 @@ if [ $XCC_GCC = true ] ; then
      XCFLAGS=${XCFLAGS}" -pthread"
    fi
  
@@ -92,7 +106,7 @@
  else
  
    if [ $TSYS = sun4 -a $CROSS = false ] ; then
-@@ -3417,8 +3424,9 @@ if [ $CROSS = false ] ; then
+@@ -3417,8 +3426,9 @@ if [ $CROSS = false ] ; then
      echol
      if [ "${with_dynamic_modules}" != no ]; then
        depends="full install-modules force"
@@ -103,8 +117,9 @@
        echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/dynmod"
        echotab "DESTDIR=\`cd \"\$(DESTDIR)\$(lisplibdir)\"; pwd\` CLISP='./clisp -q -norc' ./clisp-link install \$(MODULES)"
        echol
---- a/utils/modprep.lisp
-+++ b/utils/modprep.lisp
+diff --git a/clisp-536a48a9/utils/modprep.lisp b/clisp-536a48a9/utils/modprep.lisp
+--- a/clisp-536a48a9/utils/modprep.lisp
++++ b/clisp-536a48a9/utils/modprep.lisp
 @@ -327,7 +327,7 @@ FOO(bar,baz,zot) ==> FOO; (bar baz zot);
                ((or (char= cc #\_) (char= cc #\-)) (write-char #\_ out))
                (t (format out "_~2,'0x" (char-code cc))))))

clisp.spec

@@ -132,6 +132,7 @@ contains two nice applications.
 %patch2  -p1 -b .wooh
 %patch3  -p1 -b .clx
 %patch4  -p1 -b .conf
+exit
 %patch5  -p1 -b .gc
 %patch6  -p1 -b .demos
 %patch7  -p1 -b .psql
@@ -279,6 +280,10 @@ test -z "$(ls build/tests/*.erg 2>/dev/null)"
 
 %install
 #
+# Clean
+#
+find modules/clx/ -name '*.demos' | xargs --no-run-if-empty rm -vf
+#
 # Current system
 #
 SYSTEM=${RPM_ARCH}-suse-linux