diff options
author | Matsuu Takuto <matsuu@gentoo.org> | 2008-11-16 17:00:10 +0000 |
---|---|---|
committer | Matsuu Takuto <matsuu@gentoo.org> | 2008-11-16 17:00:10 +0000 |
commit | 2155a4c3eb3284b8ac9d6a722a066c41a76acb01 (patch) | |
tree | 8f4cc2d53e1a0f0d37d483d0087097fa0433fa6b /app-i18n | |
parent | Removed old versions. (diff) | |
download | historical-2155a4c3eb3284b8ac9d6a722a066c41a76acb01.tar.gz historical-2155a4c3eb3284b8ac9d6a722a066c41a76acb01.tar.bz2 historical-2155a4c3eb3284b8ac9d6a722a066c41a76acb01.zip |
Fixed scim-launcher segfaults issue, bug #216127. Fixed -gtk USE flag issue, bug #191696. Moved sys-devel/libtool from RDEPEND to DEPEND.
Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo x86_64
Diffstat (limited to 'app-i18n')
-rw-r--r-- | app-i18n/scim/ChangeLog | 10 | ||||
-rw-r--r-- | app-i18n/scim/files/bug-248159_remove_unload.patch | 17 | ||||
-rw-r--r-- | app-i18n/scim/scim-1.4.7-r2.ebuild | 113 |
3 files changed, 139 insertions, 1 deletions
diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog index d6bdf5ddde71..cb26514ebffc 100644 --- a/app-i18n/scim/ChangeLog +++ b/app-i18n/scim/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-i18n/scim # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.122 2008/08/10 16:16:52 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.123 2008/11/16 17:00:10 matsuu Exp $ + +*scim-1.4.7-r2 (16 Nov 2008) + + 16 Nov 2008; MATSUU Takuto <matsuu@gentoo.org> + +files/bug-248159_remove_unload.patch, +scim-1.4.7-r2.ebuild: + Fixed scim-launcher segfaults issue, bug #216127. + Fixed -gtk USE flag issue, bug #191696. + Moved sys-devel/libtool from RDEPEND to DEPEND. 10 Aug 2008; MATSUU Takuto <matsuu@gentoo.org> scim-1.4.5-r1.ebuild, -scim-1.4.6.ebuild, -scim-1.4.7.ebuild, scim-1.4.7-r1.ebuild: diff --git a/app-i18n/scim/files/bug-248159_remove_unload.patch b/app-i18n/scim/files/bug-248159_remove_unload.patch new file mode 100644 index 000000000000..35aa13bdf650 --- /dev/null +++ b/app-i18n/scim/files/bug-248159_remove_unload.patch @@ -0,0 +1,17 @@ +Index: scim-1.4.5/src/scim_frontend_module.cpp +=================================================================== +--- scim-1.4.5.orig/src/scim_frontend_module.cpp ++++ scim-1.4.5/src/scim_frontend_module.cpp +@@ -69,7 +69,11 @@ FrontEndModule::load (const String &name + + m_frontend_init (backend, config, argc, argv); + } catch (...) { +- m_module.unload (); ++ /* ++ The thrown exception is in x11.so. Unload it, will cause the ++ destructor of exception failed. ++ m_module.unload (); ++ */ + m_frontend_init = 0; + m_frontend_run = 0; + return false; diff --git a/app-i18n/scim/scim-1.4.7-r2.ebuild b/app-i18n/scim/scim-1.4.7-r2.ebuild new file mode 100644 index 000000000000..49df27b0df6d --- /dev/null +++ b/app-i18n/scim/scim-1.4.7-r2.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.7-r2.ebuild,v 1.1 2008/11/16 17:00:10 matsuu Exp $ + +inherit eutils flag-o-matic autotools + +DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform" +HOMEPAGE="http://www.scim-im.org/" +SRC_URI="mirror://sourceforge/scim/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="doc" + +RDEPEND="x11-libs/libX11 + >=x11-libs/gtk+-2 + >=dev-libs/atk-1 + >=x11-libs/pango-1 + >=dev-libs/glib-2 + !app-i18n/scim-cvs" +DEPEND="${RDEPEND} + x11-libs/libXt + doc? ( app-doc/doxygen + >=app-text/docbook-xsl-stylesheets-1.73.1 ) + dev-lang/perl + dev-util/pkgconfig + >=dev-util/intltool-0.33 + sys-devel/libtool" + +get_gtk_confdir() { + if use amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && use x86 ) ; then + echo "/etc/gtk-2.0/${CHOST}" + else + echo "/etc/gtk-2.0" + fi +} + +src_unpack() { + unpack ${A} + + cd "${S}" + + epatch "${FILESDIR}/${P}-syslibltdl.patch" + # bug #216127 + epatch "${FILESDIR}/bug-248159_remove_unload.patch" + rm "${S}"/src/ltdl.{cpp,h} + eautoreconf +} + +src_compile() { + local myconf + # bug #83625 + filter-flags -fvisibility-inlines-hidden + filter-flags -fvisibility=hidden + + # bug #191696 + ## We cannot use "use_enable" + #if ! use gtk ; then + # myconf="${myconf} --disable-panel-gtk" + # myconf="${myconf} --disable-setup-ui" + # myconf="${myconf} --disable-gtk2-immodule" + #fi + + econf \ + $(use_with doc doxygen) \ + --enable-ld-version-script \ + ${myconf} || die + emake || die +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc README AUTHORS ChangeLog docs/developers docs/scim.cfg + use doc && dohtml -r docs/html/* +} + +pkg_postinst() { + elog + elog "To use SCIM with both GTK2 and XIM, you should use the following" + elog "in your user startup scripts such as .gnomerc or .xinitrc:" + elog + elog "LANG='your_language' scim -d" + elog "export XMODIFIERS=@im=SCIM" + elog "export GTK_IM_MODULE=\"scim\"" + elog "export QT_IM_MODULE=\"scim\"" + elog + elog "where 'your_language' can be zh_CN, zh_TW, ja_JP.eucJP or any other" + elog "UTF-8 locale such as en_US.UTF-8 or ja_JP.UTF-8" + elog + elog "If you prefer KDE/Qt interface, try emerge app-i18n/skim." + elog + elog "To use Chinese input methods:" + elog " # emerge app-i18n/scim-tables app-i18n/scim-pinyin" + elog "To use Korean input methods:" + elog " # emerge app-i18n/scim-hangul" + elog "To use Japanese input methods:" + elog " # emerge app-i18n/scim-anthy" + elog "To use various input methods (more than 30 languages):" + elog " # emerge app-i18n/scim-m17n" + elog + ewarn + ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules." + ewarn + epause 10 + + [ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules" +} + +pkg_postrm() { + + [ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules" +} |