Add patch from upstream to silence qt5 warning:

    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>

Bump PKGREVISION.

6 files changed, 45 insertions, 18 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index d7447bc1d77..51ae8090b68 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2014/05/27 04:45:33 rodent Exp $
+# $NetBSD: Makefile,v 1.38 2014/05/30 12:51:29 wiz Exp $
 
 DISTNAME=		libX11-1.6.2
+PKGREVISION=		1
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 2c40d79324c..5eba9ccbb36 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.22 2013/09/09 09:44:41 wiz Exp $
+$NetBSD: distinfo,v 1.23 2014/05/30 12:51:29 wiz Exp $
 
 SHA1 (libX11-1.6.2.tar.bz2) = 0dd74854e6f6bb8a322e88ba3e89f87c3dcf9e08
 RMD160 (libX11-1.6.2.tar.bz2) = ebfc49399f379b77c3fc2b540af41d4316c0fa67
 Size (libX11-1.6.2.tar.bz2) = 2339981 bytes
-SHA1 (patch-Makefile.in) = 5bb9465a1be62cf75d0be893627862aea937e984
-SHA1 (patch-aa) = ed69aa016d58e46fa9349778852264e3e1975135
-SHA1 (patch-ac) = 5d73fc6b7544f8be7a988f0fd5cb17dd84b25896
+SHA1 (patch-Makefile.in) = a81dbc7149775a0ba62a4d92560c5898173d4c9d
+SHA1 (patch-aa) = ef7c24a879604f4cc4cbb38befc9fa24314df3ef
+SHA1 (patch-ac) = 565aa2a636b5c50f67cbd11e7c2adcac8d55418e
+SHA1 (patch-nls_en__US.UTF-8_Compose.pre) = 4690e81d6e7bf03f7d6816ff6d0bdc442e75c0b3
diff --git a/x11/libX11/patches/patch-Makefile.in b/x11/libX11/patches/patch-Makefile.in
index a5c64ac7e42..3ba2f556c0a 100644
--- a/x11/libX11/patches/patch-Makefile.in
+++ b/x11/libX11/patches/patch-Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile.in,v 1.1 2013/06/04 07:57:13 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2014/05/30 12:51:29 wiz Exp $
 
 Avoid unnecessary auto* due to patch-aa modifying configure.ac.
 
---- Makefile.in.orig	2013-06-04 02:21:47.000000000 +0000
+--- Makefile.in.orig	2013-09-09 01:37:36.000000000 +0000
 +++ Makefile.in
-@@ -87,8 +87,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(sr
+@@ -88,8 +88,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(sr
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
  	$(top_srcdir)/configure.ac
diff --git a/x11/libX11/patches/patch-aa b/x11/libX11/patches/patch-aa
index 84a9367d4ce..c63428a3e69 100644
--- a/x11/libX11/patches/patch-aa
+++ b/x11/libX11/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2012/07/10 03:03:01 mef Exp $
+$NetBSD: patch-aa,v 1.11 2014/05/30 12:51:29 wiz Exp $
 
 Include pthread.h as thread stubs might be macros like on NetBSD.
 
@@ -7,9 +7,9 @@ Define conditional for cross-compiling support.
 Also, don't look for keysmydef.h, as this could break cross
 builds (from GIT).
 
---- configure.ac.orig	2012-06-02 15:37:17.000000000 +0900
-+++ configure.ac	2012-06-28 19:14:45.000000000 +0900
-@@ -277,7 +277,7 @@
+--- configure.ac.orig	2013-09-09 01:37:20.000000000 +0000
++++ configure.ac
+@@ -276,7 +276,7 @@ xyes)
  	;;
  esac
  
@@ -18,7 +18,7 @@ builds (from GIT).
  AM_CONDITIONAL(THRSTUBS, test x$thrstubs = xyes)
  
  # XXX incomplete, please fill this in
-@@ -286,12 +286,12 @@
+@@ -285,12 +285,12 @@ if test x$xthreads = xyes ; then
      linux*|gnu*|k*bsd*-gnu)
          XTHREADLIB=-lpthread ;;
      netbsd*)
diff --git a/x11/libX11/patches/patch-ac b/x11/libX11/patches/patch-ac
index 7f71e4e5de7..874d0874e0e 100644
--- a/x11/libX11/patches/patch-ac
+++ b/x11/libX11/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.12 2012/07/10 03:03:01 mef Exp $
+$NetBSD: patch-ac,v 1.13 2014/05/30 12:51:29 wiz Exp $
 
 See patch-aa.
 
---- configure.orig	2012-06-02 15:37:31.000000000 +0900
-+++ configure	2012-06-28 19:20:03.000000000 +0900
-@@ -19942,43 +19942,18 @@
+--- configure.orig	2013-09-09 01:37:35.000000000 +0000
++++ configure
+@@ -20104,43 +20104,18 @@ $as_echo "#define XUSE_MTSAFE_API 1" >>c
  	;;
  esac
  
@@ -57,7 +57,7 @@ See patch-aa.
    thrstubs="no"
  else
    thrstubs="yes"
-@@ -19999,12 +19974,12 @@
+@@ -20161,12 +20136,12 @@ if test x$xthreads = xyes ; then
      linux*|gnu*|k*bsd*-gnu)
          XTHREADLIB=-lpthread ;;
      netbsd*)
diff --git a/x11/libX11/patches/patch-nls_en__US.UTF-8_Compose.pre b/x11/libX11/patches/patch-nls_en__US.UTF-8_Compose.pre
new file mode 100644
index 00000000000..4fc7fa70749
--- /dev/null
+++ b/x11/libX11/patches/patch-nls_en__US.UTF-8_Compose.pre
@@ -0,0 +1,25 @@
+$NetBSD: patch-nls_en__US.UTF-8_Compose.pre,v 1.1 2014/05/30 12:51:29 wiz Exp $
+
+commit 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Tue Sep 17 12:50:42 2013 -0400
+
+    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>
+
+--- nls/en_US.UTF-8/Compose.pre.orig	2013-09-09 01:37:20.000000000 +0000
++++ 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