From 32f452990c86f9c7d4aec9d846a6ff03fb233ca8 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Tue, 20 Oct 2015 08:29:19 +0200
Subject: [PATCH] musl{,-bootstrap}: update to 1.1.12.

---
 srcpkgs/musl-bootstrap/template                   |  4 ++--
 .../musl/patches/no-utf8-code-units-locale.patch  | 15 ---------------
 srcpkgs/musl/template                             |  6 +++---
 3 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/musl/patches/no-utf8-code-units-locale.patch

diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template
index 62e9f3c10b9..a00dc0e036f 100644
--- a/srcpkgs/musl-bootstrap/template
+++ b/srcpkgs/musl-bootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'musl-bootstrap'.
 pkgname=musl-bootstrap
-version=1.1.11
+version=1.1.12
 revision=1
 lib32disabled=yes
 wrksrc="musl-${version}"
@@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="MIT"
 homepage="http://www.musl-libc.org/"
 distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
-checksum=bb9e6da51b7b12641f5d1abb39705c6c6c1b2fbd20002362948aa736a0aa353f
+checksum=720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e
 
 post_install() {
 	mv ${DESTDIR}/lib/* ${DESTDIR}/usr/lib/
diff --git a/srcpkgs/musl/patches/no-utf8-code-units-locale.patch b/srcpkgs/musl/patches/no-utf8-code-units-locale.patch
deleted file mode 100644
index 0e5f3727c4c..00000000000
--- a/srcpkgs/musl/patches/no-utf8-code-units-locale.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Temporary fix for https://github.com/voidlinux/void-packages/issues/2425
-
-@dalias affirmed that returning UTF-8 even when requesting C locale is just fine.
-
---- src/locale/langinfo.c.orig	2015-09-01 08:41:59.830797631 +0200
-+++ src/locale/langinfo.c	2015-09-01 08:42:15.324966247 +0200
-@@ -34,7 +34,7 @@ char *__nl_langinfo_l(nl_item item, loca
- 	const char *str;
- 
- 	if (item == CODESET)
--		return MB_CUR_MAX==1 ? "UTF-8-CODE-UNITS" : "UTF-8";
-+		return "UTF-8";
- 	
- 	switch (cat) {
- 	case LC_NUMERIC:
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index 5d9f89031f4..870472aec5d 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -1,7 +1,7 @@
 # Template file for 'musl'.
 pkgname=musl
-version=1.1.11
-revision=2
+version=1.1.12
+revision=1
 build_pie=yes
 build_style=gnu-configure
 configure_args="--prefix=/usr --disable-gcc-wrapper"
@@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="MIT"
 homepage="http://www.musl-libc.org/"
 distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
-checksum=bb9e6da51b7b12641f5d1abb39705c6c6c1b2fbd20002362948aa736a0aa353f
+checksum=720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e
 
 nostrip_files="libc.so"
 shlib_provides="libc.so"