diff --git a/guile-1.8.7.tar.bz2 b/guile-1.8.7.tar.bz2 deleted file mode 100644 index baf4225..0000000 --- a/guile-1.8.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd58d046243ae7de9d229db6576926d58e717309a7ab04fe0d8a344605e14bbd -size 3201465 diff --git a/guile-2.0.2.tar.bz2 b/guile-2.0.2.tar.bz2 new file mode 100644 index 0000000..98c6bbf --- /dev/null +++ b/guile-2.0.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8845b576fafdfa9fcdf9bc02f45045f193146c78da16ac61931e65dd8bd8f111 +size 5408145 diff --git a/guile-64bit.patch b/guile-64bit.patch index e30e2b0..5203fc3 100644 --- a/guile-64bit.patch +++ b/guile-64bit.patch @@ -2,7 +2,7 @@ Index: libguile/hash.c =================================================================== --- libguile/hash.c.orig +++ libguile/hash.c -@@ -169,7 +169,7 @@ scm_hasher(SCM obj, unsigned long n, siz +@@ -270,7 +270,7 @@ scm_hasher(SCM obj, unsigned long n, siz unsigned long scm_ihashq (SCM obj, unsigned long n) { @@ -11,7 +11,7 @@ Index: libguile/hash.c } -@@ -205,7 +205,7 @@ scm_ihashv (SCM obj, unsigned long n) +@@ -306,7 +306,7 @@ scm_ihashv (SCM obj, unsigned long n) if (SCM_NUMP(obj)) return (unsigned long) scm_hasher(obj, n, 10); else @@ -24,7 +24,7 @@ Index: libguile/struct.c =================================================================== --- libguile/struct.c.orig +++ libguile/struct.c -@@ -825,7 +825,7 @@ scm_struct_ihashq (SCM obj, unsigned lon +@@ -942,7 +942,7 @@ scm_struct_ihashq (SCM obj, unsigned lon { /* The length of the hash table should be a relative prime it's not necessary to shift down the address. */ @@ -32,4 +32,4 @@ Index: libguile/struct.c + return (unsigned long) SCM_UNPACK (obj) % n; } - SCM + SCM_DEFINE (scm_struct_vtable_name, "struct-vtable-name", 1, 0, 0, diff --git a/guile-gcc.patch b/guile-gcc.patch deleted file mode 100644 index 3c757a6..0000000 --- a/guile-gcc.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: guile-1.8.7/libguile/guile-snarf-docs.in -=================================================================== ---- guile-1.8.7.orig/libguile/guile-snarf-docs.in -+++ guile-1.8.7/libguile/guile-snarf-docs.in -@@ -23,4 +23,4 @@ bindir=`dirname $0` - ## Let the user override the preprocessor autoconf found. - test -n "${CPP+set}" || CPP="@CPP@" - --${CPP} -DSCM_MAGIC_SNARF_DOCS "$@" -+${CPP} -P -DSCM_MAGIC_SNARF_DOCS "$@" diff --git a/guile-popen-test.patch b/guile-popen-test.patch deleted file mode 100644 index 8226f13..0000000 --- a/guile-popen-test.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up guile-1.8.7/test-suite/tests/popen.test.testsuite guile-1.8.7/test-suite/tests/popen.test ---- guile-1.8.7/test-suite/tests/popen.test.testsuite 2009-07-04 00:19:00.000000000 +0200 -+++ guile-1.8.7/test-suite/tests/popen.test 2009-07-16 17:09:57.000000000 +0200 -@@ -168,7 +168,7 @@ - (port (with-error-to-port (cdr c2p) - (lambda () - (open-output-pipe -- "exec 0&2; done"))))) -+ "exec 0&2; sleep 3"))))) - (close-port (cdr c2p)) ;; write side - (with-epipe - (lambda () diff --git a/guile-testsuite-build.patch b/guile-testsuite-build.patch deleted file mode 100644 index 77559f9..0000000 --- a/guile-testsuite-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: guile-1.8.7/test-suite/standalone/Makefile.am -=================================================================== ---- guile-1.8.7.orig/test-suite/standalone/Makefile.am -+++ guile-1.8.7/test-suite/standalone/Makefile.am -@@ -28,7 +28,7 @@ check_SCRIPTS = - BUILT_SOURCES = - EXTRA_DIST = - --TESTS_ENVIRONMENT = "${top_builddir}/pre-inst-guile-env" -+TESTS_ENVIRONMENT = builddir="$(builddir)" "${top_builddir}/pre-inst-guile-env" - - test_cflags = \ - -I$(top_srcdir)/test-suite/standalone \ -Index: guile-1.8.7/test-suite/standalone/test-asmobs -=================================================================== ---- guile-1.8.7.orig/test-suite/standalone/test-asmobs -+++ guile-1.8.7/test-suite/standalone/test-asmobs -@@ -2,7 +2,7 @@ - exec guile -q -s "$0" "$@" - !# - --(load-extension "libtest-asmobs" "libtest_asmobs_init") -+(load-extension (string-append (getenv "builddir") "/libtest-asmobs") "libtest_asmobs_init") - - (define (test x v) - (if v -@@ -114,4 +114,4 @@ exec guile -q -s "$0" "$@" - - ;; Local Variables: - ;; mode: scheme --;; End: -\ No newline at end of file -+;; End: diff --git a/guile.changes b/guile.changes index f23c12c..0bd87d4 100644 --- a/guile.changes +++ b/guile.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Mon Aug 15 14:08:41 UTC 2011 - pgajdos@novell.com + +- updated to 2.0.2: + ** `guile-tools' renamed to `guild' + ** New control operators: `shift' and `reset' + ** `while' as an expression + ** Disallow access to handles of weak hash tables + ** More precision for `get-internal-run-time', `get-internal-real-time' + ** Guile now measures time spent in GC + ** Add `gcprof' + ** `map', `for-each' and some others now implemented in Scheme + ** Add `scm_peek_byte_or_eof'. + ** Implement #:stop-at-first-non-option option for getopt-long + ** Improve R6RS conformance for conditions in the I/O libraries + ** All deprecated routines emit warnings + ** Constants in compiled code now share state better + ** VLists: optimize `vlist-fold-right', and add `vhash-fold-right' + ** UTF-8 ports to bypass `iconv' entirely + ** Compiler speedups + ** VM speed tuning + ** SRFI-1 list-set optimizations + ** `memq', `memv' optimizations + ** Deprecate scm_whash API + ** Deprecate scm_struct_table + ** Deprecate scm_internal_dynamic_wind + ** Deprecate scm_immutable_cell, scm_immutable_double_cell + ** Fix double-loading of script in -ds case + ** -x error message fix + ** iconveh-related cross-compilation fixes + ** Fix small integer return value packing on big endian machines. + ** Fix hash-set! in weak-value table from non-immediate to immediate + ** Fix call-with-input-file & relatives for multiple values + ** Fix `hash' for inf and nan + ** Fix libguile internal type errors caught by typing-strictness==2 + ** Fix compile error in MinGW fstat socket detection + ** Fix generation of auto-compiled file names on MinGW + ** Fix multithreaded access to internal hash tables + ** Emit a 1-based line number in error messages + ** Fix define-module ordering + ** Fix several POSIX functions to use the locale encoding + ** Add type and range checks to the complex generalized vector accessors + ** Fix unaligned accesses for bytevectors of complex numbers + ** Fix '(a #{.} b) + ** Fix erroneous VM stack overflow for canceled threads + +------------------------------------------------------------------- +Thu Jul 14 12:13:33 UTC 2011 - pgajdos@novell.com + +- updated to 2.0.1: + ** REPL reader usability enhancements + ** REPL output has configurable width + ** Better C access to the module system + ** Added `scm_call_5', `scm_call_6' + ** Added `scm_from_latin1_keyword', `scm_from_utf8_keyword' + ** R6RS unicode and string I/O work + ** Added `pointer->scm', `scm->pointer' to `(system foreign)' + ** Added `heap-allocated-since-gc' to `(gc-stats)' + ** Add `on-error' REPL option + ** Enforce immutability of string literals + ** Fix pthread redirection + ** `with-continuation-barrier' now unwinds on `quit' + ** `string->pointer' and `pointer->string' have optional encoding arg + ** R6RS fixnum arithmetic optimizations + ** New procedure: `define-inlinable' + ** New procedure: `exact-integer-sqrt' + ** "Extended read syntax" for symbols parses better + ** Added `--fresh-auto-compile' option + ** etc., see ChangeLog and NEWS + ------------------------------------------------------------------- Mon Mar 22 12:39:55 CET 2010 - pgajdos@suse.cz @@ -543,3 +613,4 @@ Tue Jul 15 09:31:32 1997 - Karl Eichwalder * initial package: version 1.2. + diff --git a/guile.spec b/guile.spec index 897265f..9b3b830 100644 --- a/guile.spec +++ b/guile.spec @@ -1,7 +1,7 @@ # -# spec file for package guile (Version 1.8.7) +# spec file for package guile (Version 1.8.6) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,20 +18,17 @@ Name: guile -BuildRequires: gc-devel gmp-devel readline-devel -License: LGPLv2.1+ +BuildRequires: gmp-devel readline-devel libunistring-devel gc-devel pkg-config libffi-devel +License: LGPL-3.0+ and GPL-3.0+ and FDL-1.3+ Group: Development/Languages/Scheme AutoReqProv: on -Version: 1.8.7 -Release: 3 +Version: 2.0.2 +Release: 2 Summary: GNU's Ubiquitous Intelligent Language for Extension Url: http://www.gnu.org/software/guile/ Source0: %{name}-%{version}.tar.bz2 Patch1: %{name}-64bit.patch Patch2: %{name}-1.6.10-mktemp.patch -Patch3: %{name}-popen-test.patch -Patch4: %{name}-testsuite-build.patch -Patch5: %{name}-gcc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: fileutils sh-utils PreReq: %install_info_prereq @@ -59,10 +56,10 @@ Authors: Tom Tromey %package devel -License: LGPLv2.1+ +License: LGPL v2.1 or later Group: Development/Languages/Scheme Summary: GNU's Ubiquitous Intelligent Language for Extension -Requires: %{name} = %{version} gmp-devel readline-devel ncurses-devel +Requires: %{name} = %{version} gmp-devel readline-devel ncurses-devel gc-devel libunistring-devel libffi-devel %description devel This is Guile, a portable, embeddable Scheme implementation written in @@ -89,24 +86,18 @@ Authors: %setup -q %patch1 %patch2 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -# guile-1.8.1: The code is not so good for -Werror (unused results of write()). -sed -i s/-Werror// configure.in configure # force rebuild with non-broken makeinfo -rm -f doc/*/*.info +#rm -f doc/*/*.info %build -autoreconf -fi # FIXME: Following files are apparently compiled without RPM_OPT_FLAGS: # gen-scmconfig.c,c-tokenize.c %configure --disable-static --with-pic\ --with-threads -make %{?jobs:-j%jobs} +make %check -make check +LD_LIBRARY_PATH="." make check %install make install DESTDIR=$RPM_BUILD_ROOT @@ -121,14 +112,10 @@ rm -fr $RPM_BUILD_ROOT %post devel %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/goops.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/guile-tut.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/r5rs.info.gz %postun devel %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/goops.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/guile-tut.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/r5rs.info.gz %pre @@ -138,7 +125,7 @@ rm -f usr/share/guile/site/slibcat.SuSEconfig %files %defattr(-,root,root) -%doc ABOUT-NLS AUTHORS COPYING* ChangeLog* GUILE-VERSION HACKING +%doc ABOUT-NLS AUTHORS COPYING* ChangeLog GUILE-VERSION HACKING %doc LICENSE NEWS README THANKS %{_bindir}/* %{_datadir}/guile @@ -147,15 +134,14 @@ rm -f usr/share/guile/site/slibcat.SuSEconfig %{_libdir}/libguile*.so %{_libdir}/libguile*.la %{_mandir}/man1/guile.1.gz +%{_libdir}/guile %files devel %defattr(-,root,root) %{_includedir}/* -%{_datadir}/aclocal/* +%{_datadir}/aclocal/guile.m4 %doc %{_infodir}/%{name}.info.gz %doc %{_infodir}/%{name}.info-[0-9].gz -%doc %{_infodir}/goops.info.gz -%doc %{_infodir}/guile-tut.info.gz %doc %{_infodir}/r5rs.info.gz %{_libdir}/pkgconfig/*