Update scim to 1.4.11.

* multi monitor support
* translation update.
* some build fixes

6 files changed, 52 insertions, 25 deletions

diff --git a/inputmethod/scim/Makefile b/inputmethod/scim/Makefile
index 8c6f7f06180..deec1c1944f 100644
--- a/inputmethod/scim/Makefile
+++ b/inputmethod/scim/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2011/11/01 06:01:55 sbd Exp $
+# $NetBSD: Makefile,v 1.9 2011/11/13 07:52:01 obache Exp $
 #
 
-DISTNAME=		scim-1.4.9
-PKGREVISION=		6
+DISTNAME=		scim-1.4.11
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scim/}
 
@@ -48,10 +47,10 @@ LDFLAGS.SunOS+=		-lsocket -lnsl
 .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"
-.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/scim/distinfo b/inputmethod/scim/distinfo
index 52ff9734580..3d5e6d1c245 100644
--- a/inputmethod/scim/distinfo
+++ b/inputmethod/scim/distinfo
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
+$NetBSD: distinfo,v 1.2 2011/11/13 07:52:01 obache Exp $
 
-SHA1 (scim-1.4.9.tar.gz) = 7717339575fdbf909309a78882e30c60cce9f8eb
-RMD160 (scim-1.4.9.tar.gz) = f84d51aad96fe8c2b32ef1b922ebfe9499f70c90
-Size (scim-1.4.9.tar.gz) = 2928091 bytes
+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 (patch-ab) = c5220c83ec8125f75b1e5d7b41f4438ec73becbf
-SHA1 (patch-ac) = ad168f68be04c7865890fe83c56e51b5b539383d
+SHA1 (patch-ac) = 633b17ff2618fb45d1a018df6308792c49f42bc3
 SHA1 (patch-ad) = 2812ded533f29bd69bad180c33c81fd49e6213e6
 SHA1 (patch-ae) = 61909935f6226d2126392d0990f81243dc2bb933
 SHA1 (patch-af) = 010d4f31d684b8163672d2521ebff74230591d66
 SHA1 (patch-ag) = 2f97e1d9c9a96096524903c43ba4f7626956450d
 SHA1 (patch-ah) = abb315ac44a36e99d8c456b1cb3af9290a29be12
-SHA1 (patch-bb) = 978220761e766fed801c9d5fc89ed6c1c562af92
-SHA1 (patch-bc) = 3e4c7aa2afd8bb64bfe7fbc46a3e739d59b0e133
+SHA1 (patch-bb) = ddd1125d92a754a3a7ae68a07777f6a547cc117a
+SHA1 (patch-bc) = 3b5f15368476658bd51beee20798569b6ecc93b9
 SHA1 (patch-bd) = 9912d596f5e54f59dfc0bd01c22a457f056c84e1
 SHA1 (patch-be) = 85a98134d77038d20544241410ec8130df2ea94c
+SHA1 (patch-src_scim__helper__manager__server.cpp) = 3a1130f37c7c93389e2ae7db65af7438bac5de51
diff --git a/inputmethod/scim/patches/patch-ac b/inputmethod/scim/patches/patch-ac
index 28b1c24b65d..3c3a804f925 100644
--- a/inputmethod/scim/patches/patch-ac
+++ b/inputmethod/scim/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
+$NetBSD: patch-ac,v 1.2 2011/11/13 07:52:02 obache Exp $
 
---- extras/panel/scim_panel_gtk.cpp.orig	2008-11-02 06:43:13.000000000 +0000
+--- extras/panel/scim_panel_gtk.cpp.orig	2011-09-01 09:00:26.000000000 +0000
 +++ extras/panel/scim_panel_gtk.cpp
-@@ -464,7 +464,7 @@ static GdkColor           _active_bg;
+@@ -476,7 +476,7 @@ static GdkColor           _active_bg;
  static GdkColor           _active_text;
  
  static ConfigModule      *_config_module               = 0;
diff --git a/inputmethod/scim/patches/patch-bb b/inputmethod/scim/patches/patch-bb
index c6300a1261f..3137bef2a78 100644
--- a/inputmethod/scim/patches/patch-bb
+++ b/inputmethod/scim/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
+$NetBSD: patch-bb,v 1.2 2011/11/13 07:52:02 obache Exp $
 
---- extras/gtk2_immodule/gtkimcontextscim.cpp.orig	2008-11-02 06:43:15.000000000 +0000
+--- extras/gtk2_immodule/gtkimcontextscim.cpp.orig	2010-07-26 22:11:42.000000000 +0000
 +++ extras/gtk2_immodule/gtkimcontextscim.cpp
