diff options
Diffstat (limited to 'textproc/scim/files')
3 files changed, 32 insertions, 14 deletions
diff --git a/textproc/scim/files/patch-configure b/textproc/scim/files/patch-configure deleted file mode 100644 index e71b173a67aa..000000000000 --- a/textproc/scim/files/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ ---- configure.old Tue Jun 26 11:51:09 2007 -+++ configure Tue Jun 26 11:51:34 2007 -@@ -36877,10 +36877,7 @@ - - fi - GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` -- GTK_LIBDIR=`$PKG_CONFIG --variable=libdir gtk+-2.0` -- if test -z "$GTK_LIBDIR)"; then -- GTK_LIBDIR="$libdir" -- fi -+ GTK_LIBDIR="$libdir" - GTK_IM_MODULEDIR=$GTK_LIBDIR/gtk-2.0/immodules - - diff --git a/textproc/scim/files/patch-extras-gtk2_immodule-gtkimcontextscim.cpp b/textproc/scim/files/patch-extras-gtk2_immodule-gtkimcontextscim.cpp new file mode 100644 index 000000000000..841b1a3c53d4 --- /dev/null +++ b/textproc/scim/files/patch-extras-gtk2_immodule-gtkimcontextscim.cpp @@ -0,0 +1,11 @@ +--- extras/gtk2_immodule/gtkimcontextscim.cpp.orig 2008-11-02 07:43:15.000000000 +0100 ++++ extras/gtk2_immodule/gtkimcontextscim.cpp 2013-10-08 18:16:29.000000000 +0200 +@@ -1710,7 +1710,7 @@ + // And set manual to false. + if (!check_socket_frontend ()) { + std::cerr << "Launching a SCIM daemon with Socket FrontEnd...\n"; +- char *new_argv [] = { static_cast<char*> ("--no-stay"), 0 }; ++ char *new_argv [] = { const_cast<char*> ("--no-stay"), 0 }; + scim_launch (true, + config_module_name, + (load_engine_list.size () ? scim_combine_string_list (load_engine_list, ',') : "all"), diff --git a/textproc/scim/files/patch-src-scim_helper_manager_server.cpp b/textproc/scim/files/patch-src-scim_helper_manager_server.cpp new file mode 100644 index 000000000000..83ca61fe0523 --- /dev/null +++ b/textproc/scim/files/patch-src-scim_helper_manager_server.cpp @@ -0,0 +1,21 @@ +--- src/scim_helper_manager_server.cpp.orig 2008-11-02 07:42:38.000000000 +0100 ++++ src/scim_helper_manager_server.cpp 2013-10-08 17:37:59.000000000 +0200 +@@ -95,9 +95,8 @@ + // 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) { + +@@ -120,6 +119,7 @@ + for (size_t i = 0; i < mod_list.size (); ++i) { + module[i].unload (); + } ++ delete[] module; + } + } + |