summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2010-06-23 15:05:56 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2010-06-23 15:05:56 +0000
commit8605acd97d82551c5e3a3592c9030b7f4e301634 (patch)
treeee176fae6425a30c6ebae830572c02f7cdd1b9ee /app-i18n
parentDelete deprecation warning (bug #313465). (diff)
downloadgentoo-2-8605acd97d82551c5e3a3592c9030b7f4e301634.tar.gz
gentoo-2-8605acd97d82551c5e3a3592c9030b7f4e301634.tar.bz2
gentoo-2-8605acd97d82551c5e3a3592c9030b7f4e301634.zip
Fix gcc-4.5 compilation wrt bug #320879 thanks to xarthisius
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n')
-rw-r--r--app-i18n/scim-sayura/ChangeLog9
-rw-r--r--app-i18n/scim-sayura/files/scim-sayura-0.3.3-gcc45.patch15
-rw-r--r--app-i18n/scim-sayura/scim-sayura-0.3.3.ebuild12
3 files changed, 32 insertions, 4 deletions
diff --git a/app-i18n/scim-sayura/ChangeLog b/app-i18n/scim-sayura/ChangeLog
index 09577c99f64e..584ca2acb9ac 100644
--- a/app-i18n/scim-sayura/ChangeLog
+++ b/app-i18n/scim-sayura/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-i18n/scim-sayura
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-sayura/ChangeLog,v 1.1 2009/04/23 13:59:27 matsuu Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-sayura/ChangeLog,v 1.2 2010/06/23 15:05:56 hwoarang Exp $
+
+ 23 Jun 2010; Markos Chandras <hwoarang@gentoo.org>
+ scim-sayura-0.3.3.ebuild, +files/scim-sayura-0.3.3-gcc45.patch:
+ Fix gcc-4.5 compilation wrt bug #320879 thanks to Kacper Kowalik
+ (Xarthisius)
*scim-sayura-0.3.3 (23 Apr 2009)
diff --git a/app-i18n/scim-sayura/files/scim-sayura-0.3.3-gcc45.patch b/app-i18n/scim-sayura/files/scim-sayura-0.3.3-gcc45.patch
new file mode 100644
index 000000000000..64ee87416011
--- /dev/null
+++ b/app-i18n/scim-sayura/files/scim-sayura-0.3.3-gcc45.patch
@@ -0,0 +1,15 @@
+Fixing build with gcc 4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=320879
+
+--- src/scim_sinhala_imengine.cpp
++++ src/scim_sinhala_imengine.cpp
+@@ -233,7 +233,7 @@
+
+ void SinhalaInstance::backspace()
+ {
+- KeyEvent e = scim::KeyEvent::KeyEvent(SCIM_KEY_BackSpace, 0);
++ KeyEvent e = scim::KeyEvent(SCIM_KEY_BackSpace, 0);
+ forward_key_event(e);
+ }
+
diff --git a/app-i18n/scim-sayura/scim-sayura-0.3.3.ebuild b/app-i18n/scim-sayura/scim-sayura-0.3.3.ebuild
index 60be56c5426f..af165b19573b 100644
--- a/app-i18n/scim-sayura/scim-sayura-0.3.3.ebuild
+++ b/app-i18n/scim-sayura/scim-sayura-0.3.3.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-sayura/scim-sayura-0.3.3.ebuild,v 1.1 2009/04/23 13:59:27 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-sayura/scim-sayura-0.3.3.ebuild,v 1.2 2010/06/23 15:05:56 hwoarang Exp $
+
+EAPI="2"
+
+inherit eutils
DESCRIPTION="Sayura Sinhala input method for SCIM"
HOMEPAGE="http://www.sayura.net/im/"
@@ -15,6 +19,10 @@ RDEPEND=">=app-i18n/scim-0.99.8"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
+src_prepare() {
+ epatch "${FILESDIR}"/scim-sayura-0.3.3-gcc45.patch
+}
+
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"