diff options
author | Matsuu Takuto <matsuu@gentoo.org> | 2008-12-09 17:46:04 +0000 |
---|---|---|
committer | Matsuu Takuto <matsuu@gentoo.org> | 2008-12-09 17:46:04 +0000 |
commit | afa35e9c488136be86e2f272f844e5e6bcc7c468 (patch) | |
tree | 41cfadc3f85132bb9f4ebd996db90c76cfa8b0ed /app-i18n | |
parent | removed old version (diff) | |
download | gentoo-2-afa35e9c488136be86e2f272f844e5e6bcc7c468.tar.gz gentoo-2-afa35e9c488136be86e2f272f844e5e6bcc7c468.tar.bz2 gentoo-2-afa35e9c488136be86e2f272f844e5e6bcc7c468.zip |
Added LINGUAS="zh_TW". Fixed gcc-4.3 issue, bug #216759.
(Portage version: 2.1.6_rc2/cvs/Linux 2.6.27-gentoo-r4 x86_64)
Diffstat (limited to 'app-i18n')
-rw-r--r-- | app-i18n/uim/ChangeLog | 9 | ||||
-rw-r--r-- | app-i18n/uim/files/uim-1.5.4-gcc43.patch | 11 | ||||
-rw-r--r-- | app-i18n/uim/files/uim-1.5.4-zhTW.patch | 12 | ||||
-rw-r--r-- | app-i18n/uim/uim-1.5.4-r2.ebuild | 214 |
4 files changed, 245 insertions, 1 deletions
diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog index c2f15761e0f9..01f52d3e89f5 100644 --- a/app-i18n/uim/ChangeLog +++ b/app-i18n/uim/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-i18n/uim # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.188 2008/10/29 17:00:51 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.189 2008/12/09 17:46:04 matsuu Exp $ + +*uim-1.5.4-r2 (09 Dec 2008) + + 09 Dec 2008; MATSUU Takuto <matsuu@gentoo.org> + +files/uim-1.5.4-gcc43.patch, +files/uim-1.5.4-zhTW.patch, + +uim-1.5.4-r2.ebuild: + Added LINGUAS="zh_TW". Fixed gcc-4.3 issue, bug #216759. *uim-1.5.4-r1 (29 Oct 2008) diff --git a/app-i18n/uim/files/uim-1.5.4-gcc43.patch b/app-i18n/uim/files/uim-1.5.4-gcc43.patch new file mode 100644 index 000000000000..60a42ca3f1bf --- /dev/null +++ b/app-i18n/uim/files/uim-1.5.4-gcc43.patch @@ -0,0 +1,11 @@ +diff -ur uim-1.5.4.orig/sigscheme/src/read.c uim-1.5.4/sigscheme/src/read.c +--- uim-1.5.4.orig/sigscheme/src/read.c 2008-03-01 23:30:43.000000000 +0900 ++++ uim-1.5.4/sigscheme/src/read.c 2008-12-10 02:09:21.000000000 +0900 +@@ -918,6 +918,7 @@ + int err; + ScmLBuf(char) lbuf; + char init_buf[SCM_INITIAL_SYMBOL_BUF_SIZE]; ++ init_buf[0] = '\0'; + + CDBG((SCM_DBG_PARSER, "read_symbol")); + diff --git a/app-i18n/uim/files/uim-1.5.4-zhTW.patch b/app-i18n/uim/files/uim-1.5.4-zhTW.patch new file mode 100644 index 000000000000..3836a210caa8 --- /dev/null +++ b/app-i18n/uim/files/uim-1.5.4-zhTW.patch @@ -0,0 +1,12 @@ +diff -Naur uim-1.5.4.orig/xim/convdisp.cpp uim-1.5.4/xim/convdisp.cpp +--- uim-1.5.4.orig/xim/convdisp.cpp 2008-02-13 23:43:42.000000000 +0900 ++++ uim-1.5.4/xim/convdisp.cpp 2008-12-10 02:04:35.000000000 +0900 +@@ -69,7 +69,7 @@ + #endif + + const char *fontset_zhCN = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0"; +-const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0"; ++const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -eten-fixed-medium-r-normal--16-150-75-75-c-160-big5.eten-0"; + const char *fontset_ja = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -jis-fixed-medium-r-normal--16-*-75-75-c-160-jisx0208.1983-0, -sony-fixed-medium-r-normal--16-*-*-*-c-80-jisx0201.1976-0"; + const char *fontset_ko = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0"; + diff --git a/app-i18n/uim/uim-1.5.4-r2.ebuild b/app-i18n/uim/uim-1.5.4-r2.ebuild new file mode 100644 index 000000000000..87d76b4b2d82 --- /dev/null +++ b/app-i18n/uim/uim-1.5.4-r2.ebuild @@ -0,0 +1,214 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.4-r2.ebuild,v 1.1 2008/12/09 17:46:04 matsuu Exp $ + +EAPI=2 +inherit autotools eutils qt3 multilib elisp-common flag-o-matic + +DESCRIPTION="Simple, secure and flexible input method library" +HOMEPAGE="http://code.google.com/p/uim/" +SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2" + +LICENSE="BSD GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="+anthy canna eb emacs gnome gtk kde libedit libnotify m17n-lib ncurses nls prime qt3 qt4 truetype unicode X linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko" + +RDEPEND="X? ( + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXt + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXrender + ) + anthy? ( + unicode? ( >=app-i18n/anthy-8622 ) + !unicode? ( app-i18n/anthy ) + ) + canna? ( app-i18n/canna ) + eb? ( dev-libs/eb ) + emacs? ( virtual/emacs ) + gnome? ( >=gnome-base/gnome-panel-2.14 ) + gtk? ( >=x11-libs/gtk+-2.4 ) + kde? ( kde-base/kdelibs:3.5 ) + libedit? ( dev-libs/libedit ) + libnotify? ( >=x11-libs/libnotify-0.4 ) + m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) + ncurses? ( sys-libs/ncurses ) + nls? ( virtual/libintl ) + prime? ( app-i18n/prime ) + qt3? ( || ( >=x11-libs/qt-3.2.0:3[immqt-bc] >=x11-libs/qt-3.2.0:3[immqt] ) ) + qt4? ( || ( x11-libs/qt-core:4 =x11-libs/qt-4.3*:4 ) ) + !app-i18n/uim-svn + !<app-i18n/prime-0.9.4" +# mana? ( app-i18n/mana ) +# scim? ( >=app-i18n/scim-1.3.0 ) # broken +# sj3? ( >=app-i18n/sj3-2.0.1.21 ) +# wnn? ( app-i18n/wnn ) + +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=sys-devel/gettext-0.15 + X? ( + x11-proto/xextproto + x11-proto/xproto + )" + +RDEPEND="${RDEPEND} + X? ( + media-fonts/font-sony-misc + linguas_zh_CN? ( + || ( media-fonts/font-isas-misc media-fonts/intlfonts ) + ) + linguas_zh_TW? ( + media-fonts/intlfonts + ) + linguas_ja? ( + || ( media-fonts/font-jis-misc media-fonts/intlfonts ) + ) + linguas_ko? ( + || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) + ) + )" + +SITEFILE=50${PN}-gentoo.el + +pkg_setup() { + # An arch specific config directory is used on multilib systems + has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" + GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/} +} + +src_prepare() { + epatch "${FILESDIR}/${P}-gentoo.patch" + epatch "${FILESDIR}/${P}-gcc43.patch" + epatch "${FILESDIR}/${P}-zhTW.patch" + # Stolen from enlightenment.eclass + cp $(type -p gettextize) "${T}/" || die + sed -i -e '/read dummy/d' "${T}/gettextize" || die + ( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed" + intltoolize -f || die + elibtoolize +} + +src_configure() { + local myconf + + if use gtk && (use anthy || use canna) ; then + myconf="${myconf} --enable-dict" + else + myconf="${myconf} --disable-dict" + fi + + if use qt3 ; then + append-flags -DQT_THREAD_SUPPORT + fi + + if use gtk || use qt3 ; then + myconf="${myconf} --enable-pref" + else + myconf="${myconf} --disable-pref" + fi + + if use anthy ; then + if use unicode ; then + myconf="${myconf} --with-anthy-utf8" + else + myconf="${myconf} --with-anthy" + fi + else + myconf="${myconf} --without-anthy" + fi + + if use qt3 ; then + myconf="${myconf} --with-qt" + else + myconf="${myconf} --without-qt" + fi + + if use qt3 && use kde ; then + myconf="${myconf} --enable-notify=knotify3" + elif use libnotify ; then + myconf="${myconf} --enable-notify=libnotify" + fi + + econf $(use_with X x) \ + $(use_with canna) \ + $(use_with eb) \ + $(use_enable emacs) \ + $(use_with emacs lispdir "${SITELISP}") \ + $(use_enable gnome gnome-applet) \ + $(use_with gtk gtk2) \ + $(use_with libedit) \ + $(use_enable kde kde-applet) \ + $(use_with m17n-lib m17nlib) \ + $(use_enable ncurses fep) \ + $(use_enable nls) \ + $(use_with prime) \ + $(use_with qt3 qt-immodule) \ + $(use_with qt4 qt4-immodule) \ + $(use_with truetype xft) \ + ${myconf} || die "econf failed" +} + +src_compile() { + emake || die "emake failed" + + if use emacs; then + cd emacs + elisp-compile *.el || die "elisp-compile failed" + fi +} + +src_install() { + # parallel make install borks, bug #222677 + emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed" + + dodoc AUTHORS ChangeLog* NEWS README RELNOTE + if use emacs; then + elisp-install uim-el emacs/*.elc || die "elisp-install failed" + elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \ + || die "elisp-site-file-install failed" + fi +} + +pkg_postinst() { + elog + elog "To use uim-skk you should emerge app-i18n/skk-jisyo." + elog + + elog + elog "New input method switcher has been introduced. You need to set" + elog + elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE" + elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE" + elog "% XMODIFIERS=@im=uim ; export XMODIFIERS" + elog + elog "If you would like to use uim-anthy as default input method, put" + elog "(define default-im-name 'anthy)" + elog "to your ~/.uim." + elog + elog "All input methods can be found by running uim-im-switcher-gtk" + elog "or uim-im-switcher-qt." + elog + elog "If you upgrade from a version of uim older than 1.4.0," + elog "you should run revdep-rebuild." + + use gtk && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules" + if use emacs; then + elisp-site-regen + echo + elog "uim is autoloaded with Emacs with a minimal set of features:" + elog "There is no keybinding defined to call it directly, so please" + elog "create one yourself and choose an input method." + elog "Integration with LEIM is not done with this ebuild, please have" + elog "a look at the documentation how to achieve this." + fi +} + +pkg_postrm() { + use gtk && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules" + use emacs && elisp-site-regen +} |