fixes

4 files changed, 35 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b300a93e0608..c86fa082a5c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = guile-git
 	pkgdesc = A portable, embeddable Scheme implementation (Git snapshot)
-	pkgver = 3.0.5.r139.g498564e3e
+	pkgver = 3.0.5.r140.g01bfd18f3
 	pkgrel = 1
 	epoch = 1
 	url = http://www.gnu.org/software/guile/
@@ -23,10 +23,8 @@ pkgbase = guile-git
 	options = libtool
 	source = git+https://git.savannah.gnu.org/git/guile.git
 	source = rename_infofile.diff
-	source = rename_infofile2.diff
 	sha256sums = SKIP
-	sha256sums = abd56cf6686d0a2563ffdac23cf482623b2a075cfd37242dd57ec8b2f9ff7510
-	sha256sums = 92a567547a21add555487f0979a618de2e6daf25bd0d483866d62ca18fe12140
+	sha256sums = b2674297c0b4ceba1f94616f04a1bf3ae5586cc27433978a5e7e35b71e2ad53f
 
 pkgname = guile-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 0e43f4d7ea80..455852c9dc71 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=guile-git
 epoch=1
 _majorver=3.0
-pkgver=3.0.5.r139.g498564e3e
+pkgver=3.0.5.r140.g01bfd18f3
 pkgrel=1
 pkgdesc="A portable, embeddable Scheme implementation (Git snapshot)"
 arch=('i686' 'x86_64' 'aarch64')
@@ -14,11 +14,10 @@ depends=('gc' 'libxcrypt' 'libffi' 'libunistring' 'gmp' 'readline')
 provides=('guile')
 conflicts=('guile4emacs')
 options=('!strip' '!makeflags' 'libtool')
-source=("git+https://git.savannah.gnu.org/git/${pkgname%-git}.git" rename_infofile.diff rename_infofile2.diff)
+source=("git+https://git.savannah.gnu.org/git/${pkgname%-git}.git" rename_infofile.diff)
 url="http://www.gnu.org/software/guile/"
 sha256sums=('SKIP'
-            'abd56cf6686d0a2563ffdac23cf482623b2a075cfd37242dd57ec8b2f9ff7510'
-            '92a567547a21add555487f0979a618de2e6daf25bd0d483866d62ca18fe12140')
+            'b2674297c0b4ceba1f94616f04a1bf3ae5586cc27433978a5e7e35b71e2ad53f')
 
 pkgver() {
   cd ${pkgname%-git}
@@ -28,17 +27,19 @@ pkgver() {
 prepare() {
   cd ${pkgname%-git}
   git apply "$srcdir"/rename_infofile.diff
-  git apply "$srcdir"/rename_infofile2.diff
   cd doc/ref
   mv guile.texi guile-3.0.texi 
 }
 
 build() {
   cd ${pkgname%-git}
-  ./autogen.sh
+  top_srcdir="$srcdir"/${pkgname%-git} top_builddir=$top_srcdir ./autogen.sh
   ./configure --prefix=/usr --program-suffix=${_majorver}
-#  echo "@set EFFECTIVE-VERSION ${_majorver}" > doc/ref/effective-version.texi
-  make LDFLAGS+=" -lpthread" -j1
+  make LDFLAGS+=" -lpthread" || true
+  cd doc/ref
+  echo "@set EFFECTIVE-VERSION ${_majorver}" > effective-version.texi
+  GUILE_AUTO_COMPILE=0 "$srcdir"/${pkgname%-git}/meta/build-env guild snarf-guile-m4-docs "$srcdir"/${pkgname%-git}/meta/guile.m4 >autoconf-macros.texi
+  make 
 }
 
 package() {
diff --git a/rename_infofile.diff b/rename_infofile.diff
index 9424274f9427..71125c50c375 100644
--- a/rename_infofile.diff
+++ b/rename_infofile.diff
@@ -1,5 +1,18 @@
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index f1c694551..80298ef5d 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -21,7 +21,7 @@
+ 
+ AUTOMAKE_OPTIONS = gnu
+ 
+-SUBDIRS = ref r5rs
++SUBDIRS = ref
+ 
+ dist_man1_MANS = guile.1
+ 
 diff --git a/doc/ref/Makefile.am b/doc/ref/Makefile.am
-index 2f4b8ca88..939e1966c 100644
+index 2f4b8ca88..8f3805387 100644
 --- a/doc/ref/Makefile.am
 +++ b/doc/ref/Makefile.am
 @@ -22,7 +22,7 @@
@@ -11,16 +24,13 @@ index 2f4b8ca88..939e1966c 100644
  
  guile_TEXINFOS = preface.texi			\
                   intro.texi			\
-diff --git a/doc/ref/guile.texi b/doc/ref/guile.texi
-index 660b1ae90..c3c6b300c 100644
---- a/doc/ref/guile.texi
-+++ b/doc/ref/guile.texi
-@@ -1,7 +1,7 @@
- \input texinfo
- @c -*-texinfo-*-
- @c %**start of header
--@setfilename guile.info
-+@setfilename guile-3.0.info
- @documentencoding UTF-8
- @settitle Guile Reference Manual
- @set guile
+@@ -128,7 +128,7 @@ autoconf-macros.texi: $(top_srcdir)/meta/guile.m4
+ # triggering a rebuild of `guile.info'.  Note that `GUILE-VERSION' is
+ # among $(CONFIG_STATUS_DEPENDENCIES); thus, when it's updated, this
+ # Makefile is rebuilt, and $(GUILE_EFFECTIVE_VERSION) is up-to-date.
+-$(srcdir)/effective-version.texi: $(top_srcdir)/GUILE-VERSION
++effective-version.texi:
+ 	echo "@set EFFECTIVE-VERSION $(GUILE_EFFECTIVE_VERSION)" > $@
+ 
+ MAINTAINERCLEANFILES = autoconf-macros.texi
+
diff --git a/rename_infofile2.diff b/rename_infofile2.diff
deleted file mode 100644
index 0971b908ce99..000000000000
--- a/rename_infofile2.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/doc/ref/Makefile.am b/doc/ref/Makefile.am
-index 2f4b8ca88..939e1966c 100644
---- a/doc/ref/Makefile.am
-+++ b/doc/ref/Makefile.am
-@@ -128,7 +128,7 @@ autoconf-macros.texi: $(top_srcdir)/meta/guile.m4
- # triggering a rebuild of `guile.info'.  Note that `GUILE-VERSION' is
- # among $(CONFIG_STATUS_DEPENDENCIES); thus, when it's updated, this
- # Makefile is rebuilt, and $(GUILE_EFFECTIVE_VERSION) is up-to-date.
--$(srcdir)/effective-version.texi: $(top_srcdir)/GUILE-VERSION
-+effective-version.texi:
- 	echo "@set EFFECTIVE-VERSION $(GUILE_EFFECTIVE_VERSION)" > $@
- 
- MAINTAINERCLEANFILES = autoconf-macros.texi