Update scim to 1.4.14.

A new stable version has been released, the main change is the incorporation of
scim-bridge.

 All integrated im-modules (gtk2/gtk3/qt3/qt4/clutter) are written in pure C
 so they should have no compatibility issues which the original gtk-im-modules
 usually have. Moreover, the original im-modules supports only gtk2/gtk3,
scim provides gtk2/gtk3/qt3/qt4/clutter im-modules after the incorporation.

13 files changed, 199 insertions, 58 deletions

diff --git a/inputmethod/scim/Makefile b/inputmethod/scim/Makefile
index c1ea0588554..addb0edb12b 100644
--- a/inputmethod/scim/Makefile
+++ b/inputmethod/scim/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2012/05/06 09:18:48 marino Exp $
+# $NetBSD: Makefile,v 1.15 2012/08/19 08:09:08 obache Exp $
 #
 
-DISTNAME=		scim-1.4.13
+DISTNAME=		scim-1.4.14
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scim/}
 
@@ -10,6 +10,8 @@ HOMEPAGE=		http://www.scim-im.org/
 COMMENT=		Smart Common Input Method
 LICENSE=		gnu-lgpl-v2.1
 
+SUPERSEDES+=		scim-bridge-[0-9]*
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PKG_SYSCONFSUBDIR=	scim
@@ -28,10 +30,8 @@ PKGCONFIG_OVERRIDE+=	scim.pc.in
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-gtk-version=2
-# dlopen c++ so module from c gtk2 apps cause some troubles.
-CONFIGURE_ARGS+=	--disable-gtk2-immodule
-CONFIGURE_ARGS+=	--disable-gtk3-immodule
+
+.include "options.mk"
 
 EGDIR=			${PREFIX}/share/examples/scim
 CONF_FILES=		${EGDIR}/config ${PKG_SYSCONFDIR}/config
@@ -47,14 +47,9 @@ PTHREAD_AUTO_VARS=	yes
 CONFIGURE_ENV+=		ac_cv_func_gethostbyname_r=no
 LDFLAGS.SunOS+=		-lsocket -lnsl
 .endif
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ENV+= 	gt_cv_func_gnugettext1_libintl=yes
-.endif
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXt=	build
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/inputmethod/scim/PLIST b/inputmethod/scim/PLIST
index 29becc9f7cd..04054317ebd 100644
--- a/inputmethod/scim/PLIST
+++ b/inputmethod/scim/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/08/19 08:09:08 obache Exp $
 bin/scim
 bin/scim-config-agent
+bin/scim-im-agent
 bin/scim-setup
 include/scim-1.0/gtk/scimkeyselection.h
 include/scim-1.0/gtk/scimstringview.h
@@ -46,6 +47,8 @@ include/scim-1.0/scim_transaction.h
 include/scim-1.0/scim_types.h
 include/scim-1.0/scim_utility.h
 include/scim-1.0/x11/scim_x11_utils.h
+${PLIST.gtk2}lib/gtk-2.0/2.10.0/immodules/im-scim.la
+${PLIST.gtk3}lib/gtk-3.0/3.0.0/immodules/im-scim.la
 lib/libscim-1.0.la
 lib/libscim-gtkutils-1.0.la
 lib/libscim-x11utils-1.0.la
@@ -67,6 +70,7 @@ lib/scim-1.0/scim-helper-launcher
 lib/scim-1.0/scim-helper-manager
 lib/scim-1.0/scim-launcher
 lib/scim-1.0/scim-panel-gtk
+${PLIST.qt}qt4/plugins/inputmethods/im-scim.la
 share/applications/scim-setup.desktop
 share/control-center-2.0/capplets/scim-setup.desktop
 share/examples/scim/config
diff --git a/inputmethod/scim/buildlink3.mk b/inputmethod/scim/buildlink3.mk
index a79b9323cf6..8712882db51 100644
--- a/inputmethod/scim/buildlink3.mk
+++ b/inputmethod/scim/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2012/05/07 01:53:38 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2012/08/19 08:09:08 obache Exp $
 
 BUILDLINK_TREE+=	scim
 
@@ -13,7 +13,13 @@ BUILDLINK_PKGSRCDIR.scim?=	../../inputmethod/scim
 .include "../../devel/libltdl/buildlink3.mk"
 
 .if defined(USE_SCIM_GTKUTILS) && !empty(USE_SCIM_GTKUTILS:M[Yy][Ee][Ss])
