summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaohiro Aota <naota@gentoo.org>2011-10-22 01:30:14 +0000
committerNaohiro Aota <naota@gentoo.org>2011-10-22 01:30:14 +0000
commitdf6fab6853cfe88f70f49d50c7e6a9c932c1417d (patch)
tree0a9c37dc9be2c5d3e025fbb4d9f225722ab9df19 /app-i18n/freewnn
parentRemove nox11 argument from pam_ck_connector.so wrt #342345 (diff)
downloadgentoo-2-df6fab6853cfe88f70f49d50c7e6a9c932c1417d.tar.gz
gentoo-2-df6fab6853cfe88f70f49d50c7e6a9c932c1417d.tar.bz2
gentoo-2-df6fab6853cfe88f70f49d50c7e6a9c932c1417d.zip
Add patch to deal with gcc4.5 cpp. Bug #318593
(Portage version: 2.2.0_alpha67/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n/freewnn')
-rw-r--r--app-i18n/freewnn/ChangeLog8
-rw-r--r--app-i18n/freewnn/files/freewnn-1.1.1_alpha21-gcc45.patch13
-rw-r--r--app-i18n/freewnn/freewnn-1.1.1_alpha21-r1.ebuild7
3 files changed, 24 insertions, 4 deletions
diff --git a/app-i18n/freewnn/ChangeLog b/app-i18n/freewnn/ChangeLog
index ae54cc6943bd..d02f2f233a5f 100644
--- a/app-i18n/freewnn/ChangeLog
+++ b/app-i18n/freewnn/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-i18n/freewnn
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/ChangeLog,v 1.43 2010/05/21 21:02:30 pacho Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/ChangeLog,v 1.44 2011/10/22 01:30:14 naota Exp $
+
+ 22 Oct 2011; Naohiro Aota <naota@gentoo.org> freewnn-1.1.1_alpha21-r1.ebuild,
+ +files/freewnn-1.1.1_alpha21-gcc45.patch:
+ Add patch to deal with gcc4.5 cpp
21 May 2010; Pacho Ramos <pacho@gentoo.org>
freewnn-1.1.1_alpha21-r1.ebuild:
diff --git a/app-i18n/freewnn/files/freewnn-1.1.1_alpha21-gcc45.patch b/app-i18n/freewnn/files/freewnn-1.1.1_alpha21-gcc45.patch
new file mode 100644
index 000000000000..d46c91d80ae0
--- /dev/null
+++ b/app-i18n/freewnn/files/freewnn-1.1.1_alpha21-gcc45.patch
@@ -0,0 +1,13 @@
+diff --git a/Wnn/pubdicplus/Makefile.in b/Wnn/pubdicplus/Makefile.in
+index 41c868d..e9ffc28 100644
+--- a/Wnn/pubdicplus/Makefile.in
++++ b/Wnn/pubdicplus/Makefile.in
+@@ -422,7 +422,7 @@ fzk.master-.c: fzk.master
+ $(LN) $? $@
+
+ std.fzk: fzk.master-.c $(FZK_SRC)
+- $(CPP) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
++ $(CPP) -P $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
+
+ full.fzk: $(FZK_SRC)
+ $(MAKE) FZK_FLAG=-DKANSAI std.fzk
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha21-r1.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha21-r1.ebuild
index 8675cb82d061..6f38d02d9010 100644
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha21-r1.ebuild
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha21-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/freewnn-1.1.1_alpha21-r1.ebuild,v 1.8 2010/05/21 21:02:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/freewnn-1.1.1_alpha21-r1.ebuild,v 1.9 2011/10/22 01:30:14 naota Exp $
inherit eutils
@@ -31,6 +31,9 @@ src_unpack() {
-e "s/@INSTPGMFLAGS@//" makerule.mk.in || die
# bug #298744
epatch "${FILESDIR}/${P}-as-needed.patch"
+
+ #bug #318593
+ epatch "${FILESDIR}"/${P}-gcc45.patch
}
src_compile() {