Fixed gcc-4.3 issue, bug #239621.

(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo x86_64)

3 files changed, 60 insertions, 1 deletions

diff --git a/app-i18n/scim-uim/ChangeLog b/app-i18n/scim-uim/ChangeLog
index 27d5715e49e7..cd6971f3687a 100644
--- a/app-i18n/scim-uim/ChangeLog
+++ b/app-i18n/scim-uim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/scim-uim
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-uim/ChangeLog,v 1.28 2008/06/10 16:59:12 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-uim/ChangeLog,v 1.29 2008/11/16 17:26:20 matsuu Exp $
+
+*scim-uim-0.2.0-r1 (16 Nov 2008)
+
+  16 Nov 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/scim-uim-0.2.0-gcc43.patch, +scim-uim-0.2.0-r1.ebuild:
+  Fixed gcc-4.3 issue, bug #239621.
 
   11 Jun 2008; MATSUU Takuto <matsuu@gentoo.org> -scim-uim-0.1.3.ebuild,
   -scim-uim-0.1.4.ebuild, scim-uim-0.2.0.ebuild:
diff --git a/app-i18n/scim-uim/files/scim-uim-0.2.0-gcc43.patch b/app-i18n/scim-uim/files/scim-uim-0.2.0-gcc43.patch
new file mode 100644
index 000000000000..a956dd29e56b
--- /dev/null
+++ b/app-i18n/scim-uim/files/scim-uim-0.2.0-gcc43.patch
@@ -0,0 +1,11 @@
+diff -Naur scim-uim-0.2.0.orig/src/scim_uim_imengine.cpp scim-uim-0.2.0/src/scim_uim_imengine.cpp
+--- scim-uim-0.2.0.orig/src/scim_uim_imengine.cpp	2007-04-10 14:43:59.000000000 +0900
++++ scim-uim-0.2.0/src/scim_uim_imengine.cpp	2008-11-02 19:00:55.000000000 +0900
+@@ -32,6 +32,7 @@
+   #include <config.h>
+ #endif
+ 
++#include <cstring>
+ #include <scim.h>
+ #include "scim_uim_imengine.h"
+ #include <uim/uim-compat-scm.h>
diff --git a/app-i18n/scim-uim/scim-uim-0.2.0-r1.ebuild b/app-i18n/scim-uim/scim-uim-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..8f8c9e8de3f2
--- /dev/null
+++ b/app-i18n/scim-uim/scim-uim-0.2.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-uim/scim-uim-0.2.0-r1.ebuild,v 1.1 2008/11/16 17:26:20 matsuu Exp $
+
+inherit eutils
+
+DESCRIPTION="scim-uim is an input module for Smart Common Input Method (SCIM) which uses uim as backend"
+HOMEPAGE="http://www.scim-im.org/"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/uim-1.1.0
+	<app-i18n/uim-1.5
+	>=app-i18n/scim-1.4.0"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog README THANKS
+}
+
+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
+}