-.  include "../../x11/gtk2/buildlink3.mk"
+pkgbase := scim
+.include "../../mk/pkg-build-options.mk"
+.  if !empty(PKG_BUILD_OPTIONS.scim:Mgtk3)
+.include "../../x11/gtk3/buildlink3.mk"
+.  else
+.include "../../x11/gtk2/buildlink3.mk"
+.  endif
 .endif
 
 .endif # SCIM_BUILDLINK3_MK
diff --git a/inputmethod/scim/distinfo b/inputmethod/scim/distinfo
index bb3da2bb46d..4a30304d639 100644
--- a/inputmethod/scim/distinfo
+++ b/inputmethod/scim/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2012/05/14 05:01:24 sbd Exp $
+$NetBSD: distinfo,v 1.6 2012/08/19 08:09:08 obache Exp $
 
-SHA1 (scim-1.4.13.tar.gz) = dafe08bbdd3faa0324800cb63e44926d71be2e47
-RMD160 (scim-1.4.13.tar.gz) = 411fe876139120b2dc8df97d9b99405fcec70840
-Size (scim-1.4.13.tar.gz) = 1301625 bytes
+SHA1 (scim-1.4.14.tar.gz) = 73391be371dd7ef9f9af8b3a211e2bedec0cf71b
+RMD160 (scim-1.4.14.tar.gz) = 50643a8a8084c32612d415bfb0fe8b7f91c22459
+Size (scim-1.4.14.tar.gz) = 1519287 bytes
 SHA1 (patch-ab) = c5220c83ec8125f75b1e5d7b41f4438ec73becbf
 SHA1 (patch-ac) = c8c4a54b1b6ffd82211616c3b99de1239b29c652
 SHA1 (patch-ad) = 2812ded533f29bd69bad180c33c81fd49e6213e6
@@ -11,8 +11,13 @@ SHA1 (patch-af) = 010d4f31d684b8163672d2521ebff74230591d66
 SHA1 (patch-ag) = 2f97e1d9c9a96096524903c43ba4f7626956450d
 SHA1 (patch-ah) = abb315ac44a36e99d8c456b1cb3af9290a29be12
 SHA1 (patch-bb) = 69e001995a8caa65b885e438123a7efb0ad9995b
-SHA1 (patch-bc) = 5caafe0a6ca44ccacb5532e26d9c11950ea6c7da
+SHA1 (patch-bc) = 2b802e83a8aab3e3165418d540f91238c8941c2b
 SHA1 (patch-bd) = 15982bf8a9aee6f6ccd94f186bff20b70b1a93cf
 SHA1 (patch-be) = 85a98134d77038d20544241410ec8130df2ea94c
-SHA1 (patch-configure) = 36d9699ea7f6471b2b4fd3daf6ccde47c8730106
+SHA1 (patch-extras_immodules_agent_scim-bridge-agent-application.cpp) = b8dc14330f29e706439e9ca91217892355f86ee4
+SHA1 (patch-extras_immodules_agent_scim-bridge-agent.cpp) = f1a9bd1b185a02ba2e84d6040565662b95a25397
+SHA1 (patch-extras_immodules_client-common_scim-bridge-client-output.c) = 51c8635a3084112fd4362862690c4cc5bfffbe01
+SHA1 (patch-extras_immodules_client-common_scim-bridge-client.c) = ee441af01f39d65f8ed3f305407add2ac9fc0a32
+SHA1 (patch-extras_immodules_client-gtk_scim-bridge-client-imcontext-gtk.c) = 19c8f4ec70bb1c21c7318819367729579641866e
+SHA1 (patch-extras_immodules_common_scim-bridge-messenger.h) = 1a9defe26a124317c410bef12b2a7f023ea284b4
 SHA1 (patch-src_scim__helper__manager__server.cpp) = 3a1130f37c7c93389e2ae7db65af7438bac5de51
