| 1 |
matsuu 09/01/25 06:19:06 |
| 2 |
|
| 3 |
Added: scim-bridge-0.4.15.2-qt4.patch |
| 4 |
scim-bridge-0.4.15.2-gcc43.patch |
| 5 |
Log: |
| 6 |
Version bumped. |
| 7 |
(Portage version: 2.1.6.7/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-qt4.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-qt4.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-qt4.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: scim-bridge-0.4.15.2-qt4.patch |
| 16 |
=================================================================== |
| 17 |
diff -Naur scim-bridge-0.4.15.orig/client-qt/qt4/Makefile.am scim-bridge-0.4.15/client-qt/qt4/Makefile.am |
| 18 |
--- scim-bridge-0.4.15.orig/client-qt/qt4/Makefile.am 2009-01-18 01:57:40.000000000 +0900 |
| 19 |
+++ scim-bridge-0.4.15/client-qt/qt4/Makefile.am 2009-01-25 14:58:09.000000000 +0900 |
| 20 |
@@ -24,7 +24,7 @@ |
| 21 |
|
| 22 |
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 |
| 23 |
|
| 24 |
-moduledir = @QT4_PREFIX@/plugins/inputmethods |
| 25 |
+moduledir = @QT4_LIBDIR@/plugins/inputmethods |
| 26 |
module_LTLIBRARIES = im-scim-bridge.la |
| 27 |
|
| 28 |
im_scim_bridge_la_SOURCES = ../im-scim-bridge-qt.cpp \ |
| 29 |
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 |
| 30 |
--- scim-bridge-0.4.15.orig/client-qt/scim-bridge-client-imcontext-qt.cpp 2008-11-02 15:44:46.000000000 +0900 |
| 31 |
+++ scim-bridge-0.4.15/client-qt/scim-bridge-client-imcontext-qt.cpp 2009-01-25 15:04:34.000000000 +0900 |
| 32 |
@@ -219,6 +219,12 @@ |
| 33 |
void ScimBridgeClientIMContextImpl::setFocusWidget (QWidget *widget) |
| 34 |
{ |
| 35 |
scim_bridge_pdebugln (4, "ScimBridgeClientIMContextImpl::setFocusWidget ()"); |
| 36 |
+ |
| 37 |
+ if (focused_imcontext != NULL) { |
| 38 |
+ focused_imcontext->focus_out (); |
| 39 |
+ focused_imcontext = NULL; |
| 40 |
+ } |
| 41 |
+ |
| 42 |
QInputContext::setFocusWidget (widget); |
| 43 |
focus_in (); |
| 44 |
update (); |
| 45 |
@@ -442,8 +448,15 @@ |
| 46 |
} |
| 47 |
} |
| 48 |
|
| 49 |
+#ifdef QT4 |
| 50 |
+ if (preedit_shown) { |
| 51 |
+ set_preedit_shown (false); |
| 52 |
+ update_preedit (); |
| 53 |
+ } |
| 54 |
+#else |
| 55 |
set_preedit_shown (false); |
| 56 |
update_preedit (); |
| 57 |
+#endif |
| 58 |
|
| 59 |
focused_imcontext = NULL; |
| 60 |
} |
| 61 |
diff -Naur scim-bridge-0.4.15.orig/configure.ac scim-bridge-0.4.15/configure.ac |
| 62 |
--- scim-bridge-0.4.15.orig/configure.ac 2009-01-18 02:24:32.000000000 +0900 |
| 63 |
+++ scim-bridge-0.4.15/configure.ac 2009-01-25 14:58:06.000000000 +0900 |
| 64 |
@@ -105,6 +105,10 @@ |
| 65 |
QT4_PREFIX=`$PKG_CONFIG --variable=prefix QtCore` |
| 66 |
fi |
| 67 |
AC_SUBST(QT4_PREFIX) |
| 68 |
+ if test -z "$QT4_LIBDIR"; then |
| 69 |
+ QT4_LIBDIR=`$PKG_CONFIG --variable=libdir QtCore` |
| 70 |
+ fi |
| 71 |
+ AC_SUBST(QT4_LIBDIR) |
| 72 |
enable_qt4_immodule="yes"; |
| 73 |
fi |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
1.1 app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-gcc43.patch |
| 79 |
|
| 80 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-gcc43.patch?rev=1.1&view=markup |
| 81 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-gcc43.patch?rev=1.1&content-type=text/plain |
| 82 |
|
| 83 |
Index: scim-bridge-0.4.15.2-gcc43.patch |
| 84 |
=================================================================== |
| 85 |
--- scim-bridge-0.4.15.orig/client-common/scim-bridge-client-output.c 2008-11-02 15:44:34.000000000 +0900 |
| 86 |
+++ scim-bridge-0.4.15/client-common/scim-bridge-client-output.c 2009-01-25 15:10:22.000000000 +0900 |
| 87 |
@@ -20,6 +20,7 @@ |
| 88 |
#include <stdarg.h> |
| 89 |
#include <stdio.h> |
| 90 |
#include <string.h> |
| 91 |
+#include <alloca.h> |
| 92 |
|
| 93 |
#include "scim-bridge-debug.h" |
| 94 |
#include "scim-bridge-output.h" |
Archives