Update scim to 1.4.12.

* ported to GTK3 (still using gtk2 in pkgsrc)
* patch so that now also working in Firefox
* patch for more robust

7 files changed, 42 insertions, 25 deletions

diff --git a/inputmethod/scim/Makefile b/inputmethod/scim/Makefile
index 692d346d1d3..4075da8df90 100644
--- a/inputmethod/scim/Makefile
+++ b/inputmethod/scim/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2012/03/03 00:12:33 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2012/04/20 12:13:48 obache Exp $
 #
 
-DISTNAME=		scim-1.4.11
-PKGREVISION=		2
+DISTNAME=		scim-1.4.12
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scim/}
 
@@ -29,8 +28,10 @@ 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
 
 EGDIR=			${PREFIX}/share/examples/scim
 CONF_FILES=		${EGDIR}/config ${PKG_SYSCONFDIR}/config
diff --git a/inputmethod/scim/distinfo b/inputmethod/scim/distinfo
index 3d5e6d1c245..79ec6e290b3 100644
--- a/inputmethod/scim/distinfo
+++ b/inputmethod/scim/distinfo
@@ -1,17 +1,18 @@
-$NetBSD: distinfo,v 1.2 2011/11/13 07:52:01 obache Exp $
+$NetBSD: distinfo,v 1.3 2012/04/20 12:13:48 obache Exp $
 
-SHA1 (scim-1.4.11.tar.gz) = e202e42df52f5c9a88f6ae4d4ce04f94bc22e27c
-RMD160 (scim-1.4.11.tar.gz) = 24e9632781eccefef287a62021a761c85fa4a47b
-Size (scim-1.4.11.tar.gz) = 2741428 bytes
+SHA1 (scim-1.4.12.tar.gz) = 948180ec0af18e435a95edbdb840cf41f3b24d32
+RMD160 (scim-1.4.12.tar.gz) = e902c14bffd8b957e1927eab26b265af023635c1
+Size (scim-1.4.12.tar.gz) = 1266185 bytes
 SHA1 (patch-ab) = c5220c83ec8125f75b1e5d7b41f4438ec73becbf
-SHA1 (patch-ac) = 633b17ff2618fb45d1a018df6308792c49f42bc3
+SHA1 (patch-ac) = c8c4a54b1b6ffd82211616c3b99de1239b29c652
 SHA1 (patch-ad) = 2812ded533f29bd69bad180c33c81fd49e6213e6
 SHA1 (patch-ae) = 61909935f6226d2126392d0990f81243dc2bb933
 SHA1 (patch-af) = 010d4f31d684b8163672d2521ebff74230591d66
 SHA1 (patch-ag) = 2f97e1d9c9a96096524903c43ba4f7626956450d
 SHA1 (patch-ah) = abb315ac44a36e99d8c456b1cb3af9290a29be12
-SHA1 (patch-bb) = ddd1125d92a754a3a7ae68a07777f6a547cc117a
-SHA1 (patch-bc) = 3b5f15368476658bd51beee20798569b6ecc93b9
-SHA1 (patch-bd) = 9912d596f5e54f59dfc0bd01c22a457f056c84e1
+SHA1 (patch-bb) = 69e001995a8caa65b885e438123a7efb0ad9995b
+SHA1 (patch-bc) = 5caafe0a6ca44ccacb5532e26d9c11950ea6c7da
+SHA1 (patch-bd) = 15982bf8a9aee6f6ccd94f186bff20b70b1a93cf
 SHA1 (patch-be) = 85a98134d77038d20544241410ec8130df2ea94c
+SHA1 (patch-configure) = 9a8e217d9d4419bcb24c632e88a1331b949c3cc5
 SHA1 (patch-src_scim__helper__manager__server.cpp) = 3a1130f37c7c93389e2ae7db65af7438bac5de51
diff --git a/inputmethod/scim/patches/patch-ac b/inputmethod/scim/patches/patch-ac
index 3c3a804f925..7fa3fcb61e1 100644
--- a/inputmethod/scim/patches/patch-ac
+++ b/inputmethod/scim/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.2 2011/11/13 07:52:02 obache Exp $
+$NetBSD: patch-ac,v 1.3 2012/04/20 12:13:48 obache Exp $
 
---- extras/panel/scim_panel_gtk.cpp.orig	2011-09-01 09:00:26.000000000 +0000
+--- extras/panel/scim_panel_gtk.cpp.orig	2012-04-10 09:15:30.000000000 +0000
 +++ extras/panel/scim_panel_gtk.cpp
-@@ -476,7 +476,7 @@ static GdkColor           _active_bg;
- static GdkColor           _active_text;
+@@ -490,7 +490,7 @@ static GdkColor           _active_text;
+ #endif
  
  static ConfigModule      *_config_module               = 0;
 -static ConfigPointer      _config;
diff --git a/inputmethod/scim/patches/patch-bb b/inputmethod/scim/patches/patch-bb
index 3137bef2a78..7cafe8ba740 100644
--- a/inputmethod/scim/patches/patch-bb
+++ b/inputmethod/scim/patches/patch-bb
@@ -1,7 +1,7 @@
-$NetBSD: patch-bb,v 1.2 2011/11/13 07:52:02 obache Exp $
+$NetBSD: patch-bb,v 1.3 2012/04/20 12:13:48 obache Exp $
 
