diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2012-07-07 23:10:25 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2012-07-07 23:10:25 +0000 |
| commit | 92654f3995e9c848f3273a305d6eef8922cd1ca2 (patch) | |
| tree | 5ca5d84fa8c7e8ef13877b9f3a5286e6d5504716 /games-board | |
| parent | Add additional fix for bug 424231. (diff) | |
| download | historical-92654f3995e9c848f3273a305d6eef8922cd1ca2.tar.gz historical-92654f3995e9c848f3273a305d6eef8922cd1ca2.tar.bz2 historical-92654f3995e9c848f3273a305d6eef8922cd1ca2.zip | |
Patch to fix building with gcc-4.7 from Daniel Johnson, bug #423465
Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64
Diffstat (limited to 'games-board')
| -rw-r--r-- | games-board/hexxagon/ChangeLog | 6 | ||||
| -rw-r--r-- | games-board/hexxagon/Manifest | 29 | ||||
| -rw-r--r-- | games-board/hexxagon/files/hexxagon-1.0.1-gcc47.patch | 43 | ||||
| -rw-r--r-- | games-board/hexxagon/hexxagon-1.0.1.ebuild | 10 |
4 files changed, 79 insertions, 9 deletions
diff --git a/games-board/hexxagon/ChangeLog b/games-board/hexxagon/ChangeLog index 47de8aca7bb5..b4da9c8bc81f 100644 --- a/games-board/hexxagon/ChangeLog +++ b/games-board/hexxagon/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-board/hexxagon # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/hexxagon/ChangeLog,v 1.32 2012/05/04 04:30:09 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/hexxagon/ChangeLog,v 1.33 2012/07/07 23:10:25 tristan Exp $ + + 07 Jul 2012; Tristan Heaven <tristan@gentoo.org> hexxagon-1.0.1.ebuild, + +files/hexxagon-1.0.1-gcc47.patch: + Patch to fix building with gcc-4.7 from Daniel Johnson, bug #423465 04 May 2012; Jeff Horelick <jdhore@gentoo.org> hexxagon-1.0.1.ebuild: dev-util/pkgconfig -> virtual/pkgconfig diff --git a/games-board/hexxagon/Manifest b/games-board/hexxagon/Manifest index 6f1620fe8a31..7b1ff99c8f45 100644 --- a/games-board/hexxagon/Manifest +++ b/games-board/hexxagon/Manifest @@ -1,4 +1,25 @@ -DIST hexxagon-1.0.1.tar.bz2 1278325 RMD160 fc023265a2c1bc0ba8f054197608c8024871eaab SHA1 02aaab7fab771ae58dd0d43f761763136e034f02 SHA256 a6a1579990797276132f5d0e26b5b70d60ef654cb35261e2b6c26220e7d40fd9 -EBUILD hexxagon-1.0.1.ebuild 740 RMD160 c1a2455863f222e10a3751f4ea6fab4ffc6a1f89 SHA1 da7f3f8a54795a57a53e406a1080c6e40cbdf759 SHA256 33ab750e5269ee79b7da858c78488405110abddff5fea9ef1e7b3443a2451d75 -MISC ChangeLog 3330 RMD160 d7b916789d35c63f007bf8f30f7544e75e595a36 SHA1 7b1fb38abea7b45ae676f4e8b065b594b8856171 SHA256 0c56d41d7b0b2a3eccab7c643e7f0c5736c432dea799eaf3fd4b00adb6c3806e -MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +AUX hexxagon-1.0.1-gcc47.patch 1567 SHA256 93bdb1f2f2909e5f3a9bb57e29618ff722a802bbaedeb712270e2b9ff47e88be SHA512 50f6911352b59785f4389aa36a12d0927426161e403456d6724519a5329b9aab895fb689621e465335d4ce0fd86a8a9d326a1e5255b06b5d120ae8f67746ae18 WHIRLPOOL 8c713e2edaa0152cde281c59a9bccb968db79a0fee2f34edc694fff5b425d1a05b7da2e46e4bd4d132c81014227e1084b0daf0a59a12efc9d33ed625e96f9269 +DIST hexxagon-1.0.1.tar.bz2 1278325 SHA256 a6a1579990797276132f5d0e26b5b70d60ef654cb35261e2b6c26220e7d40fd9 SHA512 528b754a36c681f24cf0b420620e9b1712aea9950ad066f0c8bbb87b2e7580745a63c373dd06e4db1d4630fbf2ff0fa399a073220e7cb6c1c93b0c4fa429e6c9 WHIRLPOOL f963ab5c2d48561382d874059426ba0a5f84ce39ca08b36f2555a711adec90b402b61a47a31a81cc3c3a6c24c752f447ab85434d9cb4876ba9251d618f4b3505 +EBUILD hexxagon-1.0.1.ebuild 773 SHA256 7c137741ac792a1391b445f6a4759a167fbf556088a9e2e02599c116676ec1fa SHA512 a801f75028288bd0700c8374cb59d72438a6269ba803e0ed3d0f5837136950ed7da3ea80f7500f41b3994d19dbe2768ff8796e1cf05e581ebff2163545b8cacc WHIRLPOOL c01d864d4c9ae1d865ad6452dfa54d56fbc97a0eddb81d1ad0150d066d5e85516456e186a6d9ad68d6a874df6f95dec6d245c7639ef8a7c067b98b6668dad3d6 +MISC ChangeLog 3513 SHA256 64b4bcbe53d6f00a26f3e0a4e0c45dd93a0c84421ea43f3577953ba6bfa75426 SHA512 4351ce1afb5f2a644e6316c2ecc64fe58cc9a8fa61cf15af514eeed852112f56c70ddd10472622e1e0bbda131b350bcce318d3f5ae0afe56378ca0042a58d54b WHIRLPOOL 19dbb434accbaf431f5afce5bf233a40552deb50713b24a207c5221ae89564a9843538fa0bdaea6cb493e5387a4b566b50e1c2cf3cebfbf2533723185c5595e9 +MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQIcBAEBCgAGBQJP+MHnAAoJEN3Y2YlmgxDZ5QkQAKXQ6e0pPCFyKT5UkCAd86hS +S0iz3LKQDdwsOBaMmp9YiS1CA/x69c4CZSLxMnP7nWj8JUkv4O3e4bCgNvSpGffU +bGmTnz2yyeGgn9mIBvozFkPiA8ONCyHmvnhlz3lvGvdkNPiDGa5NI5GSI7bOXuzj +Rdd8xtnlamv+NOJCmWA+dVhjh3Va/DsBL1U+eItzVAy7ZVasEw9MD2Ckl0NZ+nZA +Ah3s7z3SiskUG1oFx24Egx0j7JOR+iQ35iQ88UiQx67aw5bevlHiK0XIwsKulZ+d +BvM6TvBHPqmEh3E+grMqOuSgfQjLbi8xtj2fB+ktZN3JNpW3oiHlCJhdPADVOZ41 +gSVHRe4jgzMotrxsbcnm1QTVcb6YWQUeO0GkiMdg2IpfeH4YOzmDOGHL+JxKsPVM +WlnM7tWFxoQ1cvN1TkxOZjdnW7YFvpv4C62bxRQ4TPtRdzT8TyiHrakWxRHI9X32 +cDmWP+3XnVmj5an/3Jn7i+xzBYx8zpg/VF3QweSJP6bRceX6+g8Iy2Z6fwbRP3N8 +F5OOdpQefmF3vRF4JCGei+k7pqrshcCiF3wWXL3ER9G6JWUwAnJVuTCA81Ilesu7 +BsT987XH4/8MtihauwJoX6Lczfzr0N+1mJpb5g4XtRus2B+mWWe3bUj05z2cZxR1 +HEPSJJ1xY2S48afAqaJG +=dchX +-----END PGP SIGNATURE----- diff --git a/games-board/hexxagon/files/hexxagon-1.0.1-gcc47.patch b/games-board/hexxagon/files/hexxagon-1.0.1-gcc47.patch new file mode 100644 index 000000000000..c3836cc5d5b2 --- /dev/null +++ b/games-board/hexxagon/files/hexxagon-1.0.1-gcc47.patch @@ -0,0 +1,43 @@ +--- src/gui/gtkhexxagonboard.cpp ++++ src/gui/gtkhexxagonboard.cpp +@@ -120,8 +120,8 @@ + posx += width * offset / 2; + posy += height * offset / 2; + +- int x = (int) round(posx) + xoff; +- int y = (int) round(posy) + yoff; ++ int displayx = (int) round(posx) + xoff; ++ int displayy = (int) round(posy) + yoff; + + int type; + LookUp lookup(bbMask); +@@ -155,10 +155,10 @@ + + Glib::RefPtr<Gdk::GC> gc = Gdk::GC::create(back); + gc->set_clip_mask(mask[type]); +- gc->set_clip_origin(x, y); ++ gc->set_clip_origin(displayx, displayy); + + if(back && map_board[type]) +- back->draw_drawable(gc, map_board[type], 0, 0, x, y, -1, -1); ++ back->draw_drawable(gc, map_board[type], 0, 0, displayx, displayy, -1, -1); + + cellNo++; + } +@@ -205,12 +205,12 @@ + posx += width * offset / 2; + posy += height * offset / 2; + +- int x = (int) round(posx + w / 2) + xoff; +- int y = (int) round(posy + h / 2) + yoff; ++ int displayx = (int) round(posx + w / 2) + xoff; ++ int displayy = (int) round(posy + h / 2) + yoff; + + // Now we got the place for cell cellNo +- double dx = inx - x; +- double dy = iny - y; ++ double dx = inx - displayx; ++ double dy = iny - displayy; + double a = (w/2)*(w/2); + double b = (h/2)*(h/2); + diff --git a/games-board/hexxagon/hexxagon-1.0.1.ebuild b/games-board/hexxagon/hexxagon-1.0.1.ebuild index 07d42cccfa10..8649abfd00cf 100644 --- a/games-board/hexxagon/hexxagon-1.0.1.ebuild +++ b/games-board/hexxagon/hexxagon-1.0.1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/hexxagon/hexxagon-1.0.1.ebuild,v 1.7 2012/05/04 04:30:09 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/hexxagon/hexxagon-1.0.1.ebuild,v 1.8 2012/07/07 23:10:25 tristan Exp $ EAPI=2 inherit eutils games -DESCRIPTION="clone of the original DOS game" +DESCRIPTION="Clone of the original DOS game" HOMEPAGE="http://www.nesqi.se/" SRC_URI="http://www.nesqi.se/download/${P}.tar.bz2" @@ -14,12 +14,14 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="" -RDEPEND=">=dev-cpp/glibmm-2.4:2 - >=dev-cpp/gtkmm-2.4:2.4 +RDEPEND="dev-cpp/glibmm:2 + dev-cpp/gtkmm:2.4 x11-libs/gtk+:2" DEPEND="${RDEPEND} virtual/pkgconfig" +PATCHES=( "${FILESDIR}"/${P}-gcc47.patch ) + src_install() { emake DESTDIR="${D}" install || die "emake install failed" newicon images/board_N_2.xpm ${PN}.xpm |