main/libev: upgrade to 4.15

4 files changed, 24 insertions, 77 deletions

diff --git a/main/libev/APKBUILD b/main/libev/APKBUILD
index 066e6aed48..0bc2576a9b 100644
--- a/main/libev/APKBUILD
+++ b/main/libev/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libev
-pkgver=4.11
-pkgrel=1
+pkgver=4.15
+pkgrel=0
 pkgdesc="event dispatch library"
 url="http://libev.schmorp.de/"
 arch="all"
@@ -14,8 +14,7 @@ install=""
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://dist.schmorp.de/${pkgname}/${pkgname}-${pkgver}.tar.gz
 	libev-4.11-Add-pkgconfig-support.patch
-	libev-4.11-Modernize-the-configure.ac.patch
-	libev-4.11-Respect-the-CFLAGS-if-defined.patch
+	modernize-configure.ac.patch
 	"
 
 _builddir="${srcdir}/${pkgname}-${pkgver}"
@@ -45,15 +44,12 @@ package() {
 		"$pkgdir"/usr/lib/*.la
 }
 
-md5sums="cda69b858a1849dfe6ce17c930cf10cd  libev-4.11.tar.gz
+md5sums="3a73f247e790e2590c01f3492136ed31  libev-4.15.tar.gz
 acec6b40b5ebea613fb0829f84e8a48b  libev-4.11-Add-pkgconfig-support.patch
-7e4870998ed6e0d1350181c906c7aef5  libev-4.11-Modernize-the-configure.ac.patch
-4fc88fe789946b6cf44a04dc4d39cfc2  libev-4.11-Respect-the-CFLAGS-if-defined.patch"
-sha256sums="9f55f16ff6e4d60a1b1fa7f4962af69768468f0d7c362aab6387f52020938cdf  libev-4.11.tar.gz
+706ce3b6f333326ee3baa9bf6c631928  modernize-configure.ac.patch"
+sha256sums="b2dd43a073556f5350cbed05b6ef444dcc4b563f4e0b1009d7bf448261606feb  libev-4.15.tar.gz
 2228eb682631655678e172a647238bf9c00b5ea8e732b45795e45fe5d79e1ffb  libev-4.11-Add-pkgconfig-support.patch
-b7e38bc90a2f1b688726ef24382d4c65f6381b0708f1f674bcc1c8df1df4e2d6  libev-4.11-Modernize-the-configure.ac.patch
-c581f42f82c9d63a1a9d56d64de35eadd40773cfa1f076594b4c48cd6b1533cc  libev-4.11-Respect-the-CFLAGS-if-defined.patch"
-sha512sums="802d9f28781140ccb2634e80b7ca73f694203d95da0b4d3ee38edff4c89db94d3073a61a7b95af0ede5865ade6b48f4960c9f33ba73e088779eedd1e396a8817  libev-4.11.tar.gz
+9fd00ab7cc6a6ef63ebf2d7f71717c7ebf8da21e0e3d953a79febf8490548e93  modernize-configure.ac.patch"
+sha512sums="bb3ab98d92e565bf2273d71c9004b84ad3b305c4e883482392fe6c701949344731bb4e391ac77578f71d9a80f0ec4b6afc2ae5449d4093cdcbee26d7dc17929d  libev-4.15.tar.gz
 b5bc1b5ed1e605cd45a01adce70c1a97188c0b46a36333f12eccd4407c95d96f18adff90ee8c5733c1783a36b4adc5ef67d6b470104339a1ac5c4539a2a4599e  libev-4.11-Add-pkgconfig-support.patch
-bc4070d8bce60aa65f93aa000bf186f21604880d0c1c4f096a036f6d72d2a2b2a2513e9fc7375515ce73bbae7ea9baec0369dc2978720a13a317dc713fdc6f81  libev-4.11-Modernize-the-configure.ac.patch
-caeb95c0610f93f8cba6e3d06414b004ce9d19bacda0164d823b079ba7a0395be46718bb5f0479456bf5c31a63aa6d74ba4a4395f632de34a5dc68738bdbf3d9  libev-4.11-Respect-the-CFLAGS-if-defined.patch"
+03c277f7253694db8c2710c2f28eda24abf96651740ef6e4c2d49bf88f04d98f93fbc6f87df0621bb4d944f3b2743ffc7bcfdd72a72327e173756965f08daa77  modernize-configure.ac.patch"
diff --git a/main/libev/libev-4.11-Modernize-the-configure.ac.patch b/main/libev/libev-4.11-Modernize-the-configure.ac.patch
deleted file mode 100644
index 45d088107b..0000000000
--- a/main/libev/libev-4.11-Modernize-the-configure.ac.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7ddb7d52d0398f31b8b54d4a1fb572d9ee666a52 Mon Sep 17 00:00:00 2001
-From: Mathieu Bridon <bochecha@fedoraproject.org>
-Date: Fri, 8 Feb 2013 16:29:13 +0800
-Subject: [PATCH] Modernize the configure.ac
-
-Without it, Automake 1.13 and above will refuse it.
-
-See the details for AM_INIT_AUTOMAKE at:
-   http://www.gnu.org/software/automake/manual/automake.html#Public-Macros
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1af149a..a87761f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,9 +1,9 @@
- orig_CFLAGS="$CFLAGS"
- 
--AC_INIT
-+AC_INIT([libev], [4.11])
- AC_CONFIG_SRCDIR([ev_epoll.c])
- 
--AM_INIT_AUTOMAKE(libev,4.11) dnl also update ev.h!
-+AM_INIT_AUTOMAKE
- AC_CONFIG_HEADERS([config.h])
- AM_MAINTAINER_MODE
- 
--- 
-1.8.1
-
diff --git a/main/libev/libev-4.11-Respect-the-CFLAGS-if-defined.patch b/main/libev/libev-4.11-Respect-the-CFLAGS-if-defined.patch
deleted file mode 100644
index 6c977357fb..0000000000
--- a/main/libev/libev-4.11-Respect-the-CFLAGS-if-defined.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c7106c0dfb3c7692f7a928b18b2d1bd1b0e10d76 Mon Sep 17 00:00:00 2001
-From: Mathieu Bridon <bochecha@fedoraproject.org>
-Date: Fri, 8 Feb 2013 17:12:55 +0800
-Subject: [PATCH] Respect the CFLAGS if defined
-
-https://bugzilla.redhat.com/show_bug.cgi?id=908096
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a87761f..827aa4a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,5 +1,3 @@
--orig_CFLAGS="$CFLAGS"
--
- AC_INIT([libev], [4.11])
- AC_CONFIG_SRCDIR([ev_epoll.c])
- 
-@@ -7,6 +5,8 @@ AM_INIT_AUTOMAKE
- AC_CONFIG_HEADERS([config.h])
- AM_MAINTAINER_MODE
- 
-+orig_CFLAGS="$CFLAGS"
-+
- AC_PROG_CC
- 
- dnl Supply default CFLAGS, if not specified
--- 
-1.8.1
-
diff --git a/main/libev/modernize-configure.ac.patch b/main/libev/modernize-configure.ac.patch
new file mode 100644
index 0000000000..3e21cb81b7
--- /dev/null
+++ b/main/libev/modernize-configure.ac.patch
@@ -0,0 +1,15 @@
+--- ./configure.ac.orig	2013-03-01 11:10:27.000000000 +0000
++++ ./configure.ac	2013-07-10 07:39:49.139599819 +0000
+@@ -1,10 +1,10 @@
+-AC_INIT
++AC_INIT([libev], [4.15])
+ 
+ orig_CFLAGS="$CFLAGS"
+ 
+ AC_CONFIG_SRCDIR([ev_epoll.c])
+ 
+-AM_INIT_AUTOMAKE(libev,4.15) dnl also update ev.h!
++AM_INIT_AUTOMAKE
+ AC_CONFIG_HEADERS([config.h])
+ AM_MAINTAINER_MODE
+