[arch-commits] Commit in libuv/trunk (2 files)

[Massimiliano Torromeo]

    Date: Tuesday, August 19, 2014 @ 00:24:01
  Author: mtorromeo
Revision: 117559

upgpkg: libuv 0.11.28-1

Updated to 0.11.28

Added:
  libuv/trunk/09cb5b534e325fa93ec2d72491dff85179797f89.patch
Modified:
  libuv/trunk/PKGBUILD

------------------------------------------------+
 09cb5b534e325fa93ec2d72491dff85179797f89.patch |   47 +++++++++++++++++++++++
 PKGBUILD                                       |   26 +++++++-----
 2 files changed, 63 insertions(+), 10 deletions(-)

Added: 09cb5b534e325fa93ec2d72491dff85179797f89.patch
===================================================================
--- 09cb5b534e325fa93ec2d72491dff85179797f89.patch	                        (rev 0)
+++ 09cb5b534e325fa93ec2d72491dff85179797f89.patch	2014-08-18 22:24:01 UTC (rev 117559)
@@ -0,0 +1,47 @@
+From 09cb5b534e325fa93ec2d72491dff85179797f89 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul at gmail.com>
+Date: Sun, 10 Aug 2014 11:18:03 +0200
+Subject: [PATCH] test: fix spawn_reads_child_path when using autoconf
+
+Don't hardcode the name of the executable, take it from the exepath.
+
+Fixes #1407
+---
+ test/test-spawn.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/test/test-spawn.c b/test/test-spawn.c
+index 57f0862..11f43bd 100644
+--- a/test/test-spawn.c
++++ b/test/test-spawn.c
+@@ -1295,23 +1295,25 @@ TEST_IMPL(closed_fd_events) {
+ TEST_IMPL(spawn_reads_child_path) {
+   int r;
+   int len;
++  char file[64];
+   char path[1024];
+   char *env[2] = {path, NULL};
+ 
+   /* Set up the process, but make sure that the file to run is relative and */
+   /* requires a lookup into PATH */
+   init_process_options("spawn_helper1", exit_cb);
+-  options.file = "run-tests";
+-  args[0] = "run-tests";
+ 
+   /* Set up the PATH env variable */
+   for (len = strlen(exepath);
+        exepath[len - 1] != '/' && exepath[len - 1] != '\\';
+        len--);
++  strcpy(file, exepath + len);
+   exepath[len] = 0;
+   strcpy(path, "PATH=");
+   strcpy(path + 5, exepath);
+ 
++  options.file = file;
++  options.args[0] = file;
+   options.env = env;
+ 
+   r = uv_spawn(uv_default_loop(), &process, &options);
+-- 
+2.0.3
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-18 22:18:19 UTC (rev 117558)
+++ PKGBUILD	2014-08-18 22:24:01 UTC (rev 117559)
@@ -2,7 +2,7 @@
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
 
 pkgname=libuv
-pkgver=0.11.27
+pkgver=0.11.28
 pkgrel=1
 pkgdesc="A new platform layer for Node.JS"
 arch=('i686' 'x86_64')
@@ -9,10 +9,15 @@
 url="https://github.com/joyent/libuv"
 license=('custom')
 depends=('glibc')
-source=("https://github.com/joyent/libuv/archive/v$pkgver.tar.gz")
+source=("https://github.com/joyent/libuv/archive/v$pkgver.tar.gz" "09cb5b534e325fa93ec2d72491dff85179797f89.patch")
 
+prepare() {
+	cd "$srcdir"/$pkgname-$pkgver
+	patch -p1 -i "$srcdir"/09cb5b534e325fa93ec2d72491dff85179797f89.patch
+}
+
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$srcdir"/$pkgname-$pkgver
 	./autogen.sh
 	./configure --prefix=/usr
 	make
@@ -19,23 +24,24 @@
 }
 
 check() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$srcdir"/$pkgname-$pkgver
 	make check
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$srcdir"/$pkgname-$pkgver
 
 	make DESTDIR="$pkgdir" install
 
 	install -Dm644 LICENSE \
-		"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 	install -Dm644 AUTHORS \
-		"$pkgdir/usr/share/doc/$pkgname/AUTHORS"
+		"$pkgdir"/usr/share/doc/$pkgname/AUTHORS
 	install -Dm644 README.md \
-		"$pkgdir/usr/share/doc/$pkgname/README.md"
+		"$pkgdir"/usr/share/doc/$pkgname/README.md
 	install -Dm644 ChangeLog \
-		"$pkgdir/usr/share/doc/$pkgname/ChangeLog"
+		"$pkgdir"/usr/share/doc/$pkgname/ChangeLog
 }
 
-sha256sums=('68ffa82ef2b894df5d6e530cc70735fa3633857b69f078923b6580b182dc1cd3')
+sha256sums=('dde48073b5d46de5892fea31e6d5384134ec729bb0e31ef06754e4c73f89ae75'
+            '9c045143927ae7389aa415e0b7fbdfbeb023bd5534ff0cd8ae53f0267f809836')