Add patch to deal with gcc4.5 cpp. Bug #318593

Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64

diff --git a/app-i18n/freewnn/ChangeLog b/app-i18n/freewnn/ChangeLog
index ae54cc6943bd51ecd61aad76fb204d616ee44dce..d02f2f233a5f9648cde0d888f5586ef4e01171ab 100644 (file)
--- 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/Manifest b/app-i18n/freewnn/Manifest
index ff7a0d92f247319a456aabc7c9155dd3415bc3ac..53e2cb26c74e82cbd7bef6186c6424249ca2d810 100644 (file)
--- a/app-i18n/freewnn/Manifest
+++ b/app-i18n/freewnn/Manifest
@@ -8,19 +8,20 @@ AUX a017/FreeWnn-sighandler.patch 876 RMD160 3ab8a693024ebfe7732861dac42fec21e15
 AUX a017/FreeWnn-uum.patch 1983 RMD160 27b637f072ddf9b9d46067d0cad739c99485c682 SHA1 62b437081e7a5fec1ed8abee4474f9c849731e3c SHA256 8d44ffa69f2fca2e04ecf1a8bd510a519d645be67fd9809f7e8e3b432fc613cd
 AUX freewnn-1.1.1_alpha20-gentoo.diff 1044 RMD160 375c5f7b16a75734e97243d6cb19aca50bf852c0 SHA1 d9fbb3c984cd66527deaa8245adac7d17d993d86 SHA256 0dd0b950758158c226f482ffe7fd83fc1f942f89364ccf84e9e9bb3604d68cda
 AUX freewnn-1.1.1_alpha21-as-needed.patch 487 RMD160 a3de5da66e8e2b27a64511e155571860ae5f163f SHA1 fd301b04098b28d1cd873421a146b6e4dea2ef16 SHA256 02d4fb7bdc4b6764b20e15711bbbf3261ed9df0212f6b97aba80b7ae895a013c
+AUX freewnn-1.1.1_alpha21-gcc45.patch 521 RMD160 c306385a6b1ccb63a8d609a0973beea11b5c2ddb SHA1 a3e1f973f3b765da5ef6f368ed95728dbada0c22 SHA256 96ee7df36e9824c873518ac9b5758c7b491d95322191f76013bfac3f87aab995
 AUX freewnn.initd 296 RMD160 db65942c05ba419428b0fb475c1be1e49aedaf26 SHA1 0c4b4d70636af2206688f7fd7ee421ef823b8333 SHA256 595c0dc6c5218d0227c1696934ff38774fe294337d95da470935c411d299d350
 DIST FreeWnn-1.1.1-a020.tar.bz2 3015928 RMD160 90048ea41936697067a6d80b186d5f938251a72f SHA1 5f86ad6e30227d8ef60c2244a4183c00b90e567d SHA256 6c63933d5bc0edaf59df3ef528f03ab8f362471a60289c1955aa8078babd73bc
 DIST FreeWnn-1.1.1-a021.tar.bz2 3108905 RMD160 72d1b0233fd5f0253e9ff3cc42d087ed3c36da14 SHA1 52fe5102674a68385b88c7503ca7c5cc33dfa6b7 SHA256 df9523b2eea7cbc94d9d01c19a01394abe3b648c5ec3f1259adac06fc8ecbb86
 EBUILD freewnn-1.1.1_alpha20-r1.ebuild 1354 RMD160 eb3d0c0aca1aeb0f3dc466b7641bf98bf541efe7 SHA1 dc63faa31c209e537a62e8cd60736575988d1215 SHA256 84bdabb0fc9cdb2db2e4f785827f0df6a4e9273709dcf9e134be5dd77e2ef761
 EBUILD freewnn-1.1.1_alpha20.ebuild 1350 RMD160 6071d0913201833cfcf6b557ab717b9b9937b792 SHA1 0728b0c5efc4f2c6dbb831f50efa25c9d3d6feb8 SHA256 5a9de9bfbf0e4abcfa1ee8c92b104f8dc6c1b84ddcd7521bce0abe6ed2f87d2a
-EBUILD freewnn-1.1.1_alpha21-r1.ebuild 1405 RMD160 81d358703c7d5e9318c069bacf649ad9ae5e2d92 SHA1 64402ca86b5f4cd48eb4c45c807a0c1c8ada3ce5 SHA256 451851cc39820f88f5a5f1123ac8be325d7da3ae0edf923b24b3efe10cbd0d86
+EBUILD freewnn-1.1.1_alpha21-r1.ebuild 1459 RMD160 438beda32e0fc83f5b30ff28eadfe97ef3cbb6d9 SHA1 fcd4b82305c3bbcb4d3b97691c3e01918d95436e SHA256 d7c837f7093317afa0e4ad83c1a8671a0dfc6c8a5a975c11fb92552560b26b1a
 EBUILD freewnn-1.1.1_alpha21.ebuild 1344 RMD160 03418d51a6bc2c089b0a33fa7ef96287d67b8349 SHA1 22dc92121ceec936c1f6490bc331a9a174eb6869 SHA256 5f61041092f7e0ae6fb55a8fdd9c0613309395e522723a5c4d4d7353f105c3b1
-MISC ChangeLog 6132 RMD160 be9d96d17b669728f70080a0b3cc856777062b69 SHA1 4d2e383a6638f6ba4ca9ac9ef3863fa22a2b1664 SHA256 4a66a886ae40d2e62a1837ed56ebb5c843558662cef38cfd043898b6c3799209
+MISC ChangeLog 6293 RMD160 eb7070fe34a7cf1d6faca7058853a26864b55b41 SHA1 38e8b0f23b2a8354aa390de3011f278bf0dcfb4f SHA256 e96cc6b780f8b306fcdaab681f4c5083fbdaebe05ec402e062ab074e96326847
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkv29OwACgkQCaWpQKGI+9ROogCcC0BIIaHoGjTwgyAPOQx4CPM5
-OdIAnRFNSDAw/gPDRNuGma8AmNIjYOAF
-=B/NS
+iEYEARECAAYFAk6iHKwACgkQGpDnPLSHuMB+8ACeIxqB6AqXv30LHjok1i1LnF9M
+Q6gAoJkM8QEoYwUXXLPf9dxq6EtL5aCn
+=KRRA
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..d46c91d
--- /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 8675cb82d06183709e3cbbd21a3db92f1d5a5149..6f38d02d9010cbe5e27eaa15e6bb1fffc6d7e9e5 100644 (file)
--- 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() {