From 3002b11adeb6af1b5e15c9b5dad3c2fa31805bb7 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 19 Mar 2014 16:54:58 +0100
Subject: [PATCH] libX11: added two patches from upstream to fix some issues
 with en_US.UTF-8 locale.

---
 ...40f28d59587597d2ff6e6ac64c71cfe6ff7b.patch | 26 +++++++++++++++++++
 ...e9034f29c3ae6ad7e617b3d5e903aa107b6a.patch | 24 +++++++++++++++++
 srcpkgs/libX11/template                       |  9 +++----
 3 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/libX11/patches/5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b.patch
 create mode 100644 srcpkgs/libX11/patches/6f30e9034f29c3ae6ad7e617b3d5e903aa107b6a.patch

diff --git a/srcpkgs/libX11/patches/5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b.patch b/srcpkgs/libX11/patches/5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b.patch
new file mode 100644
index 0000000000..1d5547cefc
--- /dev/null
+++ b/srcpkgs/libX11/patches/5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b.patch
@@ -0,0 +1,26 @@
+From 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b Mon Sep 17 00:00:00 2001
+From: James Cloos <cloos@jhcloos.com>
+Date: Tue, 17 Sep 2013 16:50:42 +0000
+Subject: nls/en_US.UTF-8/Compose.pre: Fix typo.
+
+Fix typo added in 215ce6a67863, s/actute/acute/.
+
+Fixes bug #69476.  Reported by Jean Krohn.
+
+Signed-off-by: James Cloos <cloos@jhcloos.com>
+---
+diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
+index a741332..7314d7f 100644
+--- nls/en_US.UTF-8/Compose.pre
++++ nls/en_US.UTF-8/Compose.pre
+@@ -743,7 +743,7 @@ XCOMM Part 3
+ <Multi_key> <i> <quotedbl> 		: "ï"   idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
+ <Multi_key> <diaeresis> <i> 		: "ï"   idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
+ <Multi_key> <i> <diaeresis> 		: "ï"   idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
+-<dead_actute> <j>	 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
++<dead_acute> <j>	 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+ <Multi_key> <apostrophe> <j> 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+ <Multi_key> <j> <apostrophe> 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+ <Multi_key> <acute> <j> 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/srcpkgs/libX11/patches/6f30e9034f29c3ae6ad7e617b3d5e903aa107b6a.patch b/srcpkgs/libX11/patches/6f30e9034f29c3ae6ad7e617b3d5e903aa107b6a.patch
new file mode 100644
index 0000000000..99ac6b9c9e
--- /dev/null
+++ b/srcpkgs/libX11/patches/6f30e9034f29c3ae6ad7e617b3d5e903aa107b6a.patch
@@ -0,0 +1,24 @@
+From 6f30e9034f29c3ae6ad7e617b3d5e903aa107b6a Mon Sep 17 00:00:00 2001
+From: Reuben Thomas <rrt@sc3d.org>
+Date: Mon, 27 Jan 2014 14:18:24 +0000
+Subject: en_US.UTF-8/Compose: Fix apparent copy-paste-o, changing capital to small A.
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
+index 5434425..7cdcb49 100644
+--- nls/en_US.UTF-8/Compose.pre
++++ nls/en_US.UTF-8/Compose.pre
+@@ -818,8 +818,8 @@ XCOMM Part 3
+ <Multi_key> <macron> <a>         	: "ā"   U0101 # LATIN SMALL LETTER A WITH MACRON
+ <Multi_key> <underscore> <a>     	: "ā"   U0101 # LATIN SMALL LETTER A WITH MACRON
+ <Multi_key> <a> <underscore>     	: "ā"   U0101 # LATIN SMALL LETTER A WITH MACRON
+-<Multi_key> <minus> <a>          	: "ā"   U0100 # LATIN CAPITAL LETTER A WITH MACRON
+-<Multi_key> <a> <minus>          	: "ā"   U0100 # LATIN CAPITAL LETTER A WITH MACRON
++<Multi_key> <minus> <a>          	: "ā"   U0101 # LATIN SMALL LETTER A WITH MACRON
++<Multi_key> <a> <minus>          	: "ā"   U0101 # LATIN SMALL LETTER A WITH MACRON
+ <dead_breve> <A>                 	: "Ă"   U0102 # LATIN CAPITAL LETTER A WITH BREVE
+ <Multi_key> <U> <A>              	: "Ă"   U0102 # LATIN CAPITAL LETTER A WITH BREVE
+ <Multi_key> <b> <A>              	: "Ă"   U0102 # LATIN CAPITAL LETTER A WITH BREVE
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index c21f42ce9a..e2ee43f7fe 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,15 +1,14 @@
 # Template build file for 'libX11'.
 pkgname=libX11
 version=1.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
- --disable-secure-rpc --disable-static --enable-malloc0returnsnull
- ac_cv_func_mmap_fixed_mapped=yes"
+ --disable-secure-rpc --disable-static --enable-malloc0returnsnull"
 hostmakedepends="pkg-config"
 makedepends="xproto>=7.0.23 xextproto xtrans xcmiscproto
  kbproto bigreqsproto inputproto>=2.2 xf86bigfontproto libxcb-devel"
-short_desc="Base X libraries from modular Xorg X11"
+short_desc="Base X libraries from Xorg"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org/"
 license="MIT"
@@ -28,7 +27,7 @@ post_install() {
 }
 
 libX11-devel_package() {
-	depends="xproto kbproto libxcb-devel libX11>=$version"
+	depends="xproto kbproto libxcb-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include