diff options
author | Tijl Coosemans <tijl@FreeBSD.org> | 2013-10-22 12:10:35 +0000 |
---|---|---|
committer | Tijl Coosemans <tijl@FreeBSD.org> | 2013-10-22 12:10:35 +0000 |
commit | 6e0d02ef3d7215fcbb2ccd02d46c61973915dbf3 (patch) | |
tree | 58b1da817a5be5fddc7b1cf88e0af43c58c9fbcd /textproc/scim/files/patch-extras-gtk2_immodule-gtkimcontextscim.cpp | |
parent | 2013-10-10 devel/ruby-sdl: Does not work with Ruby 1.9 (diff) |
- Fix linker problem by removing libtool dependency. The combination of
USE_AUTOTOOLS, USE_GCC and C++ is broken because /usr/local/bin/libtool
has hardcoded the linker it was built with. So on FreeBSD 10 it tries
to link gcc compiled C++ code with clang which does not work.
- Remove USE_GCC and fix build with clang with two new patches. [1]
- Fix build with libc++ by removing -lstdc++ from linker flags. The
compiler automatically adds the right runtime library.
- Add LICENSE.
- Convert gnomehack to pathfix.
- Remove references to PTHREAD_LIBS and PTHREAD_CFLAGS.
- Support staging.
- Remove an old patch that's no longer needed.
PR: ports/164618 [1]
Submitted by: Paul Ambrose <ambrosehua@gmail.com> [1]
Approved by: maintainer timeout (2 weeks)
Notes
Notes:
svn path=/head/; revision=331255
Diffstat (limited to 'textproc/scim/files/patch-extras-gtk2_immodule-gtkimcontextscim.cpp')
-rw-r--r-- | textproc/scim/files/patch-extras-gtk2_immodule-gtkimcontextscim.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
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"), |