[jhbuild] [bootstrap] Bump guile to 1.8.7 & patch (GNOME bug 636921)

[Craig Keogh <cskeogh src gnome org>]

commit 83179b20120d4b908434171a5a5801f675228acb
Author: Craig Keogh <cskeogh adam com au>
Date:   Sat Dec 11 10:56:40 2010 +1030

    [bootstrap] Bump guile to 1.8.7 & patch (GNOME bug 636921)

 modulesets/bootstrap.modules         |   14 ++++++--
 patches/guile-1.8.5-libtool2.patch   |   55 ----------------------------------
 patches/guile-1.8.7-445f31fc06.patch |   35 +++++++++++++++++++++
 3 files changed, 45 insertions(+), 59 deletions(-)
---
diff --git a/modulesets/bootstrap.modules b/modulesets/bootstrap.modules
index 0f39b58..8bd11e5 100644
--- a/modulesets/bootstrap.modules
+++ b/modulesets/bootstrap.modules
@@ -82,10 +82,16 @@
   </tarball>
 
   <autotools id="guile" autogenargs="--enable-error-on-warning=no">
-    <branch repo="ftp.gnu.org" module="guile/guile-1.8.5.tar.gz"
-            version="1.8.5"
-            size="3933369" md5sum="a3f8216544509a74a4441f689a0410d2">
-      <patch file="guile-1.8.5-libtool2.patch" strip="1"/>
+    <branch repo="ftp.gnu.org" module="guile/guile-1.8.7.tar.gz"
+            version="1.8.7"
+            hash="sha1:24cd2f06439c76d41d982a7384fe8a0fe5313b54"
+            md5sum="991b5b3efcbbc3f7507d05bc42f80a5e"
+            size="4026804">
+      <!-- Patch to build with gcc 4.5. http://savannah.gnu.org/bugs/?29583
+           Remove when 1.8.8 released. Patch from:
+           http://git.savannah.gnu.org/cgit/guile.git/commit/?id=445f31fc06d338f0cafda188d0287f935c2edc3c
+        -->
+      <patch file="guile-1.8.7-445f31fc06.patch" strip="2"/>
     </branch>
     <dependencies>
       <dep package="gmp"/>
diff --git a/patches/guile-1.8.7-445f31fc06.patch b/patches/guile-1.8.7-445f31fc06.patch
new file mode 100644
index 0000000..320c01c
--- /dev/null
+++ b/patches/guile-1.8.7-445f31fc06.patch
@@ -0,0 +1,35 @@
+From 445f31fc06d338f0cafda188d0287f935c2edc3c Mon Sep 17 00:00:00 2001
+From: Andy Wingo <wingo oblong net>
+Date: Sun, 17 Jan 2010 17:22:51 +0000
+Subject: fix doc snarfing with fedora 12
+
+* module/scripts/snarf-check-and-output-texi.scm
+  (process-multiline-directive): Be more accepting of source location
+  markers in the preprocessed source, by adding a couple cases in which
+  they can appear. Not foolproof, but it does adapt to what new GCCs are
+  putting out (e.g. cpp (GCC) 4.4.2 20091222 (Red Hat 4.4.2-20)).
+---
+diff --git a/module/scripts/snarf-check-and-output-texi b/module/scripts/snarf-check-and-output-texi
+index 0e7efae..f92c833 100644
+--- a/module/scripts/snarf-check-and-output-texi
++++ b/module/scripts/snarf-check-and-output-texi
+@@ -262,6 +262,17 @@
+       (set! *file* file)
+       (set! *line* line))
+ 
++     ;; newer gccs like to throw around more location markers into the
++     ;; preprocessed source; these (hash . hash) bits are what they translate to
++     ;; in snarfy terms.
++     (('location ('string . file) ('int . line) ('hash . 'hash))
++      (set! *file* file)
++      (set! *line* line))
++
++     (('location ('hash . 'hash) ('string . file) ('int . line) ('hash . 'hash))
++      (set! *file* file)
++      (set! *line* line))
++
+      (('arglist rest ...)
+       (set! *args* (do-arglist rest)))
+ 
+--
+cgit v0.8.3.2