diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2009-08-05 02:53:29 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2009-08-05 02:53:29 +0000 |
| commit | 30bf456c8badcd4bdcced6e63cd3c1932e04d494 (patch) | |
| tree | 66705131df2d543964ac121f251f60b0c397b971 /games-misc/yadex | |
| parent | Stable for HPPA (bug #278150). (diff) | |
| download | historical-30bf456c8badcd4bdcced6e63cd3c1932e04d494.tar.gz historical-30bf456c8badcd4bdcced6e63cd3c1932e04d494.tar.bz2 historical-30bf456c8badcd4bdcced6e63cd3c1932e04d494.zip | |
fix building with gcc44 with patch from Fredric Johansson (bug #274001)
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'games-misc/yadex')
| -rw-r--r-- | games-misc/yadex/ChangeLog | 8 | ||||
| -rw-r--r-- | games-misc/yadex/Manifest | 5 | ||||
| -rw-r--r-- | games-misc/yadex/files/yadex-1.7.0-elif.patch | 11 | ||||
| -rw-r--r-- | games-misc/yadex/yadex-1.7.0.ebuild | 6 |
4 files changed, 24 insertions, 6 deletions
diff --git a/games-misc/yadex/ChangeLog b/games-misc/yadex/ChangeLog index 22641dddbe5f..a94996921f3c 100644 --- a/games-misc/yadex/ChangeLog +++ b/games-misc/yadex/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-misc/yadex -# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-misc/yadex/ChangeLog,v 1.8 2009/01/29 08:40:12 mr_bones_ Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-misc/yadex/ChangeLog,v 1.9 2009/08/05 02:53:29 mr_bones_ Exp $ + + 05 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org> yadex-1.7.0.ebuild, + +files/yadex-1.7.0-elif.patch: + fix building with gcc44 with patch from Fredric Johansson (bug #274001) 29 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> yadex-1.7.0.ebuild: EAPI=2; respect CC diff --git a/games-misc/yadex/Manifest b/games-misc/yadex/Manifest index a88cecdb2646..800fcefa3234 100644 --- a/games-misc/yadex/Manifest +++ b/games-misc/yadex/Manifest @@ -1,5 +1,6 @@ AUX yadex-1.7.0-NULL-is-not-zero.patch 406 RMD160 9ee842efd8b00fb1c8170b050da0aff4a8030339 SHA1 d6580b6ddd2c8baf37898ee74a2f23c3d3df93c3 SHA256 08d881eef844a7a7417feffdab473b557b43c6c240905cf05ea917504213c2dc +AUX yadex-1.7.0-elif.patch 360 RMD160 4fea9ffb7fdda7fae1c64b1de6fe4456737b0e31 SHA1 5d2decf65f4d6a6243812dab88ca27c3043fb888 SHA256 8d626434f0e978bd64f3ece36967a9c9739194759758b152eebe6568975dc66c DIST yadex-1.7.0.tar.gz 551318 RMD160 6f86e6aa1fd9c9241a883f03fd9567eac8d83887 SHA1 561709fccf5a700fcf42ad1b0d065daf2872baf4 SHA256 316aca295b647b45d6d0d359fd7bba0448e7e114d295347add7ac0e87aa0f446 -EBUILD yadex-1.7.0.ebuild 1290 RMD160 0c2bd1e94c5c6840a518148a45948dd6be762238 SHA1 e405cd3951ec429b2d08c01944511f48735eec3d SHA256 5a2e8bd9b75afa5de3265aac3aa92c60c74b728ccd72a8968f9854ab69952c94 -MISC ChangeLog 1085 RMD160 d738bd78fa1dea8f5c3b4ef6253f3ea25cb14911 SHA1 be7dde14e4f984d494f4f9a75b570dbed582f568 SHA256 d0be6f79cc4ef752de14e8d4f90f4bfde401bc3cc21600fa3b447b05af084254 +EBUILD yadex-1.7.0.ebuild 1365 RMD160 2a936e5d8c4053174e13c5346c2fdb2b35bda257 SHA1 139a484af2f1445249aa844d0788815c7be4fd46 SHA256 f3c7e3e34d888f6785b1236d8f017543385abb6e7aeb017dcda18bb19636c46d +MISC ChangeLog 1268 RMD160 18e9b8d4f02f673ab1d700d57f67a02cbafe7ba7 SHA1 9a4fc77a960bf1c85bb806485cadf85d7830e323 SHA256 80e8c9422d1baf9273bbb7749e75d41b6c165af53df18e2c634303cd8fe43020 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-misc/yadex/files/yadex-1.7.0-elif.patch b/games-misc/yadex/files/yadex-1.7.0-elif.patch new file mode 100644 index 000000000000..a170cbe0ad77 --- /dev/null +++ b/games-misc/yadex/files/yadex-1.7.0-elif.patch @@ -0,0 +1,11 @@ +--- src/gfx.cc.old 2009-08-01 18:47:46.000000000 +0200 ++++ src/gfx.cc 2009-08-01 18:46:03.000000000 +0200 +@@ -310,7 +310,7 @@ + win_vis_id = vis_info->visualid; + #if defined _cplusplus || defined __cplusplus + win_vis_class = vis_info->c_class; +-#elif ++#else + win_vis_class = vis_info->class; + #endif + win_ncolours = vis_info->colormap_size; diff --git a/games-misc/yadex/yadex-1.7.0.ebuild b/games-misc/yadex/yadex-1.7.0.ebuild index 7349ac3fdc14..70dc87b3917b 100644 --- a/games-misc/yadex/yadex-1.7.0.ebuild +++ b/games-misc/yadex/yadex-1.7.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-misc/yadex/yadex-1.7.0.ebuild,v 1.10 2009/01/29 08:40:12 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-misc/yadex/yadex-1.7.0.ebuild,v 1.11 2009/08/05 02:53:29 mr_bones_ Exp $ EAPI=2 inherit eutils games @@ -22,9 +22,11 @@ src_prepare() { -e '/iwad/s/local\///' \ "${S}"/yadex.cfg \ || die "sed yadex.cfg failed" - epatch "${FILESDIR}/${P}"-NULL-is-not-zero.patch + epatch "${FILESDIR}/${P}"-NULL-is-not-zero.patch \ + "${FILESDIR}/${P}"-elif.patch # Force the patched file to be old, otherwise the compile fails touch -t 196910101010 "${S}"/src/wadlist.cc + touch -t 196910101010 "${S}"/src/gfx.cc } src_configure() { |