diff --git a/inputmethod/scim/options.mk b/inputmethod/scim/options.mk
new file mode 100644
index 00000000000..3e7278cc914
--- /dev/null
+++ b/inputmethod/scim/options.mk
@@ -0,0 +1,55 @@
+# $NetBSD: options.mk,v 1.1 2012/08/19 08:09:08 obache Exp $
+#
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.scim
+PKG_OPTIONS_REQUIRED_GROUPS=	gtk
+PKG_OPTIONS_GROUP.gtk=		gtk gtk3
+PKG_SUPPORTED_OPTIONS=		qt
+PKG_SUGGESTED_OPTIONS=		gtk
+
+PLIST_VARS+=	gtk2 gtk3 qt
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgtk)
+GTK2_IMMODULES=		yes
+.include "../../x11/gtk2/modules.mk"
+CONFIGURE_ARGS+=	--enable-gtk2-immodule
+PLIST.gtk2=		yes
+.else
+CONFIGURE_ARGS+=	--enable-gtk2-immodule=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk3)
+GTK3_IMMODULES=		yes
+.include "../../x11/gtk3/modules.mk"
+CONFIGURE_ARGS+=	--enable-gtk3-immodule
+PLIST.gtk3=		yes
+.else
+CONFIGURE_ARGS+=	--enable-gtk3-immodule=no
+.endif
+
+#.if !empty(PKG_OPTIONS:Mqt3)
+#.include "../../x11/qt3-libs/buildlink3.mk"
+#CONFIGURE_ARGS+=	--enable-qt3-immodule
+#PLIST.qt=		yes
+#.else
+#CONFIGURE_ARGS+=	--disable-qt3-immodule
+#.endif
+
+.if !empty(PKG_OPTIONS:Mqt)
+.include "../../x11/qt4-libs/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-qt4-immodule
+CONFIGURE_ARGS+=	--with-qt4-im-module-dir=${QTDIR}/plugins/inputmethods
+PLIST.qt=		yes
+.else
+CONFIGURE_ARGS+=	--disable-qt4-immodule
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk3)
+CONFIGURE_ARGS+=	--with-gtk-version=3
+.include "../../x11/gtk3/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--with-gtk-version=2
+.include "../../x11/gtk2/buildlink3.mk"
+.endif
diff --git a/inputmethod/scim/patches/patch-bc b/inputmethod/scim/patches/patch-bc
index afea9e13d18..04ec230d6fc 100644
--- a/inputmethod/scim/patches/patch-bc
+++ b/inputmethod/scim/patches/patch-bc
@@ -1,6 +1,6 @@
-$NetBSD: patch-bc,v 1.3 2012/04/20 12:13:48 obache Exp $
+$NetBSD: patch-bc,v 1.4 2012/08/19 08:09:08 obache Exp $
 
