diff options
Diffstat (limited to 'app-i18n/scim-bridge/files')
5 files changed, 268 insertions, 0 deletions
diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-gcc43.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-gcc43.patch new file mode 100644 index 000000000000..1db7769424f5 --- /dev/null +++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-gcc43.patch @@ -0,0 +1,10 @@ +--- scim-bridge-0.4.15.orig/client-common/scim-bridge-client-output.c 2008-11-02 15:44:34.000000000 +0900 ++++ scim-bridge-0.4.15/client-common/scim-bridge-client-output.c 2009-01-25 15:10:22.000000000 +0900 +@@ -20,6 +20,7 @@ + #include <stdarg.h> + #include <stdio.h> + #include <string.h> ++#include <alloca.h> + + #include "scim-bridge-debug.h" + #include "scim-bridge-output.h" diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-qt4.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-qt4.patch new file mode 100644 index 000000000000..606117cfbf01 --- /dev/null +++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-qt4.patch @@ -0,0 +1,58 @@ +diff -Naur scim-bridge-0.4.15.orig/client-qt/qt4/Makefile.am scim-bridge-0.4.15/client-qt/qt4/Makefile.am +--- scim-bridge-0.4.15.orig/client-qt/qt4/Makefile.am 2009-01-18 01:57:40.000000000 +0900 ++++ scim-bridge-0.4.15/client-qt/qt4/Makefile.am 2009-01-25 14:58:09.000000000 +0900 +@@ -24,7 +24,7 @@ + + noinst_HEADERS = ../scim-bridge-client-qt.h ../scim-bridge-client-imcontext-qt.h ../scim-bridge-client-key-event-utility-qt.h ../scim-bridge-client-common-qt.h + +-moduledir = @QT4_PREFIX@/plugins/inputmethods ++moduledir = @QT4_LIBDIR@/plugins/inputmethods + module_LTLIBRARIES = im-scim-bridge.la + + im_scim_bridge_la_SOURCES = ../im-scim-bridge-qt.cpp \ +diff -Naur scim-bridge-0.4.15.orig/client-qt/scim-bridge-client-imcontext-qt.cpp scim-bridge-0.4.15/client-qt/scim-bridge-client-imcontext-qt.cpp +--- scim-bridge-0.4.15.orig/client-qt/scim-bridge-client-imcontext-qt.cpp 2008-11-02 15:44:46.000000000 +0900 ++++ scim-bridge-0.4.15/client-qt/scim-bridge-client-imcontext-qt.cpp 2009-01-25 15:04:34.000000000 +0900 +@@ -219,6 +219,12 @@ + void ScimBridgeClientIMContextImpl::setFocusWidget (QWidget *widget) + { + scim_bridge_pdebugln (4, "ScimBridgeClientIMContextImpl::setFocusWidget ()"); ++ ++ if (focused_imcontext != NULL) { ++ focused_imcontext->focus_out (); ++ focused_imcontext = NULL; ++ } ++ + QInputContext::setFocusWidget (widget); + focus_in (); + update (); +@@ -442,8 +448,15 @@ + } + } + ++#ifdef QT4 ++ if (preedit_shown) { ++ set_preedit_shown (false); ++ update_preedit (); ++ } ++#else + set_preedit_shown (false); + update_preedit (); ++#endif + + focused_imcontext = NULL; + } +diff -Naur scim-bridge-0.4.15.orig/configure.ac scim-bridge-0.4.15/configure.ac +--- scim-bridge-0.4.15.orig/configure.ac 2009-01-18 02:24:32.000000000 +0900 ++++ scim-bridge-0.4.15/configure.ac 2009-01-25 14:58:06.000000000 +0900 +@@ -105,6 +105,10 @@ + QT4_PREFIX=`$PKG_CONFIG --variable=prefix QtCore` + fi + AC_SUBST(QT4_PREFIX) ++ if test -z "$QT4_LIBDIR"; then ++ QT4_LIBDIR=`$PKG_CONFIG --variable=libdir QtCore` ++ fi ++ AC_SUBST(QT4_LIBDIR) + enable_qt4_immodule="yes"; + fi + diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.4.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.4.patch new file mode 100644 index 000000000000..11415931fdbc --- /dev/null +++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.4.patch @@ -0,0 +1,12 @@ +Index: scim-bridge-0.4.16/agent/scim-bridge-agent-application.cpp +=================================================================== +--- scim-bridge-0.4.16.orig/agent/scim-bridge-agent-application.cpp ++++ scim-bridge-0.4.16/agent/scim-bridge-agent-application.cpp +@@ -24,6 +24,7 @@ + #include <unistd.h> + + #include <iostream> ++#include <cstdio> + + #include "scim-bridge-agent.h" + diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.7.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.7.patch new file mode 100644 index 000000000000..99899d8c4b37 --- /dev/null +++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.7.patch @@ -0,0 +1,24 @@ +diff --git a/agent/utils/scim-bridge-agent-panel-client.cpp b/agent/utils/scim-bridge-agent-panel-client.cpp +index 07cb14b..62fd3b3 100644 +--- a/agent/utils/scim-bridge-agent-panel-client.cpp ++++ b/agent/utils/scim-bridge-agent-panel-client.cpp +@@ -24,6 +24,7 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <sys/wait.h> ++#include <unistd.h> + + #define Uses_SCIM_CONFIG_PATH + +diff --git a/agent/scim-bridge-agent-signal-listener.cpp b/agent/scim-bridge-agent-signal-listener.cpp +index 433dc15..c9eff47 100644 +--- a/agent/scim-bridge-agent-signal-listener.cpp ++++ b/agent/scim-bridge-agent-signal-listener.cpp +@@ -22,6 +22,7 @@ + #include <signal.h> + #include <stdio.h> + #include <string.h> ++#include <unistd.h> + + #include <sys/socket.h> + #include <sys/types.h> diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch new file mode 100644 index 000000000000..ee6543c7dd6a --- /dev/null +++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch @@ -0,0 +1,164 @@ +--- configure.ac.orig 2009-11-27 21:07:46.000000000 +0800 ++++ configure.ac 2009-11-27 21:33:17.000000000 +0800 +@@ -55,63 +55,6 @@ + AM_CONDITIONAL(HAVE_DOCBOOK, test x$DOCBOOK_XSL != xno) + AM_CONDITIONAL(BUILD_MANUAL, test x$XSLTPROC != xno -a x$DOCBOOK_XSL != xno) + +-# Check if we should build scim-bridge-gtk-immodule +-PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.4.0 pango >= 1.1.0 gdk-pixbuf-2.0 >= 2.4.0], +- [SCIM_BRIDGE_HAS_GTK2=yes], +- [SCIM_BRIDGE_HAS_GTK2=no]) +- +-SCIM_BRIDGE_HAS_GTK2_2=no +-if test "$SCIM_BRIDGE_HAS_GTK2" = "yes"; then +- if $PKG_CONFIG --exists "gtk+-2.0 >= 2.2" ; then +- SCIM_BRIDGE_HAS_GTK2_2=yes +- GTK_VERSION=2.2.0 +- AC_DEFINE(GDK_MULTIHEAD_SAFE,1,[Force use of GDK's multihead-safe APIs.]) +- fi +- if $PKG_CONFIG --exists "gtk+-2.0 >= 2.3.5" ; then +- SCIM_BRIDGE_HAS_GTK2_4=yes +- GTK_VERSION=2.3.5 +- AC_DEFINE(HAVE_GTK_DRAW_INSERTION_CURSOR,1,[Have gtk_draw_insertion_cursor ().]) +- 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 +- AC_SUBST(GTK_LIBDIR) +- AC_SUBST(GTK_VERSION) +- AC_SUBST(GTK_BINARY_VERSION) +- enable_gtk2_immodule="yes"; +-fi +- +-# Check if we should build scim-bridge-qt-immodule +-PKG_CHECK_MODULES(QT3, [qt-mt >= 3.3], +- [SCIM_BRIDGE_HAS_QT3=yes], +- [SCIM_BRIDGE_HAS_QT3=no]) +- +-if test "$SCIM_BRIDGE_HAS_QT3" = "yes"; then +- if test -z "$QT3_PREFIX"; then +- QT3_PREFIX=`$PKG_CONFIG --variable=prefix qt-mt` +- fi +- AC_SUBST(QT3_PREFIX) +- enable_qt3_immodule="yes"; +-fi +- +-PKG_CHECK_MODULES(QT4, [QtGui >= 4.0, QtCore >= 4.0], +- [SCIM_BRIDGE_HAS_QT4=yes], +- [SCIM_BRIDGE_HAS_QT4=no]) +- +-if test "$SCIM_BRIDGE_HAS_QT4" = "yes"; then +- if test -z "$QT4_PREFIX"; then +- QT4_PREFIX=`$PKG_CONFIG --variable=prefix QtCore` +- fi +- AC_SUBST(QT4_PREFIX) +- if test -z "$QT4_LIBDIR"; then +- QT4_LIBDIR=`$PKG_CONFIG --variable=libdir QtCore` +- fi +- AC_SUBST(QT4_LIBDIR) +- enable_qt4_immodule="yes"; +-fi +- + ########################################################### + ## Definiation of compile args. ## + ########################################################### +@@ -132,13 +75,16 @@ + enable_agent=yes) + + AC_ARG_ENABLE(gtk2-immodule, +- [AS_HELP_STRING([--enable-gtk2-immodule], [build GTK2 IM module])], , ) ++ [AS_HELP_STRING([--enable-gtk2-immodule], [build GTK2 IM module [default=yes]])], , ++ enable_gtk2_immodule=yes) + + AC_ARG_ENABLE(qt3-immodule, +- [AS_HELP_STRING([--enable-qt3-immodule], [build Qt3 IM module])], , ) ++ [AS_HELP_STRING([--enable-qt3-immodule], [build Qt3 IM module [default=yes]])], , ++ enable_qt3_immodule=yes) + + AC_ARG_ENABLE(qt4-immodule, +- [AS_HELP_STRING([--enable-qt4-immodule], [build Qt4 IM module])], , ) ++ [AS_HELP_STRING([--enable-qt4-immodule], [build Qt4 IM module [default=yes]])], , ++ enable_qt4_immodule=yes) + + if test "$enable_debug" = "yes"; then + AC_DEFINE(ENABLE_DEBUG,1,[Define this to enable the debug facility in libscim]) +@@ -175,7 +121,33 @@ + if test "$enable_gtk2_immodule" = "yes"; then + SCIM_BRIDGE_BUILD_GTK2_IMMODULE=1 + SCIM_BRIDGE_BUILD_IMMODULE=1 +- if test "$SCIM_BRIDGE_HAS_GTK2" = "no" ; then ++ ++ # Check if we should build scim-bridge-gtk-immodule ++ PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.4.0 pango >= 1.1.0 gdk-pixbuf-2.0 >= 2.4.0], ++ [SCIM_BRIDGE_HAS_GTK2=yes], ++ [SCIM_BRIDGE_HAS_GTK2=no]) ++ ++ SCIM_BRIDGE_HAS_GTK2_2=no ++ if test "$SCIM_BRIDGE_HAS_GTK2" = "yes"; then ++ if $PKG_CONFIG --exists "gtk+-2.0 >= 2.2" ; then ++ SCIM_BRIDGE_HAS_GTK2_2=yes ++ GTK_VERSION=2.2.0 ++ AC_DEFINE(GDK_MULTIHEAD_SAFE,1,[Force use of GDK's multihead-safe APIs.]) ++ fi ++ if $PKG_CONFIG --exists "gtk+-2.0 >= 2.3.5" ; then ++ SCIM_BRIDGE_HAS_GTK2_4=yes ++ GTK_VERSION=2.3.5 ++ AC_DEFINE(HAVE_GTK_DRAW_INSERTION_CURSOR,1,[Have gtk_draw_insertion_cursor ().]) ++ 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 ++ AC_SUBST(GTK_LIBDIR) ++ AC_SUBST(GTK_VERSION) ++ AC_SUBST(GTK_BINARY_VERSION) ++ else + AC_MSG_ERROR([Gtk >= 2.2 can not be found!]) + fi + enable_immodule=yes +@@ -187,7 +159,18 @@ + if test "$enable_qt3_immodule" = "yes"; then + SCIM_BRIDGE_BUILD_QT3_IMMODULE=1 + SCIM_BRIDGE_BUILD_IMMODULE=1 +- if test "$SCIM_BRIDGE_HAS_QT3" = "no"; then ++ ++ # Check if we should build scim-bridge-qt-immodule ++ PKG_CHECK_MODULES(QT3, [qt-mt >= 3.3], ++ [SCIM_BRIDGE_HAS_QT3=yes], ++ [SCIM_BRIDGE_HAS_QT3=no]) ++ ++ if test "$SCIM_BRIDGE_HAS_QT3" = "yes"; then ++ if test -z "$QT3_PREFIX"; then ++ QT3_PREFIX=`$PKG_CONFIG --variable=prefix qt-mt` ++ fi ++ AC_SUBST(QT3_PREFIX) ++ else + AC_MSG_ERROR([qt >= 3.3 can not be found!]) + fi + enable_immodule=yes +@@ -199,7 +182,21 @@ + if test "$enable_qt4_immodule" = "yes"; then + SCIM_BRIDGE_BUILD_QT4_IMMODULE=1 + SCIM_BRIDGE_BUILD_IMMODULE=1 +- if test "$SCIM_BRIDGE_HAS_QT4" = "no"; then ++ ++ PKG_CHECK_MODULES(QT4, [QtGui >= 4.0, QtCore >= 4.0], ++ [SCIM_BRIDGE_HAS_QT4=yes], ++ [SCIM_BRIDGE_HAS_QT4=no]) ++ ++ if test "$SCIM_BRIDGE_HAS_QT4" = "yes"; then ++ if test -z "$QT4_PREFIX"; then ++ QT4_PREFIX=`$PKG_CONFIG --variable=prefix QtCore` ++ fi ++ AC_SUBST(QT4_PREFIX) ++ if test -z "$QT4_LIBDIR"; then ++ QT4_LIBDIR=`$PKG_CONFIG --variable=libdir QtCore` ++ fi ++ AC_SUBST(QT4_LIBDIR) ++ else + AC_MSG_ERROR([qt >= 4.0 can not be found!]) + fi + enable_immodule=yes |