add another patch

4 files changed, 32 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d80183af1000..b300a93e0608 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = guile-git
 	pkgdesc = A portable, embeddable Scheme implementation (Git snapshot)
-	pkgver = 3.0.4.r38.g64c89458e
-	pkgrel = 2
+	pkgver = 3.0.5.r139.g498564e3e
+	pkgrel = 1
 	epoch = 1
 	url = http://www.gnu.org/software/guile/
 	arch = i686
@@ -10,7 +10,7 @@ pkgbase = guile-git
 	license = GPL
 	makedepends = git
 	depends = gc
-	depends = libtool
+	depends = libxcrypt
 	depends = libffi
 	depends = libunistring
 	depends = gmp
@@ -23,8 +23,10 @@ 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 = 555e6d5491ddbe66a30fdec4a8e1897d4bbbb4131083b831e41af33c172010b9
+	sha256sums = abd56cf6686d0a2563ffdac23cf482623b2a075cfd37242dd57ec8b2f9ff7510
+	sha256sums = 92a567547a21add555487f0979a618de2e6daf25bd0d483866d62ca18fe12140
 
 pkgname = guile-git
 
diff --git a/PKGBUILD b/PKGBUILD
index fbbbbb84e6df..0e43f4d7ea80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,22 @@
 pkgname=guile-git
 epoch=1
 _majorver=3.0
-pkgver=3.0.4.r38.g64c89458e
-pkgrel=2
+pkgver=3.0.5.r139.g498564e3e
+pkgrel=1
 pkgdesc="A portable, embeddable Scheme implementation (Git snapshot)"
 arch=('i686' 'x86_64' 'aarch64')
 license=('GPL')
 makedepends=('git')
 optdepends=('texinfo: for using texinfo scheme sources')
-depends=('gc' 'libtool' 'libffi' 'libunistring' 'gmp' 'readline')
+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)
+source=("git+https://git.savannah.gnu.org/git/${pkgname%-git}.git" rename_infofile.diff rename_infofile2.diff)
 url="http://www.gnu.org/software/guile/"
 sha256sums=('SKIP'
-            '555e6d5491ddbe66a30fdec4a8e1897d4bbbb4131083b831e41af33c172010b9')
+            'abd56cf6686d0a2563ffdac23cf482623b2a075cfd37242dd57ec8b2f9ff7510'
+            '92a567547a21add555487f0979a618de2e6daf25bd0d483866d62ca18fe12140')
 
 pkgver() {
   cd ${pkgname%-git}
@@ -27,6 +28,7 @@ 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 
 }
@@ -35,13 +37,15 @@ build() {
   cd ${pkgname%-git}
   ./autogen.sh
   ./configure --prefix=/usr --program-suffix=${_majorver}
-  make LDFLAGS+=" -lpthread"
+#  echo "@set EFFECTIVE-VERSION ${_majorver}" > doc/ref/effective-version.texi
+  make LDFLAGS+=" -lpthread" -j1
 }
 
 package() {
   cd ${pkgname%-git}
   make DESTDIR="$pkgdir/" install
 
-  mv "$pkgdir"/usr/share/aclocal/guile.m4 "$pkgdir"/usr/share/aclocal/guile-${_majorver}.m4
+  install -Dm644 "$pkgdir"/usr/share/aclocal/guile.m4 "$pkgdir"/usr/share/aclocal/guile-${_majorver}.m4
+  rm "$pkgdir"/usr/share/aclocal/guile.m4
   rm "$pkgdir"/usr/lib/libguile-3.0.so.*-gdb.scm
 }
diff --git a/rename_infofile.diff b/rename_infofile.diff
index f279f458170f..9424274f9427 100644
--- a/rename_infofile.diff
+++ b/rename_infofile.diff
@@ -1,5 +1,5 @@
 diff --git a/doc/ref/Makefile.am b/doc/ref/Makefile.am
-index 2f4b8ca88..c6fe2ec93 100644
+index 2f4b8ca88..939e1966c 100644
 --- a/doc/ref/Makefile.am
 +++ b/doc/ref/Makefile.am
 @@ -22,7 +22,7 @@
@@ -12,7 +12,7 @@ index 2f4b8ca88..c6fe2ec93 100644
  guile_TEXINFOS = preface.texi			\
                   intro.texi			\
 diff --git a/doc/ref/guile.texi b/doc/ref/guile.texi
-index 9f3fe2d72..2f40b9dba 100644
+index 660b1ae90..c3c6b300c 100644
 --- a/doc/ref/guile.texi
 +++ b/doc/ref/guile.texi
 @@ -1,7 +1,7 @@
diff --git a/rename_infofile2.diff b/rename_infofile2.diff
new file mode 100644
index 000000000000..0971b908ce99
--- /dev/null
+++ b/rename_infofile2.diff
@@ -0,0 +1,13 @@
+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