---- utils/scimkeyselection.cpp.orig	2012-04-10 09:15:30.000000000 +0000
+--- utils/scimkeyselection.cpp.orig	2012-06-11 15:50:28.000000000 +0000
 +++ utils/scimkeyselection.cpp
 @@ -79,6 +79,7 @@ scim_key_selection_register_type (GTypeM
          sizeof (ScimKeySelection),
@@ -10,7 +10,7 @@ $NetBSD: patch-bc,v 1.3 2012/04/20 12:13:48 obache Exp $
      };
  
      if (!key_selection_type) {
-@@ -625,6 +626,7 @@ scim_key_selection_dialog_register_type 
+@@ -641,6 +642,7 @@ scim_key_selection_dialog_register_type 
          sizeof (ScimKeySelectionDialog),
          0,
          (GInstanceInitFunc) scim_key_selection_dialog_init,
diff --git a/inputmethod/scim/patches/patch-configure b/inputmethod/scim/patches/patch-configure
deleted file mode 100644
index d8178b6dea2..00000000000
--- a/inputmethod/scim/patches/patch-configure
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-configure,v 1.3 2012/05/14 05:01:24 sbd Exp $
-
-Change the the cast on gettext() when testing for it so the gcc doesn't
-complain with "error: cast from 'char*' to 'int' loses precision",
-which causes the test to fail and NLS to be disabled.
-
---- configure.orig	2012-04-29 05:43:20.000000000 +0000
-+++ configure
-@@ -17725,7 +17725,7 @@ int
- main ()
- {
- bindtextdomain ("", "");
--return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
-+return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
-   ;
-   return 0;
- }
-@@ -18247,7 +18247,7 @@ int
- main ()
- {
- bindtextdomain ("", "");
--return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
-+return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
-   ;
-   return 0;
- }
-@@ -18274,7 +18274,7 @@ int
- main ()
- {
- bindtextdomain ("", "");
--return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
-+return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
-   ;
-   return 0;
- }
diff --git a/inputmethod/scim/patches/patch-extras_immodules_agent_scim-bridge-agent-application.cpp b/inputmethod/scim/patches/patch-extras_immodules_agent_scim-bridge-agent-application.cpp
new file mode 100644
index 00000000000..5a0866c0b8a
--- /dev/null
+++ b/inputmethod/scim/patches/patch-extras_immodules_agent_scim-bridge-agent-application.cpp
@@ -0,0 +1,37 @@
+$NetBSD: patch-extras_immodules_agent_scim-bridge-agent-application.cpp,v 1.1 2012/08/19 08:09:08 obache Exp $
+
+--- extras/immodules/agent/scim-bridge-agent-application.cpp.orig	2012-06-13 15:22:28.000000000 +0000
++++ extras/immodules/agent/scim-bridge-agent-application.cpp
+@@ -61,12 +61,12 @@ int main (int argc, char *argv[])
+         {0, 0, NULL, 0}
+     };
+ 
+-    char short_options[] = "vhqdls:b:";
++    char short_options[] = "vhql:sn:";
+ 
+     unsigned int tmp_uint;
+ 
+     int option = 0;
+-    while (option != EOF) {
++    while (option != -1) {
+         option = getopt_long (argc, argv, short_options, long_options, NULL);
+         switch (option) {
+             case 'v':
+@@ -90,14 +90,14 @@ int main (int argc, char *argv[])
+                 standalone_enabled = true;
+                 break;
+             case 'h':
+-                cout << "Usage: scim-bridge-agent [options]" << endl;
++                cout << "Usage: scim-im-agent [options]" << endl;
+                 cout << " Options" << endl << endl;
+                 cout << " -h, --help\tGive this help list" << endl;
+                 cout << " -v, --verbose\tVerbosely print out the debug message into standard output.This option equals to '--debuglevel=6'" << endl;
+                 cout << " -q, --quiet\tMake it print no debug message at all.This option equals to '--debuglevel=0" << endl;
+                 cout << " -l, --debuglevel\tSet how verbosely should it print debug output.'--debuglevel=0' equals to '--queit', and '--debuglevel=9' equals to '--verbose'" << endl;
+-                cout << " -s, --standalone\tGiven this, scim-brige-agent won't daemonize itself." << endl;
+-                cout << " -n, --noexit\tGiven this, scim-brige-agent won't exit when there is no client." << endl;
++                cout << " -s, --standalone\tGiven this, scim-im-agent won't daemonize itself." << endl;
++                cout << " -n, --noexit\tGiven this, scim-im-agent won't exit when there is no client." << endl;
+                 exit (0);
+                 break;
+             case ':':
diff --git a/inputmethod/scim/patches/patch-extras_immodules_agent_scim-bridge-agent.cpp b/inputmethod/scim/patches/patch-extras_immodules_agent_scim-bridge-agent.cpp
new file mode 100644
index 00000000000..8319cf3210b
--- /dev/null
+++ b/inputmethod/scim/patches/patch-extras_immodules_agent_scim-bridge-agent.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-extras_immodules_agent_scim-bridge-agent.cpp,v 1.1 2012/08/19 08:09:08 obache Exp $
+
+--- extras/immodules/agent/scim-bridge-agent.cpp.orig	2012-06-13 15:22:28.000000000 +0000
++++ extras/immodules/agent/scim-bridge-agent.cpp
+@@ -198,6 +198,7 @@ ScimBridgeAgent *ScimBridgeAgent::alloc 
+ 
+ ScimBridgeAgentImpl::ScimBridgeAgentImpl ():
+ running (true), noexit_enabled (false), standalone_enabled (false), client_app_count (0),
++scim_config_module(0),
+ accept_listener (NULL), interruption_listener (NULL), panel_listener (NULL), signal_listener (NULL), display (NULL)
+ {
+ }
diff --git a/inputmethod/scim/patches/patch-extras_immodules_client-common_scim-bridge-client-output.c b/inputmethod/scim/patches/patch-extras_immodules_client-common_scim-bridge-client-output.c
new file mode 100644
index 00000000000..7132ebe5884
--- /dev/null
+++ b/inputmethod/scim/patches/patch-extras_immodules_client-common_scim-bridge-client-output.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-extras_immodules_client-common_scim-bridge-client-output.c,v 1.1 2012/08/19 08:09:08 obache Exp $
+
+--- extras/immodules/client-common/scim-bridge-client-output.c.orig	2012-06-13 15:22:28.000000000 +0000
++++ extras/immodules/client-common/scim-bridge-client-output.c
+@@ -20,6 +20,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include "scim-bridge-debug.h"
+ #include "scim-bridge-output.h"
diff --git a/inputmethod/scim/patches/patch-extras_immodules_client-common_scim-bridge-client.c b/inputmethod/scim/patches/patch-extras_immodules_client-common_scim-bridge-client.c
new file mode 100644
index 00000000000..f153b0d4f11
--- /dev/null
+++ b/inputmethod/scim/patches/patch-extras_immodules_client-common_scim-bridge-client.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-extras_immodules_client-common_scim-bridge-client.c,v 1.1 2012/08/19 08:09:08 obache Exp $
+
+--- extras/immodules/client-common/scim-bridge-client.c.orig	2012-06-13 15:22:28.000000000 +0000
++++ extras/immodules/client-common/scim-bridge-client.c
+@@ -38,6 +38,11 @@
+ #include "scim-bridge-path.h"
+ #include "scim-bridge-string.h"
+ 
++#ifndef SUN_LEN
++#define SUN_LEN(su) \
++	    (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
++#endif
++
+ /* Private data type */
+ typedef struct _IMContextListElement
+ {
+@@ -1080,7 +1085,7 @@ retval_t scim_bridge_client_open_messeng
+         socket_addr.sun_family = AF_UNIX;
+         strcpy (socket_addr.sun_path, scim_bridge_path_get_socket ());
+ 
+-        if (connect (socket_fd, (struct sockaddr*)&socket_addr, sizeof (socket_addr.sun_family) + strlen (socket_addr.sun_path))) {
++        if (connect (socket_fd, (struct sockaddr*)&socket_addr, SUN_LEN(&socket_addr))) {
+             if (i == 5 && launch_agent ()) {
+                 scim_bridge_perrorln ("Cannot launch the agent");
+                 return RETVAL_FAILED;
diff --git a/inputmethod/scim/patches/patch-extras_immodules_client-gtk_scim-bridge-client-imcontext-gtk.c b/inputmethod/scim/patches/patch-extras_immodules_client-gtk_scim-bridge-client-imcontext-gtk.c
new file mode 100644
index 00000000000..2c3b21547ab
--- /dev/null
+++ b/inputmethod/scim/patches/patch-extras_immodules_client-gtk_scim-bridge-client-imcontext-gtk.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-extras_immodules_client-gtk_scim-bridge-client-imcontext-gtk.c,v 1.1 2012/08/19 08:09:08 obache Exp $
+
+--- extras/immodules/client-gtk/scim-bridge-client-imcontext-gtk.c.orig	2012-06-13 15:22:28.000000000 +0000
++++ extras/immodules/client-gtk/scim-bridge-client-imcontext-gtk.c
+@@ -684,6 +684,7 @@ void scim_bridge_client_imcontext_regist
+ #else
+         (GtkObjectInitFunc) scim_bridge_client_imcontext_initialize,
+ #endif
++	0
+     };
+ 
+     class_type = g_type_module_register_type (type_module, GTK_TYPE_IM_CONTEXT, "ScimBridgeClientIMContext", &klass_info, 0);
diff --git a/inputmethod/scim/patches/patch-extras_immodules_common_scim-bridge-messenger.h b/inputmethod/scim/patches/patch-extras_immodules_common_scim-bridge-messenger.h
new file mode 100644
index 00000000000..b79529be131
--- /dev/null
+++ b/inputmethod/scim/patches/patch-extras_immodules_common_scim-bridge-messenger.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-extras_immodules_common_scim-bridge-messenger.h,v 1.1 2012/08/19 08:09:08 obache Exp $
+
+--- extras/immodules/common/scim-bridge-messenger.h.orig	2012-06-13 15:22:28.000000000 +0000
++++ extras/immodules/common/scim-bridge-messenger.h
+@@ -33,6 +33,8 @@
+  */
+ typedef struct _ScimBridgeMessenger ScimBridgeMessenger;
+ 
++struct timeval;
++
+ #ifdef __cplusplus
+ extern "C"
+ {