summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaohiro Aota <naota@gentoo.org>2011-08-28 15:55:55 +0000
committerNaohiro Aota <naota@gentoo.org>2011-08-28 15:55:55 +0000
commitf6d4be6763bed97da026fc4a57b9325c124c61fa (patch)
treed7e10117e81dba3a10c55df6f45ca2ebb46d8b3a /app-i18n/uim
parentalpha/ia64/m68k/s390/sh/sparc stable wrt #376881 (diff)
downloadgentoo-2-f6d4be6763bed97da026fc4a57b9325c124c61fa.tar.gz
gentoo-2-f6d4be6763bed97da026fc4a57b9325c124c61fa.tar.bz2
gentoo-2-f6d4be6763bed97da026fc4a57b9325c124c61fa.zip
Add a patch to deal with canna character API change. bug #353949
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n/uim')
-rw-r--r--app-i18n/uim/ChangeLog6
-rw-r--r--app-i18n/uim/files/uim-1.6.1-canna.patch10
-rw-r--r--app-i18n/uim/uim-1.6.1.ebuild5
-rw-r--r--app-i18n/uim/uim-1.7.0.ebuild5
4 files changed, 21 insertions, 5 deletions
diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 4333dfcb4fdc..8e88a68e5cbc 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-i18n/uim
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.233 2011/07/29 00:26:53 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.234 2011/08/28 15:55:55 naota Exp $
+
+ 28 Aug 2011; Naohiro Aota <naota@gentoo.org> uim-1.6.1.ebuild,
+ +files/uim-1.6.1-canna.patch, uim-1.7.0.ebuild:
+ Add a patch to deal with canna character API change. bug #353949
*uim-1.7.1 (29 Jul 2011)
diff --git a/app-i18n/uim/files/uim-1.6.1-canna.patch b/app-i18n/uim/files/uim-1.6.1-canna.patch
new file mode 100644
index 000000000000..276c2aad502a
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.6.1-canna.patch
@@ -0,0 +1,10 @@
+--- helper/dict-canna.c
++++ helper/dict-canna.c
+@@ -37,6 +37,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+
++#define CANNA_NEW_WCHAR_AWARE
+ #include <canna/RK.h>
+
+ #include <stdlib.h>
diff --git a/app-i18n/uim/uim-1.6.1.ebuild b/app-i18n/uim/uim-1.6.1.ebuild
index e9126b9136fe..65144cf3c903 100644
--- a/app-i18n/uim/uim-1.6.1.ebuild
+++ b/app-i18n/uim/uim-1.6.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.6.1.ebuild,v 1.3 2011/02/13 19:11:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.6.1.ebuild,v 1.4 2011/08/28 15:55:55 naota Exp $
EAPI="3"
inherit autotools eutils multilib elisp-common flag-o-matic
@@ -96,7 +96,8 @@ src_prepare() {
"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
"${FILESDIR}"/${PN}-1.6.0-linker.patch \
- "${FILESDIR}"/${PN}-1.6.1-libnotify-0.7.patch
+ "${FILESDIR}"/${PN}-1.6.1-libnotify-0.7.patch \
+ "${FILESDIR}"/${PN}-1.6.1-canna.patch
# bug 275420
sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
diff --git a/app-i18n/uim/uim-1.7.0.ebuild b/app-i18n/uim/uim-1.7.0.ebuild
index 4af289fe6c34..90a697356a99 100644
--- a/app-i18n/uim/uim-1.7.0.ebuild
+++ b/app-i18n/uim/uim-1.7.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.0.ebuild,v 1.1 2011/05/23 17:28:21 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.0.ebuild,v 1.2 2011/08/28 15:55:55 naota Exp $
EAPI="3"
inherit autotools eutils multilib elisp-common flag-o-matic
@@ -111,7 +111,8 @@ update_gtk3_immodules() {
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
- "${FILESDIR}"/${PN}-1.5.4-zhTW.patch
+ "${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
+ "${FILESDIR}"/${PN}-1.6.1-canna.patch
# bug 275420
sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die