Applied a patch to fix IM switch. Also, uim-0.3.5 requires >=app-i18n/prime-0.8 if you want to use PRIME

4 files changed, 53 insertions, 5 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index dd439ebe1e85..6858324c56cc 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/uim
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.48 2004/05/02 11:47:50 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.49 2004/05/02 12:04:06 usata Exp $
+
+  02 May 2004; Mamoru KOMACHI <usata@gentoo.org> uim-0.3.5.ebuild:
+  Applied a patch to fix IM switch. Also, uim-0.3.5 requires
+  >=app-i18n/prime-0.8
 
 *uim-0.3.5 (02 May 2004)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 8c58243ec9ff..bb2dc4253aa4 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,9 +1,10 @@
-MD5 70a23bc8ffe4f3831025ed169e140185 uim-0.3.5.ebuild 1641
+MD5 f4ef001601ac72fb8929e6de4b13f88d uim-0.3.5.ebuild 1685
 MD5 8daba43fc64c91042bc4c83641edc2e6 uim-0.3.4.2.ebuild 1643
-MD5 8c1e3c59ce7c339fc17a228fc0af6648 ChangeLog 8234
+MD5 4ff9ae71eb18226bf50ef342dff744dc ChangeLog 8386
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
 MD5 b49f2b50980bbbe2a8519b71fe2854f0 uim-0.3.3.ebuild 1634
 MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
 MD5 2075e0c1a7b629610ecb0bfd05774818 files/digest-uim-0.3.5 61
 MD5 b9c8399a56165f6cfe164b17a273ea2a files/digest-uim-0.3.4.2 63
 MD5 d68e6315a5110d5a8f8ebef008f9c65e files/digest-uim-0.3.3 61
+MD5 e53fdb6e599710ae793d79ab67b1435a files/uim-0.3.5-engines.diff 947
diff --git a/app-i18n/uim/files/uim-0.3.5-engines.diff b/app-i18n/uim/files/uim-0.3.5-engines.diff
new file mode 100644
index 000000000000..293d6004068b
--- /dev/null
+++ b/app-i18n/uim/files/uim-0.3.5-engines.diff
@@ -0,0 +1,42 @@
+--- uim-0.3.5.orig/uim/uim.c	2004-04-24 12:17:28.000000000 +0900
++++ uim-0.3.5/uim/uim.c	2004-05-02 16:34:30.000000000 +0900
+@@ -579,6 +579,11 @@
+ uim_quit(void)
+ {
+   int i;
++
++  if (!uim_initialized) {
++    return;
++  }
++
+   /* release still active contexts */
+   for (i = 0; i < CONTEXT_ARRAY_SIZE; i++) {
+     if (context_array[i]) {
+--- uim-0.3.5.orig/uim/canna.c	2004-04-18 12:15:01.000000000 +0900
++++ uim-0.3.5/uim/canna.c	2004-05-02 16:35:27.000000000 +0900
+@@ -474,16 +474,22 @@
+ void
+ uim_quit_canna(void)
+ {
+-  if(cannaserver != NULL)
++  if(cannaserver != NULL) {
+      free(cannaserver);
++     cannaserver = NULL;
++  }
+ 
+   if(api.RkFinalize)
+      api.RkFinalize();
+ 
+-  if(api.lib)
++  if(api.lib) {
+      dlclose(api.lib);
++     memset(&api, 0, sizeof(struct canna_api));
++  }
+ 
+-  if(context_array != NULL)
++  if(context_array != NULL) {
+      free(context_array);
++     context_array = NULL;
++  }
+ }
+ #endif /* HAVE_CANNA_RK_H */
diff --git a/app-i18n/uim/uim-0.3.5.ebuild b/app-i18n/uim/uim-0.3.5.ebuild
index 48ffc8094763..6313f504ef60 100644
--- a/app-i18n/uim/uim-0.3.5.ebuild
+++ b/app-i18n/uim/uim-0.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.5.ebuild,v 1.1 2004/05/02 11:47:50 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.5.ebuild,v 1.2 2004/05/02 12:04:06 usata Exp $
 
 inherit eutils flag-o-matic
 
@@ -25,6 +25,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-gtk-query-immodules-gentoo.diff
+	epatch ${FILESDIR}/${P}-engines.diff
 }
 
 src_compile() {
@@ -51,7 +52,7 @@ pkg_postinst() {
 	einfo
 	einfo "To use uim-anthy you should emerge app-i18n/anthy or app-i18n/anthy-ss."
 	einfo "To use uim-skk you should emerge app-i18n/skk-jisyo (uim doesn't support skkserv)."
-	einfo "To use uim-prime you should emerge app-i18n/prime."
+	einfo "To use uim-prime you should emerge >=app-i18n/prime-0.8."
 	einfo
 
 	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules