From d4edebccb1922fbec9fc82129d9494cb6f2423a6 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 29 Mar 2017 14:03:15 +0000
Subject: libx11: update to 1.6.5

---
 abs/core/libx11/PKGBUILD      |  8 +++++---
 abs/core/libx11/fix_typo.diff | 27 ---------------------------
 2 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 abs/core/libx11/fix_typo.diff

diff --git a/abs/core/libx11/PKGBUILD b/abs/core/libx11/PKGBUILD
index 8090e48..51035ba 100644
--- a/abs/core/libx11/PKGBUILD
+++ b/abs/core/libx11/PKGBUILD
@@ -3,18 +3,20 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libx11
-pkgver=1.6.3
+pkgver=1.6.5
 pkgrel=1
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 depends=('libxcb' 'xproto' 'kbproto')
 makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto')
 license=('custom')
 source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2{,.sig})
-sha256sums=('cf31a7c39f2f52e8ebd0db95640384e63451f9b014eed2bb7f5de03e8adc8111'
+sha256sums=('4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d'
             'SKIP')
 validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E')
+validpgpkeys+=('C41C985FDCF1E5364576638B687393EE37D128F8') # Matthieu Herrb <matthieu.herrb@laas.fr>
+validpgpkeys+=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <mattst88@gmail.com>
 
 build() {
   cd "${srcdir}/libX11-${pkgver}"
diff --git a/abs/core/libx11/fix_typo.diff b/abs/core/libx11/fix_typo.diff
deleted file mode 100644
index a55a940..0000000
--- a/abs/core/libx11/fix_typo.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-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
---- a/nls/en_US.UTF-8/Compose.pre
-+++ b/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
-
-- 
cgit v0.12