---- extras/gtk2_immodule/gtkimcontextscim.cpp.orig	2010-07-26 22:11:42.000000000 +0000
-+++ extras/gtk2_immodule/gtkimcontextscim.cpp
+--- extras/gtk_immodule/gtkimcontextscim.cpp.orig	2012-04-10 10:30:58.000000000 +0000
++++ extras/gtk_immodule/gtkimcontextscim.cpp
 @@ -282,11 +282,11 @@ static int                              
  static FrontEndHotkeyMatcher                            _frontend_hotkey_matcher;
  static IMEngineHotkeyMatcher                            _imengine_hotkey_matcher;
@@ -47,7 +47,7 @@ $NetBSD: patch-bb,v 1.2 2011/11/13 07:52:02 obache Exp $
 @@ -446,6 +448,7 @@ gtk_im_context_scim_register_type (GType
          sizeof               (GtkIMContextSCIM),
          0,
-         (GtkObjectInitFunc)  gtk_im_context_scim_init,
+         (GInstanceInitFunc)  gtk_im_context_scim_init,
 +        0
      };
  
diff --git a/inputmethod/scim/patches/patch-bc b/inputmethod/scim/patches/patch-bc
index e8584913b91..afea9e13d18 100644
--- a/inputmethod/scim/patches/patch-bc
+++ b/inputmethod/scim/patches/patch-bc
@@ -1,6 +1,6 @@
-$NetBSD: patch-bc,v 1.2 2011/11/13 07:52:02 obache Exp $
+$NetBSD: patch-bc,v 1.3 2012/04/20 12:13:48 obache Exp $
 
---- utils/scimkeyselection.cpp.orig	2010-01-17 16:38:51.000000000 +0000
+--- utils/scimkeyselection.cpp.orig	2012-04-10 09:15:30.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.2 2011/11/13 07:52:02 obache Exp $
      };
  
      if (!key_selection_type) {
-@@ -618,6 +619,7 @@ scim_key_selection_dialog_register_type 
+@@ -625,6 +626,7 @@ scim_key_selection_dialog_register_type 
          sizeof (ScimKeySelectionDialog),
          0,
          (GInstanceInitFunc) scim_key_selection_dialog_init,
diff --git a/inputmethod/scim/patches/patch-bd b/inputmethod/scim/patches/patch-bd
index 253e2cbcb94..6c914934ec0 100644
--- a/inputmethod/scim/patches/patch-bd
+++ b/inputmethod/scim/patches/patch-bd
@@ -1,8 +1,8 @@
-$NetBSD: patch-bd,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
+$NetBSD: patch-bd,v 1.2 2012/04/20 12:13:48 obache Exp $
 
---- utils/scimstringview.c.orig	2008-11-02 06:42:49.000000000 +0000
+--- utils/scimstringview.c.orig	2012-04-10 10:30:58.000000000 +0000
 +++ utils/scimstringview.c
-@@ -134,6 +134,7 @@ scim_string_view_register_type (GTypeMod
+@@ -153,6 +153,7 @@ scim_string_view_register_type (GTypeMod
      sizeof (ScimStringView),
      0,
      (GInstanceInitFunc) scim_string_view_init,
diff --git a/inputmethod/scim/patches/patch-configure b/inputmethod/scim/patches/patch-configure
new file mode 100644
index 00000000000..62decc38ef0
--- /dev/null
+++ b/inputmethod/scim/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2012/04/20 12:13:48 obache Exp $
+
+* docs/* are not in release tarball.
+
+--- configure.orig	2012-04-20 11:22:47.000000000 +0000
++++ configure
+@@ -21626,7 +21626,7 @@ SCIM_TEMPDIR="/tmp"
+ ##                      Output files.                    ##
+ ###########################################################
+ 
+-ac_config_files="$ac_config_files Makefile po/Makefile.in src/Makefile src/scim_types.h utils/Makefile data/Makefile data/icons/Makefile data/pixmaps/Makefile modules/Makefile modules/FrontEnd/IMdkit/Makefile modules/FrontEnd/Makefile modules/IMEngine/Makefile modules/Filter/Makefile modules/Config/Makefile modules/SetupUI/Makefile docs/scim.cfg docs/Makefile docs/manual/Makefile configs/Makefile extras/Makefile extras/gtk_immodule/gtk2/Makefile extras/gtk_immodule/gtk3/Makefile extras/setup/Makefile extras/setup/scim-setup extras/panel/Makefile tests/Makefile scim.pc scim-gtkutils.pc scim-x11utils.pc scim.spec"
++ac_config_files="$ac_config_files Makefile po/Makefile.in src/Makefile src/scim_types.h utils/Makefile data/Makefile data/icons/Makefile data/pixmaps/Makefile modules/Makefile modules/FrontEnd/IMdkit/Makefile modules/FrontEnd/Makefile modules/IMEngine/Makefile modules/Filter/Makefile modules/Config/Makefile modules/SetupUI/Makefile configs/Makefile extras/Makefile extras/gtk_immodule/gtk2/Makefile extras/gtk_immodule/gtk3/Makefile extras/setup/Makefile extras/setup/scim-setup extras/panel/Makefile tests/Makefile scim.pc scim-gtkutils.pc scim-x11utils.pc scim.spec"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure