[PATCH:libX11 2/4] Use newer callback-based API for XIM.

[Thomas Klausner]

Let libX11 load and make available the newer (X11R6) callback-based
API for XIM (expected by emacs).

This patch updates the files to match the other nls/ files.

Patch from Ian D. Leroux <idleroux at fastmail.fm> on pkgsrc-users at NetBSD.org
following a hint by Nhat Minh Lê <nhat.minh.le at gmail.com>.

Reviewed-by: James Cloos <cloos at jhcloos.com>
---
 nls/C/XI18N_OBJS           | 2 +-
 nls/en_US.UTF-8/XI18N_OBJS | 5 ++---
 nls/iso8859-1/XI18N_OBJS   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/nls/C/XI18N_OBJS b/nls/C/XI18N_OBJS
index 32e4f35..3a9a1bb 100644
--- a/nls/C/XI18N_OBJS
+++ b/nls/C/XI18N_OBJS
@@ -3,6 +3,6 @@
 #	XI18N objects table for euro locales
 #
 XLC	common/xlibi18n	_XlcGenericLoader	# XLC_open
-XIM	common/ximcp	_XimOpenIM	# XIM_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
 XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
 
diff --git a/nls/en_US.UTF-8/XI18N_OBJS b/nls/en_US.UTF-8/XI18N_OBJS
index f201bf4..97b30b9 100644
--- a/nls/en_US.UTF-8/XI18N_OBJS
+++ b/nls/en_US.UTF-8/XI18N_OBJS
@@ -3,6 +3,5 @@
 #	XI18N objects table for euro locales
 #
 XLC	common/xlcUTF8Load	_XlcUtf8Loader	        # XLC_open
-XOM	common/xomLTRTTB	_XomGenericOpenOM	# XOM_open
-XIM	common/xiiimp		_SwitchOpenIM		# XIM_open
-XIM	common/xiiimp		_XimpLocalOpenIM	# XIM_open
+XOM	common/xomGeneric	_XomGenericOpenOM	# XOM_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
diff --git a/nls/iso8859-1/XI18N_OBJS b/nls/iso8859-1/XI18N_OBJS
index 32e4f35..3a9a1bb 100644
--- a/nls/iso8859-1/XI18N_OBJS
+++ b/nls/iso8859-1/XI18N_OBJS
@@ -3,6 +3,6 @@
 #	XI18N objects table for euro locales
 #
 XLC	common/xlibi18n	_XlcGenericLoader	# XLC_open
-XIM	common/ximcp	_XimOpenIM	# XIM_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
 XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
 
-- 
1.8.3.1