From 99ed25fb388956057de166b53792643d008987c6243572796787343b74bc0ade Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 24 Jan 2007 15:18:32 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/clisp?expand=0&rev=2 --- clisp-2.39-berkeley-db.dif | 13 +++++++++++++ clisp-2.39-clx.dif | 36 ++++++++++++++++++++++++++++++++++++ clisp.changes | 6 ++++++ clisp.spec | 17 ++++++++++++----- 4 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 clisp-2.39-berkeley-db.dif create mode 100644 clisp-2.39-clx.dif diff --git a/clisp-2.39-berkeley-db.dif b/clisp-2.39-berkeley-db.dif new file mode 100644 index 0000000..4a4e831 --- /dev/null +++ b/clisp-2.39-berkeley-db.dif @@ -0,0 +1,13 @@ +--- modules/berkeley-db/configure ++++ modules/berkeley-db/configure 2007-01-24 14:52:14.000000000 +0100 +@@ -3161,6 +3161,10 @@ fi; + done + fi + ++ LIBDB=-ldb-4.3 ++LTLIBDB= ++ INCDB=-I/usr/include/db43 ++ + ac_cv_libdb_libs="$LIBDB" + ac_cv_libdb_ltlibs="$LTLIBDB" + ac_cv_libdb_cppflags="$INCDB" diff --git a/clisp-2.39-clx.dif b/clisp-2.39-clx.dif new file mode 100644 index 0000000..aed5fc1 --- /dev/null +++ b/clisp-2.39-clx.dif @@ -0,0 +1,36 @@ +--- modules/clx/new-clx/clx.f ++++ modules/clx/new-clx/clx.f 2007-01-24 11:33:44.000000000 +0100 +@@ -1563,7 +1563,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) \ +- { VALUES_IF(get_##c (popSTACK()) == get_##c (popSTACK())); } \ ++ { object _last = popSTACK(); \ ++ VALUES_IF(get_##c (popSTACK()) == get_##c (_last)); } \ + DEFUN(XLIB:LOOKUP-##L,display xxx) \ + { general_lookup (`XLIB::##L##`); } + +@@ -1580,7 +1581,8 @@ static void general_lookup (object type) + DEFUN(XLIB:##L##-P,xxx) \ + { VALUES_IF(c##_p (popSTACK())); } \ + DEFUN(XLIB:##L##-EQUAL,xxx yyy) \ +- { VALUES_IF(get_##c (popSTACK()) == get_##c (popSTACK())); } ++ { object _last = popSTACK(); \ ++ VALUES_IF(get_##c (popSTACK()) == get_##c (_last)); } + + + /* ----------------------------------------------------------------------- +@@ -4479,11 +4481,12 @@ static XCharStruct *font_char_info (XFon + */ + + if (fs->min_byte1 == 0 && fs->max_byte1 == 0) { /* Linear indexing ... */ +- if (index >= fs->min_char_or_byte2 && index <= fs->max_char_or_byte2) ++ if (index >= fs->min_char_or_byte2 && index <= fs->max_char_or_byte2) { + if (fs->per_char) + return fs->per_char+(index-fs->min_char_or_byte2); + else + return &(fs->min_bounds); ++ } + } else { /* Nonlinear indexing .. */ + unsigned char byte1 = (index >> 8) &0xFF; /* Is this right?! */ + unsigned char byte2 = index & 0xFF; diff --git a/clisp.changes b/clisp.changes index 1097838..c5ba49c 100644 --- a/clisp.changes +++ b/clisp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 24 11:36:01 CET 2007 - werner@suse.de + +- Stop compiler complaining about x = x++ +- Use db-4.3 instead of db-4.4, the breaking all former versions + ------------------------------------------------------------------- Mon Oct 30 00:42:12 CET 2006 - ro@suse.de diff --git a/clisp.spec b/clisp.spec index 053ed76..8804857 100644 --- a/clisp.spec +++ b/clisp.spec @@ -1,7 +1,7 @@ # # spec file for package clisp (Version 2.39) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,7 +11,7 @@ # norootforbuild Name: clisp -BuildRequires: db-devel gcc-c++ krb5-devel libstdc++-devel openssl-devel pcre-devel postgresql-devel readline-devel te_ams te_latex xorg-x11-devel +BuildRequires: db43-devel gcc-c++ krb5-devel libstdc++-devel openssl-devel pcre-devel postgresql-devel readline-devel te_ams te_latex xorg-x11-devel ExcludeArch: ppc64 s390x armv4l # # If set to yes do not forget to add @@ -19,11 +19,11 @@ ExcludeArch: ppc64 s390x armv4l # to BuildRequires # %define debug no -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: Development/Languages/Other Autoreqprov: on Version: 2.39 -Release: 8 +Release: 18 Summary: A Common Lisp Interpreter URL: http://clisp.cons.org Source: ftp://ftp.gnu.org/pub/gnu/clisp/latest/clisp-%{version}.tar.bz2 @@ -35,6 +35,8 @@ Patch4: clisp-2.39-ia64.dif Patch5: clisp-2.36-alloca.patch Patch6: clisp-2.39-dump.dif Patch7: clisp-2.39-ia64-wooh.dif +Patch8: clisp-2.39-clx.dif +Patch9: clisp-2.39-berkeley-db.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -81,6 +83,8 @@ Authors: %patch -P 5 -b .alloca %patch -P 6 -b .dump %patch -P 7 -b .wooh +%patch -P 8 -b .clx +%patch -P 9 -b .bdb %patch %build @@ -188,8 +192,8 @@ unset CFLAGS --with-module=wildcard \ --with-module=bindings/glibc \ --with-module=clx/new-clx \ + --with-module=berkeley-db \ --with-module=postgresql -# disabled: --with-module=berkeley-db # # Remove pipe # @@ -254,6 +258,9 @@ find $RPM_BUILD_ROOT${LSPLIB}/ -name '*.run' | xargs -r chmod 0755 %doc %{_mandir}/man1/clisp.1.gz %changelog -n clisp +* Wed Jan 24 2007 - werner@suse.de +- Stop compiler complaining about x = x++ +- Use db-4.3 instead of db-4.4, the breaking all former versions * Mon Oct 30 2006 - ro@suse.de - disabled berkeley-db module for the moment to fix build needs porting to db-4.4