From 0659c77949b38440a2a9ba67e1ee9cacef1f3a7f Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 1 Aug 2013 13:22:08 +0200
Subject: libX11 mesa xserver xkeyboard-config git update 1 aug 2013

xserver          commit b6e5c4669e0db391966deb397e8c975ec7f0124d
xkeyboard-config commit abaf14335dc6504e59d91e77babc8e034df5beb7
libX11           commit 44f84223f5e2dd46883fcbd352af2798bfa9aeb6
mesa             commit 3eef7fec677f40eef1674e44e7ebd836bc7f8612
---
 libX11/configure.ac        | 2 +-
 libX11/nls/compose.dir.pre | 1 +
 libX11/nls/locale.dir.pre  | 1 +
 libX11/src/Makefile.am     | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'libX11')

diff --git a/libX11/configure.ac b/libX11/configure.ac
index f533f3c4b..ff04f8a3e 100644
--- a/libX11/configure.ac
+++ b/libX11/configure.ac
@@ -1,7 +1,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libX11], [1.6.0],
+AC_INIT([libX11], [1.6.1],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libX11])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])
diff --git a/libX11/nls/compose.dir.pre b/libX11/nls/compose.dir.pre
index ef9a519bc..fa267ce4a 100644
--- a/libX11/nls/compose.dir.pre
+++ b/libX11/nls/compose.dir.pre
@@ -391,6 +391,7 @@ en_US.UTF-8/Compose:		kn_IN.UTF-8
 ko_KR.UTF-8/Compose:		ko_KR.UTF-8
 en_US.UTF-8/Compose:		ks_IN.UTF-8
 en_US.UTF-8/Compose:		ks_IN@devanagari.UTF-8
+en_US.UTF-8/Compose:		ku_TR.UTF-8
 en_US.UTF-8/Compose:		kw_GB.UTF-8
 en_US.UTF-8/Compose:		ky_KG.UTF-8
 en_US.UTF-8/Compose:		lo_LA.UTF-8
diff --git a/libX11/nls/locale.dir.pre b/libX11/nls/locale.dir.pre
index 4ec929745..ab1bacec6 100644
--- a/libX11/nls/locale.dir.pre
+++ b/libX11/nls/locale.dir.pre
@@ -391,6 +391,7 @@ en_US.UTF-8/XLC_LOCALE:			kn_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:                 ks_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:                 ks_IN@devanagari.UTF-8
 ko_KR.UTF-8/XLC_LOCALE:			ko_KR.UTF-8
+en_US.UTF-8/XLC_LOCALE:			ku_TR.UTF-8
 en_US.UTF-8/XLC_LOCALE:			kw_GB.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ky_KG.UTF-8
 en_US.UTF-8/XLC_LOCALE:			lo_LA.UTF-8
diff --git a/libX11/src/Makefile.am b/libX11/src/Makefile.am
index 27b74b014..db8f4d40a 100644
--- a/libX11/src/Makefile.am
+++ b/libX11/src/Makefile.am
@@ -386,6 +386,7 @@ if LINT
 
 ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 		$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+ALL_LINT_FLAGS += -DXCMSDIR=\"$(X11dir)\"
 
 lint:	$(BUILT_SOURCES)
 	for f in $(libX11_la_SOURCES) ; do \
-- 
cgit v1.2.3