From 9de0f449f045b954603acee6b94a3af9e4a1f65a Mon Sep 17 00:00:00 2001
From: tmpfile <tmpfile@users.noreply.github.com>
Date: Tue, 26 Sep 2017 06:27:17 -0300
Subject: main/guile: upgrade to 2.2.2

---
 ...x-with-owner-not-retained-threads-test-as-u.patch |  2 +-
 main/guile/APKBUILD                                  | 20 +++++++-------------
 2 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'main/guile')

diff --git a/main/guile/0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch b/main/guile/0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
index cbe194dfd5..6004812728 100644
--- a/main/guile/0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
+++ b/main/guile/0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
@@ -14,7 +14,7 @@ diff --git a/test-suite/tests/threads.test b/test-suite/tests/threads.test
 index 8178120..7d180de 100644
 --- a/test-suite/tests/threads.test
 +++ b/test-suite/tests/threads.test
-@@ -412,8 +412,10 @@
+@@ -389,8 +389,10 @@
  
              (gc) (gc)
              (let ((m (g)))
diff --git a/main/guile/APKBUILD b/main/guile/APKBUILD
index 09cc1c1a33..228af42e61 100644
--- a/main/guile/APKBUILD
+++ b/main/guile/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=guile
-pkgver=2.0.13
+pkgver=2.2.2
 pkgrel=0
 pkgdesc="Guile is a portable, embeddable Scheme implementation written in C"
 url="http://www.gnu.org/software/guile/"
@@ -8,10 +8,9 @@ arch="all"
 license="GPL"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
 makedepends="gmp-dev libtool ncurses-dev texinfo libunistring-dev libffi-dev
-	gc-dev"
+	gc-dev bash"
 depends=
 depends_dev="guile gc-dev"
-install=
 source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz
 	0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
 	"
@@ -25,20 +24,15 @@ build() {
 		--host=$CHOST \
 		--prefix=/usr \
 		--disable-error-on-warning \
-		--disable-static \
-		|| return 1
-	make || return 1
+		--disable-static
+	make
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	rm "$pkgdir"/usr/lib/charset.alias
 }
 
-md5sums="dac267e76330176d48583258aeaa7016  guile-2.0.13.tar.gz
-00b381cff020d6b43de150a99d08d955  0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch"
-sha256sums="ee8073c4582bb4f06412452fdf5dd185aae607441f1313c824f44bdd668b0bde  guile-2.0.13.tar.gz
-760355a63be9b756607a03352ceb916dfba02da917fa00c6bc07253d0f7c75f6  0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch"
-sha512sums="79fd5fda5064331eb687934ec3eaf07943f5b23bd05fbce23ab5ee3698864250b33746e33b8f074692b56f7b428dac42ed5d3f5b9dc17d171aa6dfadc1625b00  guile-2.0.13.tar.gz
-b1c309cc07830ff1741ef88857f8099187b449580e8d57862886abc367ef1accc5a35636d81eee09247f13d3a751cdc8909fdea05368d3d509bd2039ce06d078  0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch"
+sha512sums="dfc4a413faa8d7cd111beb3673e52be3d95c5c408c6796c874cdd01c095a05bc266856c45067aef3b931889349980d0985dde269aabde18f21659d02f5c2344d  guile-2.2.2.tar.gz
+54a9fe0fa2ea83da7ae61f96612e3e653ec80f60ab41d1995dc44bd05c7ff68cc4fab36a655e8835c4ab1cf0966765a299ef2d73cb9f69d3ef955e6aeaa8062d  0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch"
-- 
cgit v1.2.3