-@@ -274,11 +274,11 @@ static int                              
+@@ -282,11 +282,11 @@ static int                              
  static FrontEndHotkeyMatcher                            _frontend_hotkey_matcher;
  static IMEngineHotkeyMatcher                            _imengine_hotkey_matcher;
  
@@ -17,7 +17,7 @@ $NetBSD: patch-bb,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
  
  static GtkIMContextSCIM                                *_focused_ic                 = 0;
  static GtkWidget                                       *_focused_widget             = 0;
-@@ -296,8 +296,8 @@ static bool                             
+@@ -304,8 +304,8 @@ static bool                             
  static int                                              _instance_count             = 0;
  static int                                              _context_count              = 0;
  
@@ -28,15 +28,15 @@ $NetBSD: patch-bb,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
  
  static PanelClient                                      _panel_client;
  
-@@ -310,6 +310,7 @@ static bool                             
+@@ -318,6 +318,7 @@ static bool                             
  static bool                                             _shared_input_method        = false;
- static bool                                             _use_key_snooper            = true;
+ static bool                                             _use_key_snooper            = false;
  
 +#if 0
  // A hack to shutdown the immodule cleanly even if im_module_exit () is not called when exiting.
  class FinalizeHandler
  {
-@@ -324,6 +325,7 @@ public:
+@@ -334,6 +335,7 @@ public:
  };
  
  static FinalizeHandler                                  _finalize_handler;
@@ -44,7 +44,7 @@ $NetBSD: patch-bb,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
  
  /* Function Implementations */
  
-@@ -436,6 +438,7 @@ gtk_im_context_scim_register_type (GType
+@@ -446,6 +448,7 @@ gtk_im_context_scim_register_type (GType
          sizeof               (GtkIMContextSCIM),
          0,
          (GtkObjectInitFunc)  gtk_im_context_scim_init,
diff --git a/inputmethod/scim/patches/patch-bc b/inputmethod/scim/patches/patch-bc
index f3fc31f4266..e8584913b91 100644
--- a/inputmethod/scim/patches/patch-bc
+++ b/inputmethod/scim/patches/patch-bc
@@ -1,6 +1,6 @@
-$NetBSD: patch-bc,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
+$NetBSD: patch-bc,v 1.2 2011/11/13 07:52:02 obache Exp $
 
---- utils/scimkeyselection.cpp.orig	2008-11-02 06:42:49.000000000 +0000
+--- utils/scimkeyselection.cpp.orig	2010-01-17 16:38:51.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.1.1.1 2009/11/24 11:46:01 obache Exp $
      };
  
      if (!key_selection_type) {
-@@ -608,6 +609,7 @@ scim_key_selection_dialog_register_type 
+@@ -618,6 +619,7 @@ scim_key_selection_dialog_register_type 
          sizeof (ScimKeySelectionDialog),
          0,
          (GInstanceInitFunc) scim_key_selection_dialog_init,
diff --git a/inputmethod/scim/patches/patch-src_scim__helper__manager__server.cpp b/inputmethod/scim/patches/patch-src_scim__helper__manager__server.cpp
new file mode 100644
index 00000000000..fbd55f4359d
--- /dev/null
+++ b/inputmethod/scim/patches/patch-src_scim__helper__manager__server.cpp
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_scim__helper__manager__server.cpp,v 1.1 2011/11/13 07:52:02 obache Exp $
+
+* Variable Length Arrays with non-POD types are a GCC extension.
+
+--- src/scim_helper_manager_server.cpp.orig	2008-10-19 04:48:33.000000000 +0000
++++ src/scim_helper_manager_server.cpp
+@@ -95,10 +95,10 @@ void load_helper_modules (void)
+     //      so I added a workaround: have an array of modules and unload them all together in the end only.
+     //      TODO Need to figure out what's going on with this issue.
+ 
+-    HelperModule module[mod_list.size ()];
+-
+     if (mod_list.size ()) {
+ 
++        HelperModule *module = new HelperModule[mod_list.size ()];
++
+         for (size_t i = 0; i < mod_list.size (); ++i) {
+ 
+             SCIM_DEBUG_MAIN (2) << " Load module: " << mod_list [i] << "\n";
+@@ -120,6 +120,7 @@ void load_helper_modules (void)
+         for (size_t i = 0; i < mod_list.size (); ++i) {
+             module[i].unload ();
+         }
++        delete[] module;
+     }
+ }
+