diff options
author | Mamoru Komachi <usata@gentoo.org> | 2004-05-05 17:49:44 +0000 |
---|---|---|
committer | Mamoru Komachi <usata@gentoo.org> | 2004-05-05 17:49:44 +0000 |
commit | 0895e1623c8e820b8eda2400e2c2846c629f8da9 (patch) | |
tree | 752f5ad12cd8c7c611871b33b644a926fa70715c /app-i18n/uim | |
parent | libassuand dependency fixed. (Manifest recommit) (diff) | |
download | gentoo-2-0895e1623c8e820b8eda2400e2c2846c629f8da9.tar.gz gentoo-2-0895e1623c8e820b8eda2400e2c2846c629f8da9.tar.bz2 gentoo-2-0895e1623c8e820b8eda2400e2c2846c629f8da9.zip |
Version bumped. Removed unstable 0.3.5 from CVS
Diffstat (limited to 'app-i18n/uim')
-rw-r--r-- | app-i18n/uim/ChangeLog | 8 | ||||
-rw-r--r-- | app-i18n/uim/Manifest | 2 | ||||
-rw-r--r-- | app-i18n/uim/files/digest-uim-0.3.5 | 1 | ||||
-rw-r--r-- | app-i18n/uim/files/digest-uim-0.3.6 | 1 | ||||
-rw-r--r-- | app-i18n/uim/files/uim-0.3.5-engines.diff | 42 | ||||
-rw-r--r-- | app-i18n/uim/uim-0.3.6.ebuild (renamed from app-i18n/uim/uim-0.3.5.ebuild) | 18 |
6 files changed, 15 insertions, 57 deletions
diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog index 6858324c56cc..cc77e6edb868 100644 --- a/app-i18n/uim/ChangeLog +++ b/app-i18n/uim/ChangeLog @@ -1,6 +1,12 @@ # 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.49 2004/05/02 12:04:06 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.50 2004/05/05 17:49:44 usata Exp $ + +*uim-0.3.6 (06 May 2004) + + 06 May 2004; Mamoru KOMACHI <usata@gentoo.org> uim-0.3.5.ebuild, + uim-0.3.6.ebuild, files/uim-0.3.5-engines.diff: + Version bumped. Removed unstable 0.3.5 from CVS 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 diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest index bb2dc4253aa4..fddb822d4e5c 100644 --- a/app-i18n/uim/Manifest +++ b/app-i18n/uim/Manifest @@ -2,8 +2,10 @@ MD5 f4ef001601ac72fb8929e6de4b13f88d uim-0.3.5.ebuild 1685 MD5 8daba43fc64c91042bc4c83641edc2e6 uim-0.3.4.2.ebuild 1643 MD5 4ff9ae71eb18226bf50ef342dff744dc ChangeLog 8386 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642 +MD5 f4ef001601ac72fb8929e6de4b13f88d uim-0.3.6.ebuild 1685 MD5 b49f2b50980bbbe2a8519b71fe2854f0 uim-0.3.3.ebuild 1634 MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552 +MD5 61774220fdc56646570cfd34624dfda2 files/digest-uim-0.3.6 61 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 diff --git a/app-i18n/uim/files/digest-uim-0.3.5 b/app-i18n/uim/files/digest-uim-0.3.5 deleted file mode 100644 index 5f2ffd4fae7c..000000000000 --- a/app-i18n/uim/files/digest-uim-0.3.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 b00846dc7915a60bf982233e9dd5f02d uim-0.3.5.tar.gz 835781 diff --git a/app-i18n/uim/files/digest-uim-0.3.6 b/app-i18n/uim/files/digest-uim-0.3.6 new file mode 100644 index 000000000000..786399b9a5d1 --- /dev/null +++ b/app-i18n/uim/files/digest-uim-0.3.6 @@ -0,0 +1 @@ +MD5 cbba7f3a19ced8fbdf1cbbe8c4890cfe uim-0.3.6.tar.gz 845243 diff --git a/app-i18n/uim/files/uim-0.3.5-engines.diff b/app-i18n/uim/files/uim-0.3.5-engines.diff deleted file mode 100644 index 293d6004068b..000000000000 --- a/app-i18n/uim/files/uim-0.3.5-engines.diff +++ /dev/null @@ -1,42 +0,0 @@ ---- 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.6.ebuild index 6313f504ef60..4522cbfec055 100644 --- a/app-i18n/uim/uim-0.3.5.ebuild +++ b/app-i18n/uim/uim-0.3.6.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.2 2004/05/02 12:04:06 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.6.ebuild,v 1.1 2004/05/05 17:49:44 usata Exp $ inherit eutils flag-o-matic @@ -25,26 +25,18 @@ src_unpack() { unpack ${A} cd ${S} epatch ${FILESDIR}/${PN}-gtk-query-immodules-gentoo.diff - epatch ${FILESDIR}/${P}-engines.diff } src_compile() { - if use gtk ; then - sed -i -e "s:@GTK2_TRUE@::g" -e "s:@GTK2_FALSE@:#:g" \ - Makefile.in `echo */Makefile.in` - else - sed -i -e "s:@GTK2_TRUE@:#:g" -e "s:@GTK2_FALSE@::g" \ - Makefile.in `echo */Makefile.in` - sed -i -e "/^SUBDIRS/s/gtk//" Makefile.in - fi use debug && append-flags -g - econf `use_enable nls` || die - emake || die + econf `use_enable nls` \ + `use_with gtk gtk2` || die "econf failed" + emake || die "emake failed" } src_install() { - make DESTDIR=${D} install || die + make DESTDIR=${D} install || die "make install failed" dodoc AUTHORS ChangeLog INSTALL* NEWS README* } |