diff --git a/guile-64bit.patch b/guile-64bit.patch index cd384c9..e30e2b0 100644 --- a/guile-64bit.patch +++ b/guile-64bit.patch @@ -1,26 +1,30 @@ ---- libguile/hash.c +Index: libguile/hash.c +=================================================================== +--- libguile/hash.c.orig +++ libguile/hash.c -@@ -161,7 +161,7 @@ - unsigned int - scm_ihashq (SCM obj, unsigned int n) +@@ -169,7 +169,7 @@ scm_hasher(SCM obj, unsigned long n, siz + unsigned long + scm_ihashq (SCM obj, unsigned long n) { - return (SCM_UNPACK (obj) >> 1) % n; + return ((unsigned long) SCM_UNPACK (obj) >> 1) % n; } -@@ -196,7 +196,7 @@ +@@ -205,7 +205,7 @@ scm_ihashv (SCM obj, unsigned long n) if (SCM_NUMP(obj)) - return (unsigned int) scm_hasher(obj, n, 10); + return (unsigned long) scm_hasher(obj, n, 10); else - return SCM_UNPACK (obj) % n; + return (unsigned long) SCM_UNPACK (obj) % n; } ---- libguile/struct.c +Index: libguile/struct.c +=================================================================== +--- libguile/struct.c.orig +++ libguile/struct.c -@@ -690,7 +690,7 @@ +@@ -825,7 +825,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. */ diff --git a/guile.changes b/guile.changes index 92d81db..680bc06 100644 --- a/guile.changes +++ b/guile.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 3 19:09:20 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Tue Jun 16 19:47:46 CEST 2009 - pgajdos@suse.cz diff --git a/guile.spec b/guile.spec index e9e9717..66097a8 100644 --- a/guile.spec +++ b/guile.spec @@ -23,7 +23,7 @@ License: LGPL v2.1 or later Group: Development/Languages/Scheme AutoReqProv: on Version: 1.8.6 -Release: 1 +Release: 2 %define GUILEVERSION 1.8 Summary: GNU's Ubiquitous Intelligent Language for Extension Url: http://www.gnu.org/software/guile/ @@ -155,257 +155,3 @@ rm -f usr/share/guile/site/slibcat.SuSEconfig %{_libdir}/pkgconfig/* %changelog -* Tue Jun 16 2009 pgajdos@suse.cz -- Updated to 1.8.6 (see NEWS) - - removed ac.patch -* Sat Feb 07 2009 schwab@suse.de -- Rebuild broken info files. -- Fix %%post scripts. -* Fri Jan 16 2009 crrodriguez@suse.de -- remove static libraries -- run make check -* Sun Sep 07 2008 schwab@suse.de -- Fix conflicting options. -* Mon Jul 07 2008 pgajdos@suse.cz -- updated to 1.8.5: - * new modules `(srfi srfi-88)' - * New `postfix' read option, for SRFI-88 keyword syntax - * Some I/O primitives have been inlined, which improves I/O performance - * New object-based traps infrastructure - * New support for working on Guile code from within Emacs - * bug fixes -* Thu Mar 13 2008 schwab@suse.de -- Use autoreconf. -* Thu Feb 28 2008 ro@suse.de -- update to 1.8.4: - * New modules (srfi srfi-69) - * Bug fixes -- fix code for recent gcc by checking for __GNUC_GNU_INLINE__ - instead of __GNUC__ for inline specifics (thanks, richi) -* Mon Feb 04 2008 pgajdos@suse.cz -- guile conflicts with slib < 3a5 [#354936] -* Wed Dec 12 2007 pgajdos@suse.cz -- upgraded to 1.8.3: - * New modules (srfi srfi-35), (srfi srfi-37) - * Bug fixes - * The reader is now faster, which reduces startup time - * Procedures returned by `record-accessor' and `record-modifier' - are faster - * New procedures set-program-arguments, make-vtable - * Incompatible change: - ~~~~~~~~~~~~~~~~~~~~ - The body of a top-level `define' no longer sees the binding - being created. In a top-level `define', the binding being - created is no longer visible from the `define' body. This - breaks code like "(define foo (begin (set! foo 1) (+ foo 1)))", - where `foo' is now unbound in the body. However, such code - was not R5RS-compliant anyway, per Section 5.2.1. -- removed getcontext.patch -- no longer needed because - of code change -* Mon Mar 05 2007 sbrabec@suse.cz -- Slib guile library installation moved from guile to slib. -* Thu Jan 11 2007 sbrabec@suse.cz -- More spec file cleanups. -* Fri Dec 08 2006 maw@suse.de -- Clean up the spec, removing some hardcoded paths. -* Tue Nov 28 2006 sbrabec@suse.cz -- Build as user and do not alter root filesystem. -* Mon Nov 27 2006 sbrabec@suse.cz -- Created empty directory for site packages (#223837). -* Thu Nov 23 2006 sbrabec@suse.cz -- Fixed slib installation scriptlets (#214940). -* Wed Nov 08 2006 anicka@suse.cz -- moved .la files to the base package (#218032). -* Wed Oct 25 2006 sbrabec@suse.cz -- Moved .so files to the base package (#214940). -* Mon Oct 16 2006 anicka@suse.cz -- move /usr/share/guile from devel to main package - (fixes ##212545) -* Sun Oct 15 2006 schwab@suse.de -- Make sure config.rpath is present. -* Fri Oct 13 2006 schwab@suse.de -- Add split provide. -* Fri Oct 13 2006 aj@suse.de -- Split up devel subpackage. -* Tue Oct 10 2006 sbrabec@suse.cz -- Updated to version 1.8.1: - * LFS functions are now used to access 64-bit files on 32-bit - systems. - * New procedures and functions. - * New modules and module merges. - * API changes. - * Bugs fixed. - * Guile is now licensed with the GNU Lesser General - Public License. - * The manual is now licensed with the GNU Free Documentation - License. - * Guile now requires GNU MP. - * Guile now has separate private and public configuration - headers. - * Thread implementation has changed. - * Command line syntax changes. -* Fri Oct 06 2006 anicka@suse.cz -- update to 1.6.8 - * gcc 4.0 fixes - * Guile now allows multiple line comments to end without - a trailing newline. - * better support for new versions of SLIB - * changes in C interface -* Fri Sep 08 2006 anicka@suse.cz -- rewrite SuSEconfig.guile to RPM triggers -* Sun Jul 16 2006 schwab@suse.de -- Mark ia64_getcontext as returning twice. -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Tue Jan 17 2006 ro@suse.de -- add aclocal in libltdl -* Wed May 18 2005 sbrabec@suse.cz -- Disabled randomly failing make -j. -* Tue Apr 05 2005 sbrabec@suse.cz -- Fixed incomplete array element type. -* Thu Mar 24 2005 uli@suse.de -- fixed to build on ARM -* Fri Jan 21 2005 sbrabec@suse.cz -- Updated to version 1.6.7. -* Fri Dec 10 2004 meissner@suse.de -- make -j , added make check. -* Tue Mar 30 2004 sbrabec@suse.cz -- Fixed tempfile creation in guile-snarf (#36367). -- Build with -fno-strict-aliasing. -* Thu Nov 06 2003 schwab@suse.de -- Fix syntax in configure script. -* Tue Jul 08 2003 sbrabec@suse.cz -- Updated to version 1.6.4. -* Thu Apr 24 2003 ro@suse.de -- fix install_info --delete call and move from preun to postun -* Wed Mar 12 2003 sbrabec@suse.cz -- Workaround guile-config info version bug (symlink, fixes bug 25190). -* Tue Feb 11 2003 sbrabec@suse.cz -- Fixed GUILEVERSION datadir path. -* Mon Feb 10 2003 sbrabec@suse.cz -- Updated to version 1.6.2. -- Use %%install_info (bug #23423). -* Wed Dec 11 2002 garloff@suse.de -- Make slib integration work independent of guile version number. -* Wed Dec 04 2002 sbrabec@suse.cz -- Change error message for unknown platform to warning. It allows to - compile guile on all platforms, but there is no guarantee to - functionallity. (guile-platforms.diff) -* Tue Dec 03 2002 sbrabec@suse.cz -- Fixed typo, which breaks TeXmacs - (guile-1.6.0-top_srcdir_absolute.diff). -* Wed Oct 30 2002 sbrabec@suse.cz -- Update to version 1.6.0. -* Tue Aug 20 2002 mmj@suse.de -- Correct PreReq -* Tue Jul 30 2002 mcihar@suse.cz -- fixed SuSEconfig.guile for new version -* Wed Jul 17 2002 tiwai@suse.de -- updated to version 1.4.1. -* Tue Jun 11 2002 mcihar@suse.cz -- disabled qthreads for ppc64 -* Mon Apr 29 2002 sf@suse.de -- disabled qthreads for x86_64 -* Thu Apr 04 2002 pmladek@suse.cz -- moved AC_LIBOBJ after AC_PROG_CC because AC_LIBOBJ uses $ac_objext -* Wed Apr 03 2002 pmladek@suse.cz -- fixed to compile with autoconf-2.53 (AC_LIBOBJ vs. LIBOBJS) -* Fri Feb 08 2002 pmladek@suse.cz -- used -a option with automake to fix for PLUS distribution -- added back guile-doc-snarf: work around problem with cpp on ia64 - bebause of 7.2-ia64+kde distribution -* Wed Feb 06 2002 schwab@suse.de -- Don't add /usr/include and /usr/local/include to include search path. -- Avoid trigraph. -- Add support for ia64 register backing store (from cvs). -- Don't build with -O0 on ia64. -* Mon Dec 17 2001 froh@suse.de -- added %%{_libdir} to the specfile where appropriate to make it lib64 - clean. -* Fri Dec 07 2001 pmladek@suse.cz -- fixed for new position of slib library -- SuSEconfig.guile uses check_md5_and_move now -- removed unused package scheme from neededforbuild -* Tue Nov 06 2001 pmladek@suse.cz -- fixed to compile with automake 1.5: - * OMIT_DEPENDENCIES are not supported now -* Sat Sep 15 2001 schwab@suse.de -- Fix libtool configuration. -- Remove ia64 cpp workaround. -- Fix hash functions for 64-bit architectures. -* Fri Aug 31 2001 pmladek@suse.cz -- fixed creating of SLIB catalog (#8997): - - moved from triggerin to SuSEconfig because - there were problems with update when rpm was - updated after guile -* Mon Aug 27 2001 pmladek@suse.cz -- fixed to compile on axp: - * fixed file numbering in qt/md/axp.s - * fixed end of block qt_vstart in qt/md/axp.s -* Fri Aug 10 2001 ro@suse.de -- fixed to build with current autoconf and libtool -* Thu Jun 14 2001 pmladek@suse.cz -- fixed to more correctly compile with new autoconf -* Mon Jun 11 2001 pmladek@suse.cz -- fixed to compile with new autoconf -* Sat May 12 2001 schwab@suse.de -- Fix readline interface. -* Fri Feb 23 2001 ro@suse.de -- added readline/readline-devel to neededforbuild (split from bash) -* Wed Dec 06 2000 schwab@suse.de -- guile-doc-snarf: work around problem with cpp on ia64. -- Build with -O0 on ia64. -* Thu Nov 23 2000 cihlar@suse.cz -- fixed to compile on older distros -* Mon Nov 13 2000 ro@suse.de -- don't redeclare inet_aton -* Wed Nov 08 2000 ro@suse.de -- changed %%post to %%triggerin -- scheme -* Tue Nov 07 2000 cihlar@suse.cz -- added postinstall and link to /usr/lib/scheme/slib -* Fri Nov 03 2000 cihlar@suse.cz -- bzipped sources -- clean up spec file -* Mon Oct 23 2000 ro@suse.de -- use macro for infodir -* Wed Aug 02 2000 cihlar@suse.cz -- update to version 1.4 -* Fri Apr 07 2000 bk@suse.de -- And no QuickThreads yet on s390 too ;-) -* Thu Apr 06 2000 schwab@suse.de -- No QuickThreads yet on ia64. -* Mon Mar 06 2000 schwab@suse.de -- Update config.{guess,sub} from automake. -* Sun Feb 06 2000 ke@suse.de -- Add group tag. -- /configure -> %%build. -- use /usr/share/info. -* Sun Oct 03 1999 ke@suse.de -- update: 1.3.4. -* Mon Sep 13 1999 bs@suse.de -- ran old prepare_spec on spec file to switch to new prepare_spec. -* Tue Sep 07 1999 uli@suse.de -- no QuickThreads on PPC, disabled them -* Wed Aug 25 1999 ro@suse.de -- fixed configuration for alpha-Quickthreads again -* Wed Aug 25 1999 ke@suse.de -- update: 1.3.2. -* Wed Mar 17 1999 ro@suse.de -- fixed patch-call -* Wed Feb 10 1999 ke@suse.de -- apply guile-slow-read-fix.patch (by Harvey J. Stein - ). -- fix lib perms. -* Fri Feb 05 1999 ro@suse.de -- changed config to detect alpha(ev56) as alpha -* Wed Oct 21 1998 ke@suse.de -- update: version 1.3. -- build libqthreads. -* Wed Sep 23 1998 ke@suse.de -- update: snapshot 1998-09-23 (1.3a). -* Sun Aug 23 1998 ke@suse.de -- update: snapshot 1998-08-23 (1.3a). -* Fri Nov 21 1997 bs@suse.de -- don't call ldconfig in spec file -* Tue Jul 15 1997 Karl Eichwalder - * initial package: version 1.2.