Accepting request 445461 from devel:languages:misc

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/445461
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/clisp?expand=0&rev=39

clisp-2.39-clx.dif

@@ -1,6 +1,11 @@
+---
+ modules/clx/new-clx/clx.f    |    6 ++++--
+ modules/clx/new-clx/clx.lisp |    1 +
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
 --- a/modules/clx/new-clx/clx.f
 +++ b/modules/clx/new-clx/clx.f
-@@ -1721,7 +1721,8 @@ static void general_lookup (object type)
+@@ -1723,7 +1723,8 @@ static void general_lookup (object type)
    DEFUN(XLIB:##L##-ID,xxx)                                              \
      { VALUES1(make_uint29((XID)get_##c (popSTACK()))); }                \
    DEFUN(XLIB:##L##-EQUAL,xxx yyy)                                       \
@@ -10,7 +15,7 @@
    DEFUN(XLIB:LOOKUP-##L,display xxx)                                    \
      { general_lookup (`XLIB::##L##`); }
  
-@@ -1738,7 +1739,8 @@ static void general_lookup (object type)
+@@ -1740,7 +1741,8 @@ static void general_lookup (object type)
    DEFUN(XLIB:##L##-P,xxx)                                               \
      { VALUES_IF(c##_p (popSTACK())); }                                  \
    DEFUN(XLIB:##L##-EQUAL,xxx yyy)                                       \

clisp-2.39-ia64-wooh.dif

@@ -13,5 +13,5 @@
 +;(stringp (with-output-to-string (s) (describe nil s)))
 +;T
  
- ;; https://sourceforge.net/tracker/index.php?func=detail&aid=1622642&group_id=1355&atid=101355
+ ;; https://sourceforge.net/p/clisp/bugs/396/
  (let ((s "a   b"))

clisp-2.49-clx_demos.dif

@@ -1,6 +1,27 @@
+---
+ 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 +++++++++++++++++++++++++++++--
+ 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
-@@ -11,7 +11,7 @@
+@@ -13,7 +13,7 @@
  
  (defparameter *demos*
    ;; (demo-name [package requirements])
@@ -11,9 +32,9 @@
  (defmacro do-demos ((fun-var) &body body)
 --- a/modules/clx/new-clx/demos/koch.lisp
 +++ b/modules/clx/new-clx/demos/koch.lisp
-@@ -7,7 +7,30 @@
+@@ -5,7 +5,30 @@
- ;;; $Id: koch.lisp,v 1.5 2008/06/25 23:05:28 sds Exp $
+ ;;; See http://www.gnu.org/copyleft/gpl.html
- ;;; $Source: /cvsroot/clisp/clisp/modules/clx/new-clx/demos/koch.lisp,v $
+ ;;;
  
 -(in-package :clx-demos)
 +(defpackage "KOCH"
@@ -43,7 +64,7 @@
  
  (defun koch-point (cx width/2 height/2 scale)
    (list (round (+ width/2 (* scale width/2 (realpart cx))))
-@@ -123,4 +146,8 @@ Returns the new list and an indicator of
+@@ -121,4 +144,8 @@ Returns the new list and an indicator of
        (xlib:unmap-window win)
        (xlib:display-finish-output dpy))))
  

clisp-2.49-configure.dif

@@ -1,6 +1,13 @@
---- a/configure
+---
-+++ b/configure
+ clisp-536a48a9/configure          |    4 ++--
-@@ -393,11 +393,11 @@ do
+ clisp-536a48a9/src/lispbibl.d     |   16 +++++++++++-----
+ clisp-536a48a9/src/makemake.in    |   16 +++++++++++++---
+ clisp-536a48a9/utils/modprep.lisp |    2 +-
+ 4 files changed, 27 insertions(+), 11 deletions(-)
+
+--- clisp-536a48a9/configure
++++ clisp-536a48a9/configure	2016-11-29 16:47:05.962094941 +0000
+@@ -392,11 +392,11 @@ do
          passnext=both ;;
  
        --vimdir=* | --vimdi=* | --vimd=* | --vim=* | --vi=*)
@@ -14,18 +21,18 @@
          makemake_args="$makemake_args --vimdir="
          prev=vimdir
          passnext=both ;;
---- a/src/lispbibl.d
+--- clisp-536a48a9/src/lispbibl.d
-+++ b/src/lispbibl.d
++++ clisp-536a48a9/src/lispbibl.d	2016-11-29 16:47:05.966094859 +0000
-@@ -121,7 +121,7 @@
+@@ -66,7 +66,7 @@
    #define PC386 /* IBMPC-compatible with 80386/80486-processor */
  #endif
  #ifdef GENERIC_UNIX
--  #if (defined(unix) && (defined(linux) || defined(__CYGWIN32__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) && (defined(i386) || defined(__i386__) || defined(__x86_64__) || defined(__amd64__)))
+-  #if (defined(unix) && (defined(linux) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) && (defined(i386) || defined(__i386__) || defined(__x86_64__) || defined(__amd64__)))
-+  #if (defined(unix) && ((defined(linux) || defined(__linux__)) || defined(__CYGWIN32__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) && (defined(i386) || defined(__i386__) || defined(__x86_64__) || defined(__amd64__)))
++  #if (defined(unix) && ((defined(linux) || defined(__linux__)) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) && (defined(i386) || defined(__i386__) || defined(__x86_64__) || defined(__amd64__)))
      #define PC386
    #endif
    #if (defined(sun) && defined(unix) && defined(sparc))
-@@ -218,8 +218,14 @@
+@@ -167,8 +167,14 @@
  #endif
  #ifdef GENERIC_UNIX
    #define UNIX
@@ -41,7 +48,7 @@
    #endif
    #ifdef __GNU__
      #define UNIX_HURD  /* the GNU system (Hurd + glibc) */
-@@ -1245,7 +1251,7 @@ typedef signed int  signean;
+@@ -1110,7 +1116,7 @@ typedef signed int  signean;
   address of its component 'ident' and return it as number: */
  #include <stddef.h>
  #ifndef offsetof
@@ -50,7 +57,7 @@
  #endif
  /* Determine the offset of an array 'ident' in a struct of the type 'type': */
  #if defined(__cplusplus) || defined(MICROSOFT)
-@@ -3312,9 +3318,9 @@ typedef signed_int_with_n_bits(intVsize)
+@@ -3148,9 +3154,9 @@ typedef signed_int_with_n_bits(intVsize)
     type_data_object(type,data) */
    #if defined(WIDE) && defined(WIDE_STRUCT)
      #if BIG_ENDIAN_P==WIDE_ENDIANNESS
@@ -62,9 +69,9 @@
      #endif
    #elif !(oint_addr_shift==0)
      #define type_data_object(type,data)  \
---- a/src/makemake.in
+--- clisp-536a48a9/src/makemake.in
-+++ b/src/makemake.in
++++ clisp-536a48a9/src/makemake.in	2016-12-05 15:16:19.800662503 +0000
-@@ -228,6 +228,9 @@ verbose=${CLISP_MAKEMAKE_VERBOSE:-false}
+@@ -246,6 +246,9 @@ verbose=${CLISP_MAKEMAKE_VERBOSE:-false}
  # Handle --with-... arguments
  while test -z "$endofargs"; do
    case "$1" in
@@ -74,7 +81,32 @@
      -verb* | --verb* )
        verbose=`echol "$1"|sed 's/-*v[^=]*=*//'`
        test -n "${verbose}" || verbose=true
-@@ -1335,6 +1338,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
+@@ -1240,7 +1245,7 @@ if [ $XCC_GCC = true ] ; then
+     fi
+     # For platforms that use global register variables...
+     case "$cpu" in
+-      m68k | i386 | sparc | sparc64 | hppa | m88k | arm | alpha* | convex | s390*)
++      m68k | i386 | sparc | sparc64 | hppa | m88k | arm* | alpha* | convex | s390*)
+         if [ $CROSS = false ] ; then
+           case "$XCC_GCC_VERSION" in
+             3.1*)
+@@ -1272,6 +1277,10 @@ if [ $XCC_GCC = true ] ; then
      XCFLAGS=${XCFLAGS}" -pthread"
    fi
  
@@ -85,19 +117,29 @@
  else
  
    if [ $TSYS = sun4 -a $CROSS = false ] ; then
-@@ -3593,7 +3600,8 @@ if [ $CROSS = false ] ; then
+@@ -1602,7 +1611,7 @@ if [ "$cpu" = hppa ] ; then
-       echotab "    mkdir -p \"\$\$absdest/\$\$m\"; \\"
+   ARI_ASMD=$ARI_ASMD' arihppa'
-       echotab "    cd \$\$m; \$(MAKE) clisp-module-distrib LN=\"\$(INSTALL_DATA)\" distribdir=\"\$\$absdest/\$\$m\" ; cd \"\$\$here\"; \\"
+   ARI_ASMS=$ARI_ASMS' arihppa'
-       echotab "  done; fi"
+ fi
--      line='linkkit/* base/*'
+-if [ "$cpu" = arm ] ; then
++if [ "$cpu" = arm -o "$cpu" = armel ] ; then
+   ARI_ASMD=$ARI_ASMD' ariarm'
+   ARI_ASMS=$ARI_ASMS' ariarm'
+ fi
+@@ -3417,8 +3426,9 @@ if [ $CROSS = false ] ; then
+     echol
+     if [ "${with_dynamic_modules}" != no ]; then
+       depends="full install-modules force"
+-      line='linkkit base'
++      line='linkkit base full'
+       echol "install-modules : full force"
 +      echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/full"
-+      line='linkkit/* base/* full/*'
+       echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/dynmod"
-     else
+       echotab "DESTDIR=\`cd \"\$(DESTDIR)\$(lisplibdir)\"; pwd\` CLISP='./clisp -q -norc' ./clisp-link install \$(MODULES)"
-       echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/full"
+       echol
-       line='linkkit/* base/* full/*'
+--- clisp-536a48a9/utils/modprep.lisp
---- a/utils/modprep.lisp
++++ clisp-536a48a9/utils/modprep.lisp	2016-11-29 16:47:05.970094777 +0000
-+++ b/utils/modprep.lisp
+@@ -327,7 +327,7 @@ FOO(bar,baz,zot) ==> FOO; (bar baz zot);
-@@ -345,7 +345,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-2.49-personality.patch

@@ -4,7 +4,7 @@
 
 --- a/src/_clisp.c
 +++ b/src/_clisp.c
-@@ -46,6 +46,11 @@
+@@ -48,6 +48,11 @@
  /* Declare stderr, perror(). */
  # include <stdio.h>
  
@@ -16,16 +16,16 @@
  #if defined(WIN32_NATIVE)
  # include <windows.h>
  int shell_quote (char * dest, const char * source);
-@@ -417,6 +422,12 @@ int main (int argc, char* argv[])
+@@ -429,6 +434,12 @@ int main (int argc, char* argv[])
-       return 1;
      }
+   #undef W32ERR
  #else
 +#if defined(HAS_PERSONALITY) && (HAS_PERSONALITY > 0)
 +    if (personality(PER_LINUX32)) {
 +      perror(program_name);
 +      return 1;
 +    }
-+#endif /* FEDORA */
++#endif
      execv(executable,new_argv);
      { /* execv() returns only if there was an error. */
        int saved_errno = errno;

clisp-2.49-rpath.dif

@@ -1,6 +1,10 @@
+---
+ src/aclocal.m4 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/src/aclocal.m4
 +++ b/src/aclocal.m4
-@@ -6668,7 +6668,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+@@ -6133,7 +6133,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
      dnl When using libtool, the option that works for both libraries and
      dnl executables is -R. The -R options are cumulative.
      for found_dir in $ltrpathdirs; do

clisp-2.49.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890
-size 8091011

clisp-536a48a9.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16eadeffd644df4ef5a345a8c99c0906f21621f6410ad0bfeb74d1a4a1c1d07c
+size 8316374

clisp-db6.diff

@@ -7,14 +7,12 @@ BDB has removed RPC support (which was not implemented anyway;
 it [set_rpc_server] always returned EOPNOTSUPP even in libdb-4.8).
 
 ---
- modules/berkeley-db/bdb.c |    9 ++++++++-
+ clisp-536a48a9/modules/berkeley-db/bdb.c |    3 ++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
-Index: clisp-2.49/modules/berkeley-db/bdb.c
+--- clisp-536a48a9/modules/berkeley-db/bdb.c
-===================================================================
++++ clisp-536a48a9/modules/berkeley-db/bdb.c	2016-11-29 11:58:23.833524665 +0000
---- clisp-2.49.orig/modules/berkeley-db/bdb.c
+@@ -60,6 +60,7 @@ static void vecout (unsigned char* v, in
-+++ clisp-2.49/modules/berkeley-db/bdb.c
-@@ -64,6 +64,7 @@ static void vecout (unsigned char* v, in
     this is a macro and not a function for NO_UNICODE */
  #define asciz_to_string0(a,e) (a ? asciz_to_string(a,e) : NIL)
  
@@ -22,27 +20,12 @@ Index: clisp-2.49/modules/berkeley-db/bdb.c
  #include <db.h>
  
  /* http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/if.4.4.20.html
-@@ -358,9 +359,14 @@ DEFUN(BDB:DBE-CREATE,&key PASSWORD ENCRY
+@@ -2216,7 +2217,7 @@ DEFUN(BDB:DB-COMPACT, db &key TRANSACTIO
- # elif defined(DB_CLIENT)       /* 4.1 and before */
+   c_data.compact_timeout = timeout;
-   SYSCALL(db_env_create,(&dbe,remote_p ? DB_CLIENT : 0));
+   c_data.compact_pages = pages;
- # else
+   SYSCALL(db->compact,(db,txn,pstart,pstop,&c_data,flags,&end));
--#  error how does your Berkeley DB create a remote client?
+-  pushSTACK(uint32_to_I(c_data.compact_empty_buckets));
-+  SYSCALL(db_env_create,(&dbe,0));
++/*pushSTACK(uint32_to_I(c_data.compact_empty_buckets));*/
- # endif
+   pushSTACK(uint32_to_I(c_data.compact_pages_free));
-+
+   pushSTACK(uint32_to_I(c_data.compact_pages_examine));
-   if (remote_p) {
+   pushSTACK(uint32_to_I(c_data.compact_levels));
-+#if !defined(DB_RPCCLIENT) && !defined(DB_CLIENT)
-+#   warning No BDB RPC support
-+    error_bdb(EOPNOTSUPP, "DBE-CREATE");
-+#else
-     if (uint_p(STACK_0)) sv_timeout = I_to_uint(STACK_0);
-     if (uint_p(STACK_1)) cl_timeout = I_to_uint(STACK_1);
-    host_restart:
-@@ -384,6 +390,7 @@ DEFUN(BDB:DBE-CREATE,&key PASSWORD ENCRY
-       STACK_2 = value1;
-       goto host_restart;
-     }
-+#endif
-   }
-   if (!missingp(STACK_4))       /* :PASSWD */
-     dbe_set_encryption(dbe,&STACK_3,&STACK_4);

clisp-glibc-fix.patch

@@ -1,31 +0,0 @@
-From: Togan Muftuoglu <toganm@opensuse.org>
-Date: Access: 2012-11-28 16:13:07 +0100
-Referencens: http://comments.gmane.org/gmane.comp.lib.glibc.alpha/25618
-Subject: remove  __swblk_t from linux.lisp
-Upstream: no
-
-Glibc got rid of unused __swblk_t type, so the linux.lisp package needs to
-be updated, enabling build
----
- modules/bindings/glibc/linux.lisp |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/modules/bindings/glibc/linux.lisp
-+++ b/modules/bindings/glibc/linux.lisp
-@@ -38,7 +38,6 @@
- ; =========================== <sys/types.h> ===================================
- 
- (c-lines "#include <sys/types.h>~%")
--
- ; --------------------------- <gnu/types.h> -----------------------------------
- 
- (def-c-type __u_char uchar)
-@@ -67,7 +66,7 @@
- (def-c-type __daddr_t)          ; int
- (def-c-type __caddr_t)          ; c-pointer
- (def-c-type __time_t)           ; long
--(def-c-type __swblk_t)          ; long
-+;;(def-c-type __swblk_t)          ; long
- 
- (def-c-type __fd_mask ulong)
- (eval-when (load compile eval)

clisp-hostname.patch

@@ -1,74 +0,0 @@
---- src/socket.d.orig	2009-10-08 08:45:13.000000000 -0600
-+++ src/socket.d	2012-01-12 11:22:24.701723636 -0700
-@@ -57,8 +57,8 @@
- /* ============ hostnames and IP addresses only (no sockets) ============
- 
-  Fetches the machine's host name.
-- get_hostname(host =);
-- The name is allocated on the stack, with dynamic extent.
-+ get_hostname(hostname);
-+ where hostname is an array of MAXHOSTNAMELEN+1 characters.
-  < const char* host: The host name.
-  (Note: In some cases we could get away with less system calls by simply
-  setting
-@@ -67,13 +67,12 @@
-  sds: never: you will always get localhost/127.0.0.1 - what's the point? */
- #if defined(HAVE_GETHOSTNAME)
- /* present on all supported unix systems and on woe32 */
--  #define get_hostname(host_assignment)                                 \
--    do {  var char hostname[MAXHOSTNAMELEN+1];                          \
-+  #define get_hostname(hostname)                                        \
-+    do {                                                                \
-       begin_system_call();                                              \
-       if ( gethostname(&hostname[0],MAXHOSTNAMELEN) <0) { SOCK_error(); } \
-       end_system_call();                                                \
-       hostname[MAXHOSTNAMELEN] = '\0';                                  \
--      host_assignment &hostname[0];                                     \
-     } while(0)
- #else
-   #error get_hostname is not defined
-@@ -207,8 +206,8 @@ LISPFUNN(machine_instance,0)
-          (if (or (null address) (zerop (length address)))
-            hostname
-            (apply #'string-concat hostname " [" (inet-ntop address) "]"))) */
--    var const char* host;
--    get_hostname(host =);
-+    var char host[MAXHOSTNAMELEN+1];
-+    get_hostname(host);
-     result = asciz_to_string(host,O(misc_encoding)); /* hostname as result */
-    #ifdef HAVE_GETHOSTBYNAME
-     pushSTACK(result); /* hostname as 1st string */
-@@ -389,8 +388,8 @@ local int resolve_host1 (const void* add
- modexp struct hostent* resolve_host (object arg) {
-   var struct hostent* he;
-   if (eq(arg,S(Kdefault))) {
--    var char* host;
--    get_hostname(host =);
-+    var char host[MAXHOSTNAMELEN+1];
-+    get_hostname(host);
-     begin_system_call();
-     he = gethostbyname(host);
-     end_system_call();
-@@ -724,8 +723,9 @@ global SOCKET connect_to_x_server (const
-     if (conntype == conn_tcp) {
-       var unsigned short port = X_TCP_PORT+display;
-       if (host[0] == '\0') {
--        get_hostname(host =);
--        fd = with_host_port(host,port,&connect_to_x_via_ip,NULL);
-+        var char hostname[MAXHOSTNAMELEN+1];
-+        get_hostname(hostname);
-+        fd = with_host_port(hostname,port,&connect_to_x_via_ip,NULL);
-       } else {
-         fd = with_host_port(host,port,&connect_to_x_via_ip,NULL);
-       }
-@@ -798,8 +798,8 @@ global host_data_t * socket_getlocalname
-   if (socket_getlocalname_aux(socket_handle,hd) == NULL)
-     return NULL;
-   if (resolve_p) { /* Fill in hd->truename. */
--    var const char* host;
--    get_hostname(host =); /* was: host = "localhost"; */
-+    var char host[MAXHOSTNAMELEN+1];
-+    get_hostname(host); /* was: host = "localhost"; */
-     ASSERT(strlen(host) <= MAXHOSTNAMELEN);
-     strcpy(hd->truename,host);
-   } else {

clisp-link.dif

@@ -0,0 +1,26 @@
+---
+ src/clisp-link.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- src/clisp-link.in
++++ src/clisp-link.in	2016-11-29 12:56:40.625559126 +0000
+@@ -578,7 +578,7 @@ case "$1" in
+       # when running "CLISP=./clisp ./clisp-link install <modname>"
+       # in the build directory, avoid "cp: `...' and `...' are the same file"
+       if [ "${absolute_moduledir}" != "${absdestdir}/$moduledir" ]; then
+-        make clisp-module-distrib LN=${INSTALL_DATA-cp} distribdir="${absdestdir}/$moduledir"
++        make clisp-module-distrib LN="${INSTALL_DATA-cp}" distribdir="${absdestdir}/$moduledir"
+         mkdir -p ${absdestdir}/${DYNMOD};
+         for f in ${DYNDIR_FILES}; do
+           cp ${f} ${absdestdir}/${DYNMOD}/
+--- src/lispbibl.d
++++ src/lispbibl.d	2016-11-29 14:23:35.426290281 +0000
+@@ -1450,6 +1450,8 @@ typedef SLONG   sint32;  /* signed 32 bi
+   /* Emulate 64-Bit-numbers using two 32-Bit-numbers. */
+   typedef struct { sintL hi; uintL lo; } sintL2; /* signed 64 Bit integer */
+   typedef struct { uintL hi; uintL lo; } uintL2; /* unsigned 64 Bit integer */
++  #define bitQ(n)  bit(n)
++  #define bitQm(n)  bitm(n)
+ #endif
+ /* Use 'uintX' and 'sintX' for Integers with approximately given width
+  and a minumum of storage space. */

clisp-linux.patch

@@ -1,19 +1,10 @@
 ---
- modules/bindings/glibc/linux.lisp |    4 +++-
+ modules/bindings/glibc/linux.lisp |    2 ++
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ 1 file changed, 2 insertions(+)
 
 --- a/modules/bindings/glibc/linux.lisp
 +++ b/modules/bindings/glibc/linux.lisp
-@@ -86,7 +86,7 @@
+@@ -294,6 +294,8 @@
- 
- (def-c-type __key_t)            ; int
- 
--(c-lines "#include <bits/ipctypes.h>~%")
-+(c-lines "#include <sys/ipc.h>~%")
- (def-c-type __ipc_pid_t)        ; ushort
- 
- ; --------------------------- <sys/types.h> -----------------------------------
-@@ -293,6 +293,8 @@
  ;; for robust mutexes
  (def-c-const EOWNERDEAD (:documentation "Owner died")) ; 130
  (def-c-const ENOTRECOVERABLE (:documentation "State not recoverable")) ; 131

clisp.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Nov 29 13:45:20 UTC 2016 - werner@suse.de
+
+- Update to Mercurial source code from 2016/11/28
+  * which shows 2630 new lines in src/Changelog
+  * Support of new CPU types as well as better 64bit architectures
+- Remove patches clisp-glibc-fix.patch and clisp-hostname.patch
+  as now upstream
+- Modify the patches
+    clisp-2.39-clx.dif
+    clisp-2.39-ia64-wooh.dif
+    clisp-2.49-clx_demos.dif
+    clisp-2.49-configure.dif
+    clisp-2.49-personality.patch
+    clisp-2.49-rpath.dif
+    clisp-db6.diff
+    clisp-linux.patch
+- Add patch clisp-link.dif to get module asdf for console
+  support well done
+
 -------------------------------------------------------------------
 Thu Oct 27 10:52:29 UTC 2016 - werner@suse.de
 

clisp.spec

@@ -18,16 +18,18 @@
 
 # minimum suse version where the full featured package builds
 %define min_suse_ver 1030
+%define uuid         536a48a9
 
 Name:           clisp
-Version:        2.49
+Version:        2.49+
 Release:        0
 Summary:        A Common Lisp Interpreter
 License:        GPL-2.0+
 Group:          Development/Languages/Other
 Url:            http://clisp.cons.org
 
-Source:         http://downloads.sf.net/clisp/%name-%version.tar.bz2
+#Source:        http://downloads.sf.net/clisp/%name-%version.tar.bz2
+Source:         %name-%uuid.tar.bz2
 Source3:        clisp-rpmlintrc
 Source4:        README.SuSE
 # PATCH-EXTEND-OPENSUSE Set the process execution domain
@@ -48,12 +50,9 @@ Patch7:         clisp-2.49-postgresql.dif
 Patch8:         clisp-2.49-rpath.dif
 # PATCH-FIX-OPENSUSE Correct path for header for System V IPC system calls
 Patch12:        clisp-linux.patch
-# PATCH-FIX-OPENSUSE Glibc got rid of unused __swblk_t type therefore update linux.lisp
-Patch13:        clisp-glibc-fix.patch
-#PATCH-FIX-UPSTREAM  patch#3474660  changeset 15557	4f5985f83127
-Patch14:        clisp-hostname.patch
 # PATCH-EXTEND-UPSTREAM Make armv7l work
 Patch15:        clisp-arm.patch
+Patch14:        clisp-link.dif
 Patch16:        clisp-db6.diff
 #PATCH-FIX-UPSTREAM boo#1007196
 Patch17:        modules_readline_readline.lisp.patch
@@ -128,7 +127,7 @@ with the file README. The subdirectory
 contains two nice applications.
 
 %prep
-%setup -qT -b0
+%setup -qT -b0 -n clisp-%uuid
 %patch1  -p1 -b .sel
 %patch2  -p1 -b .wooh
 %patch3  -p1 -b .clx
@@ -137,15 +136,12 @@ contains two nice applications.
 %patch6  -p1 -b .demos
 %patch7  -p1 -b .psql
 %patch8  -p1 -b .rpath
-%patch12 -p1
+%patch12 -p1 -b .p12
-%if 0%{?suse_version} > 1220
+%patch14 -p0 -b .p14
-%patch13 -p1 -b .glibc
+%patch15 -p0 -b .p15
-%endif
+%patch16 -p1 -b .p16
-%patch14 -p0
-%patch15 -p0
-%patch16 -p1
 %if 0%{rlver} >= 70
-%patch17 -p0
+%patch17 -p0 -b .p17
 %endif
 
 %build
@@ -175,6 +171,7 @@ CC="${CC} -g ${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -pipe"
 case "$RPM_ARCH" in
     i[0-9]86)
 	    CC="${CC} -falign-functions=4 -mieee-fp -ffloat-store"  ;;
+    arm)    CC="${CC}"				;;
     ppc)    CC="${CC}"				;;
     s390)   CC="${CC}"				;;
     x86_64) CC="${CC} -fno-gcse"		;;
@@ -190,7 +187,9 @@ safety='-DSAFETY=3 -O'
 MYCFLAGS="${MYCFLAGS} -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 MYCFLAGS="${MYCFLAGS} -D_GNU_SOURCE -Wno-unused -Wno-uninitialized"
 case "$RPM_ARCH" in
-    i[0-9]86)   MYCFLAGS="${MYCFLAGS} ${noexec}"		;;
+    i[0-9]86)
+            MYCFLAGS="${MYCFLAGS} ${noexec}"			;;
+    arm)    MYCFLAGS="${MYCFLAGS} ${noexec}"			;;
     ppc)    MYCFLAGS="${MYCFLAGS} ${noexec}"			;;
     s390)   MYCFLAGS="${MYCFLAGS} ${noexec}"			;;
     x86_64) MYCFLAGS="${MYCFLAGS} ${safety}"			;;
@@ -206,8 +205,8 @@ unset cfi386 noexec nommap safety
 #
 # Environment for the case of missing terminal
 #
-%global _configure	screen -L -D -m ./configure
+%global _configure	screen -L -D -m setarch $(uname -m) -R ./configure
-%global _make		screen -L -D -m make
+%global _make		screen -L -D -m setarch $(uname -m) -R make
 SCREENDIR=$(mktemp -d ${PWD}/screen.XXXXXX) || exit 1
 SCREENRC=${SCREENDIR}/clisp
 export SCREENRC SCREENDIR
@@ -252,6 +251,8 @@ tail -q -s 0.5 -f $SCREENLOG & pid=$!
     --with-readline		\
     --with-dynamic-modules      \
     --with-gettext		\
+    --with-module=asdf		\
+    --with-module=editor	\
 %if 0%{?suse_version} >= %min_suse_ver
     --with-module=dbus		\
 %endif
@@ -261,7 +262,6 @@ tail -q -s 0.5 -f $SCREENLOG & pid=$!
     --with-module=pcre		\
     --with-module=rawsock	\
     --with-module=zlib		\
-    --with-module=wildcard	\
     --with-module=bindings/glibc\
     --with-module=clx/new-clx	\
     --with-module=berkeley-db	\
@@ -282,6 +282,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
@@ -293,12 +297,12 @@ CLXLIB=${LSPLIB}/full
 #
 # Install the current system
 #
-make -C build install prefix=%{_prefix}   \
+setarch $(uname -m) -R make -C build install prefix=%{_prefix}   \
         exec_prefix=%{_prefix}      \
         mandir=%{_mandir}       \
         libdir=%{_libdir}       \
     DESTDIR=%{buildroot}        \
-    INSTALL_DATA='install -cm 0444'
+    INSTALL_DATA="install -cm 0444"
 
 #
 # The CLX interface