From: Mike Frysinger Date: Mon, 7 Aug 2006 03:17:57 +0000 (+0000) Subject: Mark C funcs as extern C #128348 by Honza. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7d34c154007e4cdf59c5242156bd0bd12345b402;p=gentoo.git Mark C funcs as extern C #128348 by Honza. Package-Manager: portage-2.1.1_pre4 --- diff --git a/games-misc/bsd-games/ChangeLog b/games-misc/bsd-games/ChangeLog index ac36e7fe25b7..33dbbe49811a 100644 --- a/games-misc/bsd-games/ChangeLog +++ b/games-misc/bsd-games/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-misc/bsd-games # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.26 2006/07/28 22:21:05 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.27 2006/08/07 03:17:56 vapier Exp $ + + 07 Aug 2006; Mike Frysinger + +files/bsd-games-2.17-headers.patch, bsd-games-2.17-r2.ebuild: + Mark C funcs as extern C #128348 by Honza. 28 Jul 2006; bsd-games-2.17-r2.ebuild: Fixing bug #104086, banner executable name collision, by Andrzej Zaborowski diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest index 70bb3c43a1f4..8de9d819fc5d 100644 --- a/games-misc/bsd-games/Manifest +++ b/games-misc/bsd-games/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX bsd-games-2.17-64bit.patch 1322 RMD160 c987b732b83cdf55bb15c6c3ddbc59212f28773d SHA1 0bd044bff85f18cf188dd6068c297dda17196865 SHA256 cbe649fa75bc3e16f27032d05b8ce770ae036df83435211e429379852528fcfe MD5 257813b76a41c8b2c02701571c804227 files/bsd-games-2.17-64bit.patch 1322 RMD160 c987b732b83cdf55bb15c6c3ddbc59212f28773d files/bsd-games-2.17-64bit.patch 1322 @@ -6,6 +9,10 @@ AUX bsd-games-2.17-gcc4.patch 893 RMD160 d48cde21ad4dd239e802cf08e1e94c91a12296b MD5 ecbae8c67d0898a9e4d428b940de45a2 files/bsd-games-2.17-gcc4.patch 893 RMD160 d48cde21ad4dd239e802cf08e1e94c91a12296bb files/bsd-games-2.17-gcc4.patch 893 SHA256 96639f25206401c0dde3f9f28ac287c9e26c3efb526481fa48b482f8c9ab4ac0 files/bsd-games-2.17-gcc4.patch 893 +AUX bsd-games-2.17-headers.patch 268 RMD160 cc0e97f981581c0635e549ce41d97549c2f7ed33 SHA1 ebce73dc15fc11859fb4ca577dbdd977628b1501 SHA256 c21d06479c6758b6091b04676d636298c01d9709dabd5587111c74ad1db662d7 +MD5 2c84efa07b0279d0c901c1a13d710fb0 files/bsd-games-2.17-headers.patch 268 +RMD160 cc0e97f981581c0635e549ce41d97549c2f7ed33 files/bsd-games-2.17-headers.patch 268 +SHA256 c21d06479c6758b6091b04676d636298c01d9709dabd5587111c74ad1db662d7 files/bsd-games-2.17-headers.patch 268 AUX bsd-games-2.17-tetris.patch 1125 RMD160 1647a0e7231da97c420e28facd30584557567b75 SHA1 77400661025d9567e129f66fc902471d853a0cb6 SHA256 53ee0ee8114bf6450f18f86c70916711bad3409220e78fe2751d01e6897e8725 MD5 6e06d33e4413e72ce78ef14dd712ab5b files/bsd-games-2.17-tetris.patch 1125 RMD160 1647a0e7231da97c420e28facd30584557567b75 files/bsd-games-2.17-tetris.patch 1125 @@ -16,14 +23,14 @@ RMD160 2425b6fb3388464263ad8392f700b0b43ae2c5a3 files/config.params-gentoo 1244 SHA256 07dbcfe4883f22fb1a2d05d474a6c79d47516eb9bece5c9060baff4b2fd5f2a0 files/config.params-gentoo 1244 DIST bsd-games-2.17.tar.gz 2563311 RMD160 a8f9c829bb09dfa071ecafbd6cb15560dba888d8 SHA1 8e48a9808908e2898126fdd285196ab71c9a59c0 SHA256 066f924aef6c1c5ea946f588e36f303021f5dfc093944738f025d8edbc6fff60 DIST bsdgames_2.17-7.diff.gz 12530 RMD160 4c213632111ac8035058214889fd9229723b9785 SHA1 e19b34faeea0941395e07d78e74939837f5aa70c SHA256 41b4b99ae96f1b42beb37818f377cc194ab4146fe845818e8d29663d4f52ff88 -EBUILD bsd-games-2.17-r2.ebuild 3809 RMD160 45d516e44d7ca57f42345f6939f1e6d3baa0d2f8 SHA1 82d121b2fba6e51d8d32839e95058ceccdae7a6a SHA256 83412133cdd7e95053726c5eebe5731599b0c5ed973dd1f001b06a77622ca658 -MD5 b4a4a5e4808071caa9bc60c62f3e1669 bsd-games-2.17-r2.ebuild 3809 -RMD160 45d516e44d7ca57f42345f6939f1e6d3baa0d2f8 bsd-games-2.17-r2.ebuild 3809 -SHA256 83412133cdd7e95053726c5eebe5731599b0c5ed973dd1f001b06a77622ca658 bsd-games-2.17-r2.ebuild 3809 -MISC ChangeLog 3748 RMD160 570fc29cea2a03c70b934f684606c818d1687ccd SHA1 65261eda560b3f897679e526be756cf282b818f3 SHA256 499c22901fe236121347340e41acf1ddc2a8cd9f800f4e95e9144231dcc8b661 -MD5 aa2816e688695ad3a33fb9f297c94111 ChangeLog 3748 -RMD160 570fc29cea2a03c70b934f684606c818d1687ccd ChangeLog 3748 -SHA256 499c22901fe236121347340e41acf1ddc2a8cd9f800f4e95e9144231dcc8b661 ChangeLog 3748 +EBUILD bsd-games-2.17-r2.ebuild 3846 RMD160 bffb9b94a75291b3ab0b3b0d57bbea4ad1ba528c SHA1 963f45174267e853e4446464d94faed057b5d2ae SHA256 58018b82edebd8e380d355ebf01ba086e2973f875457357c06537e8167986978 +MD5 8ad438a1dfd02243428132e5edc330d1 bsd-games-2.17-r2.ebuild 3846 +RMD160 bffb9b94a75291b3ab0b3b0d57bbea4ad1ba528c bsd-games-2.17-r2.ebuild 3846 +SHA256 58018b82edebd8e380d355ebf01ba086e2973f875457357c06537e8167986978 bsd-games-2.17-r2.ebuild 3846 +MISC ChangeLog 3909 RMD160 3ba41d31539387b93fe477aa7be5f6fc73d25aec SHA1 5f60d256f5f531e057fbcf02ed6ec4d04c2b7306 SHA256 046edfb003db001abde0fba6396b38616d851855cad232b913e63ef06e7e9865 +MD5 4c35b582c35744ffbb6bece197214856 ChangeLog 3909 +RMD160 3ba41d31539387b93fe477aa7be5f6fc73d25aec ChangeLog 3909 +SHA256 046edfb003db001abde0fba6396b38616d851855cad232b913e63ef06e7e9865 ChangeLog 3909 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 @@ -31,3 +38,10 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata MD5 27b34a2c494e0dffe4b571f839ad1c88 files/digest-bsd-games-2.17-r2 494 RMD160 9e529f6c955c47d1932c953b23df61f165761c1f files/digest-bsd-games-2.17-r2 494 SHA256 7e0561136f3d22a5323cb0d99293b99d11e79949c48dab69fc9f36b7bd9fdcdf files/digest-bsd-games-2.17-r2 494 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.4 (GNU/Linux) + +iD8DBQFE1rDwamhnQswr0vIRAh7OAKCwSw7xZvLzg/rHOcM5eI7B55lb/wCcDL9L +zp1XhqAplL+nL8NC8S6Myhc= +=fh3A +-----END PGP SIGNATURE----- diff --git a/games-misc/bsd-games/bsd-games-2.17-r2.ebuild b/games-misc/bsd-games/bsd-games-2.17-r2.ebuild index aa31d061e945..f66ae8f7e5a3 100644 --- a/games-misc/bsd-games/bsd-games-2.17-r2.ebuild +++ b/games-misc/bsd-games/bsd-games-2.17-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/bsd-games-2.17-r2.ebuild,v 1.3 2006/07/28 22:21:05 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/bsd-games-2.17-r2.ebuild,v 1.4 2006/08/07 03:17:56 vapier Exp $ inherit eutils games @@ -36,6 +36,7 @@ src_unpack() { epatch \ "${DISTDIR}"/bsdgames_${PV}-${DEB_PATCH_VER}.diff.gz \ "${FILESDIR}"/${P}-64bit.patch \ + "${FILESDIR}"/${P}-headers.patch \ "${FILESDIR}"/${P}-gcc4.patch sed -i \ diff --git a/games-misc/bsd-games/files/bsd-games-2.17-headers.patch b/games-misc/bsd-games/files/bsd-games-2.17-headers.patch new file mode 100644 index 000000000000..953a5d35765a --- /dev/null +++ b/games-misc/bsd-games/files/bsd-games-2.17-headers.patch @@ -0,0 +1,16 @@ +http://bugs.gentoo.org/128348 + +--- include/stdio.h ++++ include/stdio.h +@@ -35,5 +35,11 @@ + #include_next + + #ifndef HAVE_fgetln ++#ifdef __cplusplus ++extern "C" { ++#endif + extern char *fgetln(FILE *stream, size_t *len); ++#ifdef __cplusplus ++} ++#endif + #endif