From 67d8779de55114516f459b9d99f1d99a95066568 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Wed, 15 Jan 2020 04:50:37 +0000
Subject: [PATCH] libX11: update to libX11-1.6.9

---
 packages/x11/lib/libX11/package.mk            |  4 +-
 .../libX11-makekeys-remove-X11-headers.patch  | 37 -------------------
 2 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 packages/x11/lib/libX11/patches/libX11-makekeys-remove-X11-headers.patch

diff --git a/packages/x11/lib/libX11/package.mk b/packages/x11/lib/libX11/package.mk
index 11971ab90e..700bd009d1 100644
--- a/packages/x11/lib/libX11/package.mk
+++ b/packages/x11/lib/libX11/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libX11"
-PKG_VERSION="1.6.8"
-PKG_SHA256="b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5"
+PKG_VERSION="1.6.9"
+PKG_SHA256="9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.x.org/"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
diff --git a/packages/x11/lib/libX11/patches/libX11-makekeys-remove-X11-headers.patch b/packages/x11/lib/libX11/patches/libX11-makekeys-remove-X11-headers.patch
deleted file mode 100644
index f96acea1f4..0000000000
--- a/packages/x11/lib/libX11/patches/libX11-makekeys-remove-X11-headers.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/mirror/libX11/commit/0327c427d62f671eced067c6d9b69f4e216a8cac
-upstream in > 1.6.8
-
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 17 Jun 2019 13:36:08 -0400
-Subject: [PATCH] makekeys: Detach ourselves from X headers entirely
-
-Subsequent to a121b7b0c210efe10bf93453b29050282324c906 we are no longer
-building makekeys with enough -I/foo/bar to find the X11 headers, so if
-they're not in a system include path, things fail. Since this utility is
-only needed at build time, there's no real reason to demand the X
-headers be installed for both the build and target machines if cross-
-compiling, we can just assume a vaguely ANSI environment instead.
-
-Tested-by: Niclas Zeising <zeising@daemonic.se>
-Reviewed-by: Keith Packard <keithp@keithp.com>
-Reviewed-by: Matt Turner <mattst88@gmail.com>
----
- src/util/makekeys.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index bcb5b7d5..07563315 100644
---- a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -35,8 +35,10 @@ from The Open Group.
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <stdint.h>
-+#include <inttypes.h>
- 
--#include "../Xresinternal.h"
-+typedef uint32_t Signature;
- 
- #define KTNUM 4000
-