new patch from upstream, correct paths

4 files changed, 74 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c9f3524ccb00..754652aa7545 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = guile-reader
 	pkgdesc = a simple framework for building readers for GNU Guile
 	pkgver = 0.6.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.nongnu.org/guile-reader
 	arch = i686
 	arch = x86_64
@@ -11,9 +11,9 @@ pkgbase = guile-reader
 	depends = guile
 	options = !strip
 	source = http://download.savannah.nongnu.org/releases/guile-reader/guile-reader-0.6.2.tar.gz
-	source = reader_flag.patch
-	md5sums = 4491d6c601c151b48bcdb0b30c919a99
-	md5sums = 577ee71c71dda2ac1fdd942dd18adc82
+	source = gperf3.1.patch
+	sha256sums = fdcda586d8b5b15976df26b674fc4b2b9b4623db8e301a39aef85685b4d02215
+	sha256sums = 8e30fbd77f98d38d430a3641458b789714575117375a93fbbc50fad719383b06
 
 pkgname = guile-reader
 
diff --git a/PKGBUILD b/PKGBUILD
index 439efd9d23e3..2fad02e29ea5 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,39 +3,31 @@
 pkgname=guile-reader
 _gitname=guile-reader
 pkgver=0.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="a simple framework for building readers for GNU Guile"
 url="http://www.nongnu.org/guile-reader"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('guile')
 makedepends=('gperf' 'git')
-source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz" reader_flag.patch)
-md5sums=('4491d6c601c151b48bcdb0b30c919a99'
-         '577ee71c71dda2ac1fdd942dd18adc82')
+source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz" gperf3.1.patch)
+sha256sums=('fdcda586d8b5b15976df26b674fc4b2b9b4623db8e301a39aef85685b4d02215'
+            '8e30fbd77f98d38d430a3641458b789714575117375a93fbbc50fad719383b06')
 options=('!strip')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -Np1 < $srcdir/reader_flag.patch
+  patch -Np1 < "$srcdir"/gperf3.1.patch
 }
 
 build() {
   cd $pkgname-$pkgver
-  # avoid autoreconf failure
-  [[ -d  build-aux ]] || mkdir -p build-aux
-  touch build-aux/config.rpath
-  # recreate configure and make files
   autoreconf -i --force --verbose
-  # configure
-  CFLAGS= CPPFLAGS= LDFLAGS= GUILE_SITE=/usr/share/guile/site ./configure \
-	--prefix=/usr --with-guilemoduledir=/usr/share/guile/site
-  # compile
+  CFLAGS= CPPFLAGS= LDFLAGS=  ./configure --prefix=/usr 
   make
 }
 
 package() {
   cd $pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  rm $pkgdir/usr/share/info/dir
+  make DESTDIR="$pkgdir" install
 }
diff --git a/gperf3.1.patch b/gperf3.1.patch
new file mode 100644
index 000000000000..18d0a887f0fd
--- /dev/null
+++ b/gperf3.1.patch
@@ -0,0 +1,63 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9d1ba86..e029bac 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -34,8 +34,10 @@ snarfcppopts = $(DEFS) $(INCLUDES) $(CPPFLAGS) $(AM_CPPFLAGS) \
+ # Token reader lookup.
+ token-reader-lookup.c: $(srcdir)/token-readers.h
+ 	$(AM_V_GEN) LC_ALL=C ; export LC_ALL ; cat $< |	\
+-	$(srcdir)/extract-token-readers.sh | \
+-	$(GPERF) -t -C -N _scm_token_reader_lookup > $@
++	$(srcdir)/extract-token-readers.sh |		\
++	$(GPERF) -t -C -N _scm_token_reader_lookup |	\
++	$(SED) -e's/register //g' > "$@.tmp"
++	mv "$@.tmp" "$@"
+ 
+ token-reader-list.c: $(srcdir)/token-readers.h
+ 	$(AM_V_GEN) LC_ALL=C ; export LC_ALL ; cat $< | \
+@@ -44,6 +46,8 @@ token-reader-list.c: $(srcdir)/token-readers.h
+ 
+ # `make-reader' flags.
+ make-reader-flags.c: $(srcdir)/reader.h
+-	$(AM_V_GEN) LC_ALL=C ; export LC_ALL ; cat $< | \
+-	$(srcdir)/extract-make-reader-flags.sh | \
+-	$(GPERF) -t -C -N _scm_to_make_reader_flag > $@
++	$(AM_V_GEN) LC_ALL=C ; export LC_ALL ; cat $< |	\
++	$(srcdir)/extract-make-reader-flags.sh |	\
++	$(GPERF) -t -C -N _scm_to_make_reader_flag |	\
++	$(SED) -e's/register //g' > "$@.tmp"
++	mv "$@.tmp" "$@"
+diff --git a/src/reader.c b/src/reader.c
+index b74b661..0dd0771 100644
+--- a/src/reader.c
++++ b/src/reader.c
+@@ -1,6 +1,6 @@
+ /* A Scheme reader compiler for Guile.
+ 
+-   Copyright (C) 2005, 2006, 2007, 2008, 2012, 2016 Ludovic Courtès <ludo@gnu.org>
++   Copyright (C) 2005, 2006, 2007, 2008, 2012, 2016, 2018 Ludovic Courtès <ludo@gnu.org>
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -1940,7 +1940,7 @@ scm_to_reader (SCM reader)
+ struct scm_reader_flag_entry;
+ 
+ const struct scm_reader_flag_entry *
+-_scm_to_make_reader_flag (const char *, unsigned int);
++_scm_to_make_reader_flag (const char *, size_t);
+ 
+ /* Include the automatically-generated perfect hash function.  */
+ #include "make-reader-flags.c"
+diff --git a/src/token-readers.c b/src/token-readers.c
+index c0a9057..811e635 100644
+--- a/src/token-readers.c
++++ b/src/token-readers.c
+@@ -1139,7 +1139,7 @@ scm_read_skribe_exp (scm_t_wchar chr, SCM port, scm_reader_t reader,
+ /* Directory of standard token readers.  */
+ 
+ extern const struct scm_token_reader_entry *
+-_scm_token_reader_lookup (const char *, unsigned int);
++_scm_token_reader_lookup (const char *, size_t);
+ 
+ #include <string.h>
+ #include "token-reader-lookup.c"
diff --git a/reader_flag.patch b/reader_flag.patch
deleted file mode 100644
index a88825495448..000000000000
--- a/reader_flag.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/reader.c b/src/reader.c
-index b74b661..73d6754 100644
---- a/src/reader.c
-+++ b/src/reader.c
-@@ -1940,7 +1940,7 @@ scm_to_reader (SCM reader)
- struct scm_reader_flag_entry;
- 
- const struct scm_reader_flag_entry *
--_scm_to_make_reader_flag (const char *, unsigned int);
-+_scm_to_make_reader_flag (register const char *str, register size_t len);
- 
- /* Include the automatically-generated perfect hash function.  */
- #include "make-reader-flags.c"
-diff --git a/src/token-readers.c b/src/token-readers.c
-index c0a9057..5181347 100644
---- a/src/token-readers.c
-+++ b/src/token-readers.c
-@@ -1139,7 +1139,7 @@ scm_read_skribe_exp (scm_t_wchar chr, SCM port, scm_reader_t reader,
- /* Directory of standard token readers.  */
- 
- extern const struct scm_token_reader_entry *
--_scm_token_reader_lookup (const char *, unsigned int);
-+_scm_token_reader_lookup (register const char *str, register size_t len);
- 
- #include <string.h>
- #include "token-reader-lookup.c"