Sat May 11 01:48:09 PDT 2013

2 files changed, 62 insertions, 10 deletions

diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 752376596..adbbb6f91 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178213 2013-02-18 09:01:22Z juergen $
+# $Id: PKGBUILD 185032 2013-05-10 12:58:50Z juergen $
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Daniel White <daniel@whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Leslie Polzer (skypher)
 
 pkgname=sbcl
-pkgver=1.1.4
+pkgver=1.1.7
 pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 url="http://www.sbcl.org/"
@@ -13,18 +13,37 @@ arch=('i686' 'x86_64')
 license=('custom')
 depends=('glibc' 'zlib')
 provides=('common-lisp' 'cl-asdf')
-makedepends=('sbcl' 'texinfo')
+makedepends=('sbcl')
 install=sbcl.install
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
-        "arch-fixes.lisp")
-md5sums=('9d82ec89abbaf265fbfc71a24445dd66'
-         '7ac0c1936547f4278198b8bf7725204d')
+  "arch-fixes.lisp"
+  "ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-4.13a.tar.gz"
+  "texinfo-4.13a-data_types.patch")
+md5sums=('ca3dd0ce2943e10a1c86ff5f40db3f85'
+         '7ac0c1936547f4278198b8bf7725204d'
+         '71ba711519209b5fb583fed2b3d86fcb'
+         'd8574782ff7def1e2dc5c291dbeaec18')
+
+
+# Temporary Texinfo legacy build
+# See: http://sourceforge.net/mailarchive/message.php?msg_id=30747919
+
+build-texinfo-legacy() {
+  cd ${srcdir}/texinfo-4.13
+  patch -Np1 -i $srcdir/texinfo-4.13a-data_types.patch
+  mkdir -p $srcdir/texinfo-instroot
+  ./configure --prefix=$srcdir/texinfo-instroot
+  make install
+}
 
 build() {
+  build-texinfo-legacy
+  export PATH=$srcdir/texinfo-instroot/bin:$PATH
+
   cd "$srcdir/$pkgname-$pkgver"
 
-  export CFLAGS+=" -D_GNU_SOURCE -DSBCL_HOME=\\\"/usr/lib/sbcl\\\""
-  export GNUMAKE="make -e"
+  export CFLAGS+=" -D_GNU_SOURCE -fno-omit-frame-pointer -DSBCL_HOME=/usr/lib/sbcl"
+  export GNUMAKE="make"
 
   # build system uses LINKFLAGS and OS_LIBS to build LDFLAGS
   export LINKFLAGS="$LDFLAGS"
@@ -40,14 +59,15 @@ build() {
   (disable :largefile)))
 EOF
 
-  sh make.sh sbcl
+  sh make.sh sbcl --prefix=/usr
   make -C doc/manual info
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  INSTALL_ROOT="$pkgdir/usr" sh install.sh
+  # cannot have both SBCL_HOME and INSTALL_ROOT
+  SBCL_HOME="" INSTALL_ROOT="$pkgdir/usr" sh install.sh
 
   src/runtime/sbcl --core output/sbcl.core --script "${srcdir}/arch-fixes.lisp"
   mv sbcl-new.core "${pkgdir}/usr/lib/sbcl/sbcl.core"
diff --git a/extra/sbcl/texinfo-4.13a-data_types.patch b/extra/sbcl/texinfo-4.13a-data_types.patch
new file mode 100644
index 000000000..2a87c2146
--- /dev/null
+++ b/extra/sbcl/texinfo-4.13a-data_types.patch
@@ -0,0 +1,32 @@
+diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c
+--- texinfo-4.13/info/window.c_old	2009-08-04 13:46:15.000000000 +0200
++++ texinfo-4.13/info/window.c	2009-08-04 13:47:29.000000000 +0200
+@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st
+       const char *carried_over_ptr;
+       size_t carried_over_len, carried_over_count;
+       const char *cur_ptr = mbi_cur_ptr (iter);
+-      int cur_len = mb_len (mbi_cur (iter));
++      size_t cur_len = mb_len (mbi_cur (iter));
+       int replen;
+       int delim = 0;
+       int rc;
+@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage)
+        mbi_advance (iter))
+     {
+       const char *cur_ptr = mbi_cur_ptr (iter);
+-      int cur_len = mb_len (mbi_cur (iter));
++      size_t cur_len = mb_len (mbi_cur (iter));
+ 
+       if (cur_len == 1)
+ 	{
+@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line,
+        mbi_advance (iter))
+     {
+       const char *cur_ptr = mbi_cur_ptr (iter);
+-      int cur_len = mb_len (mbi_cur (iter));
+-      int replen;
++      size_t cur_len = mb_len (mbi_cur (iter));
++      size_t replen;
+ 
+       if (cur_ptr >= endp)
+ 	break;