From 04cdda093cd0ebb0ecd7828568236d10665d5a92 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 19 Nov 2019 11:07:40 +0100
Subject: [PATCH] libx11: bump version.

---
 ...ibx11-1.6.5.recipe => libx11-1.6.9.recipe} |  6 ++---
 ...1-1.6.5.patchset => libx11-1.6.9.patchset} | 26 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)
 rename x11-libs/libx11/{libx11-1.6.5.recipe => libx11-1.6.9.recipe} (96%)
 rename x11-libs/libx11/patches/{libx11-1.6.5.patchset => libx11-1.6.9.patchset} (84%)

diff --git a/x11-libs/libx11/libx11-1.6.5.recipe b/x11-libs/libx11/libx11-1.6.9.recipe
similarity index 96%
rename from x11-libs/libx11/libx11-1.6.5.recipe
rename to x11-libs/libx11/libx11-1.6.9.recipe
index c5d986741..0a0d3ace4 100644
--- a/x11-libs/libx11/libx11-1.6.5.recipe
+++ b/x11-libs/libx11/libx11-1.6.9.recipe
@@ -66,9 +66,9 @@ COPYRIGHT="2003-2006,2008 Jamey Sharp, Josh Triplett
 	"
 # TODO: check all the licenses in the COPYING file in the next century.
 LICENSE="MIT"
-REVISION="7"
+REVISION="1"
 SOURCE_URI="https://www.x.org/releases/individual/lib/libX11-$portVersion.tar.bz2"
-CHECKSUM_SHA256="4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d"
+CHECKSUM_SHA256="9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1"
 SOURCE_DIR="libX11-$portVersion"
 # TODO: fix the remaining xmlto conversions
 PATCHES="libx11-$portVersion.patchset"
@@ -142,8 +142,6 @@ BUILD()
 INSTALL()
 {
 	make install-strip
-	install -d -m 755 "$developDocDir"
-	install -m 644 -t "$developDocDir" README
 
 	rm -f $libDir/lib*.la
 	rm -f $libDir/X11/locale/common/*.la
diff --git a/x11-libs/libx11/patches/libx11-1.6.5.patchset b/x11-libs/libx11/patches/libx11-1.6.9.patchset
similarity index 84%
rename from x11-libs/libx11/patches/libx11-1.6.5.patchset
rename to x11-libs/libx11/patches/libx11-1.6.9.patchset
index 830ece163..f35fc5d6b 100644
--- a/x11-libs/libx11/patches/libx11-1.6.5.patchset
+++ b/x11-libs/libx11/patches/libx11-1.6.9.patchset
@@ -1,23 +1,23 @@
-From 67bf19531800952ab5d1f915b4de923c09e50315 Mon Sep 17 00:00:00 2001
+From 661314f36ee76d3832d1153e76306e02eede94ae Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
 Date: Sat, 16 Jan 2016 04:40:34 +0100
 Subject: configure.ac: add some checks for Haiku
 
 
 diff --git a/configure.ac b/configure.ac
-index 9f1953e..09b6245 100644
+index 3a042ba..2d6e102 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -144,6 +144,8 @@ AC_CHECK_HEADERS([sys/select.h])
+@@ -154,6 +154,8 @@ AC_CHECK_HEADERS([sys/filio.h sys/select.h sys/ioctl.h sys/socket.h])
  # Checks for typedefs, structures, and compiler characteristics.
  
  # Checks for library functions.
 +AC_SEARCH_LIBS(issetugid, [bsd])
 +AC_SEARCH_LIBS(getresuid, [bsd])
  AC_CHECK_FUNCS([strtol seteuid])
+ AC_REPLACE_FUNCS([reallocarray])
  # Used in lcFile.c (see also --enable-xlocaledir settings below)
- XLOCALEDIR_IS_SAFE="no"
-@@ -188,6 +190,9 @@ AC_ARG_ENABLE(xthreads,
+@@ -199,6 +201,9 @@ AC_ARG_ENABLE(xthreads,
                [xthreads=$enableval],[xthreads=yes])
  
  AC_CHECK_LIB(c, getpwuid_r, [mtsafeapi="yes"], [mtsafeapi="no"])
@@ -27,7 +27,7 @@ index 9f1953e..09b6245 100644
  
  case x$xthreads in
  xyes)
-@@ -201,7 +206,9 @@ xyes)
+@@ -212,7 +217,9 @@ xyes)
  	;;
  esac
  
@@ -39,10 +39,10 @@ index 9f1953e..09b6245 100644
  
  # XXX incomplete, please fill this in
 -- 
-2.16.4
+2.24.0
 
 
-From fb3af584f439af64e31a3b39344705410493b51f Mon Sep 17 00:00:00 2001
+From 73bc1abc95b33ac17ec2cdd0173827fad82dad6e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
 Date: Sat, 16 Jan 2016 04:37:11 +0100
 Subject: gcc2 initializer
@@ -66,20 +66,20 @@ index 9da4165..7b1d4e2 100644
          return (XSendEvent (dpy, root, False,
                              SubstructureRedirectMask|SubstructureNotifyMask,
 -- 
-2.16.4
+2.24.0
 
 
-From 7e42e3939e2974bc1565b8a06b62ae4ab46a272f Mon Sep 17 00:00:00 2001
+From 22b159cc4df4b6dd9a5481a2337ddc3a2624ca9e Mon Sep 17 00:00:00 2001
 From: begasus <begasus@gmail.com>
 Date: Sun, 29 Jul 2018 15:56:09 +0200
 Subject: remove xml files preventing a full build
 
 
 diff --git a/configure.ac b/configure.ac
-index 09b6245..aab8fa8 100644
+index 2d6e102..344a41c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -369,11 +369,10 @@ locales="\
+@@ -380,11 +380,10 @@ locales="\
   iso8859-15   iso8859-2   iso8859-3   iso8859-4    iso8859-5    iso8859-6 \
   iso8859-7    iso8859-8   iso8859-9   iso8859-9e   ja           ja.JIS \
   ja_JP.UTF-8  ja.SJIS     km_KH.UTF-8 ko           koi8-c       koi8-r \
@@ -95,5 +95,5 @@ index 09b6245..aab8fa8 100644
  AC_SUBST(locales)
  
 -- 
-2.16.4
+2.24.0