From d12924b7c461e515e1bf4f51643a1bd04429d467 Mon Sep 17 00:00:00 2001 From: Alfredo Tupone Date: Sun, 2 Apr 2006 13:10:39 +0000 Subject: Fix gcc-4 compilation. Bug #120758 Package-Manager: portage-2.1_pre7-r3 --- games-action/heroes/ChangeLog | 6 +- games-action/heroes/Manifest | 31 ++-- games-action/heroes/files/digest-heroes-0.21-r1 | 10 +- games-action/heroes/files/heroes-0.21-gcc4.patch | 184 +++++++++++++++++++++++ games-action/heroes/heroes-0.21-r1.ebuild | 3 +- 5 files changed, 222 insertions(+), 12 deletions(-) create mode 100644 games-action/heroes/files/heroes-0.21-gcc4.patch (limited to 'games-action/heroes') diff --git a/games-action/heroes/ChangeLog b/games-action/heroes/ChangeLog index 3a483957c06f..cb0efdcb4f52 100644 --- a/games-action/heroes/ChangeLog +++ b/games-action/heroes/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-action/heroes # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/heroes/ChangeLog,v 1.11 2006/01/28 21:19:10 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/heroes/ChangeLog,v 1.12 2006/04/02 13:10:39 tupone Exp $ + + 02 Apr 2006; +files/heroes-0.21-gcc4.patch, + heroes-0.21-r1.ebuild: + Fix gcc-4 compilation, bug #120758, by Joshua Baergen 28 Jan 2006; Joshua Baergen heroes-0.21-r1.ebuild: diff --git a/games-action/heroes/Manifest b/games-action/heroes/Manifest index 551a712c31a3..53a397cbac8e 100644 --- a/games-action/heroes/Manifest +++ b/games-action/heroes/Manifest @@ -1,15 +1,28 @@ -MD5 7b52510ca505d401d043f2c1880995b1 ChangeLog 2771 -RMD160 54f2bc8ed2fdf2c2b86c692a7f371b31c9ddc622 ChangeLog 2771 -SHA256 4f4077366f461af2f28454f9c3cac0d4c020d9c378536c36aea628dfd62edecc ChangeLog 2771 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 a9112422f3ca5ab5611f26da88d9f774 ChangeLog 2912 +RMD160 1738dfb3a94382350adfae7a48477180a4e7e143 ChangeLog 2912 +SHA256 0e84f88d1246a4ea9ea1b8f76c8d9595c611a5caeb42b4328e5d922c94892f80 ChangeLog 2912 MD5 ba75ef912d119247f215f75fea97ce45 files/0.21-cvs-segfault-fix.patch 575 RMD160 1b7707085f2d8215564af93b91396ef799d8cbb3 files/0.21-cvs-segfault-fix.patch 575 SHA256 de4e24aa398912af6fa4dffee0ea31e34fb505f6fb5c6768f34797ff8914c7af files/0.21-cvs-segfault-fix.patch 575 -MD5 629b186fe097d16cc43e4748d648acf0 files/digest-heroes-0.21-r1 286 -RMD160 3614afd4532306f6043d0dee3bd4eb05d504d9c5 files/digest-heroes-0.21-r1 286 -SHA256 4d4b2e8fc1ec4c6871edf49009c4901d8957bcc6656474ddd6a6e3af3ff91501 files/digest-heroes-0.21-r1 286 -MD5 00ffd39225d68ad61098d623c38f659a heroes-0.21-r1.ebuild 1540 -RMD160 75b4ad75a903d6495072938729da1cba71c0a184 heroes-0.21-r1.ebuild 1540 -SHA256 5b39be134629b1cb696722595686fe0e740366a9be1bde8ef2327b8631c5caef heroes-0.21-r1.ebuild 1540 +MD5 69ae36e14d1c81c9fa019aa005ebe471 files/digest-heroes-0.21-r1 1042 +RMD160 80e21d4dce50b03710ad1d83f0bdb1c1ae11f4ac files/digest-heroes-0.21-r1 1042 +SHA256 1f3fda92a35b7d482cfc81fc8f96a7450242c8ceeb66350b6c23acb98144619a files/digest-heroes-0.21-r1 1042 +MD5 f367354b8db0b1beb117a7b334b439d8 files/heroes-0.21-gcc4.patch 6016 +RMD160 9fab374668c39fcec9e9bf2fb3ba1fe76fcf00bd files/heroes-0.21-gcc4.patch 6016 +SHA256 3ec059d2cbf978d0760ef28e24749202e97dde4c9af7194f094a06758bf9cbee files/heroes-0.21-gcc4.patch 6016 +MD5 f2b5c83d12c6f3b69ce93373bc37ab9d heroes-0.21-r1.ebuild 1571 +RMD160 c51b4d6d7592ce76e2324b957d4aa8a469d5fc1c heroes-0.21-r1.ebuild 1571 +SHA256 2d5bc669fbb0488526a2b7b96821ed5e92ec4f1cced464043cce68716676f0d3 heroes-0.21-r1.ebuild 1571 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2.2 (GNU/Linux) + +iD8DBQFEL81g2CTtIKiFlQIRAktXAJsEp+ZZws5GpgSKq5dxwMONjhfqCACgoSVh +/FtvE4g4fSF0rPvr9WciKVA= +=MdIu +-----END PGP SIGNATURE----- diff --git a/games-action/heroes/files/digest-heroes-0.21-r1 b/games-action/heroes/files/digest-heroes-0.21-r1 index 952f6f93ddb3..427b1138fc91 100644 --- a/games-action/heroes/files/digest-heroes-0.21-r1 +++ b/games-action/heroes/files/digest-heroes-0.21-r1 @@ -1,4 +1,12 @@ MD5 ec608676e2e75abdfddf8072bb3b28db heroes-0.21.tar.bz2 709079 +RMD160 4d189160ee8b4e2f306ecc3086f50cd564590a8a heroes-0.21.tar.bz2 709079 +SHA256 47c0dd6dea64a971236d2fb5ec94e3526741ebfaf73110535ed438035d18da74 heroes-0.21.tar.bz2 709079 MD5 015a95c16998bd0900f3a6cb6e6f26ac heroes-data-1.5.tar.bz2 391970 -MD5 f23313177d7a33b1b2e8c759cfa54310 heroes-sound-tracks-1.0.tar.bz2 1245613 +RMD160 7bcbbc57537318db2e4c661f46dd951947a5d58d heroes-data-1.5.tar.bz2 391970 +SHA256 f3fa8bd0dd15795b906a8b0cfcfdf0d077404c8577a694347f9e3b1115c231ae heroes-data-1.5.tar.bz2 391970 MD5 1c04db6da3d98eebfb3119460701cd5b heroes-sound-effects-1.0.tar.bz2 389883 +RMD160 5b696068614f2c9259a41b63fa6876c57d26ee82 heroes-sound-effects-1.0.tar.bz2 389883 +SHA256 400439d4c6d031ed55ebbb18a8c99928e8b7a99c220ab8ccd3a21eca04f2072c heroes-sound-effects-1.0.tar.bz2 389883 +MD5 f23313177d7a33b1b2e8c759cfa54310 heroes-sound-tracks-1.0.tar.bz2 1245613 +RMD160 e1ddc451b79947c2e34be8a67360411174c1840a heroes-sound-tracks-1.0.tar.bz2 1245613 +SHA256 2a20bd584a97881421b1c5ef0575284f3dae2a6c0866b9d5faedc47b524cd573 heroes-sound-tracks-1.0.tar.bz2 1245613 diff --git a/games-action/heroes/files/heroes-0.21-gcc4.patch b/games-action/heroes/files/heroes-0.21-gcc4.patch new file mode 100644 index 000000000000..573db41c0e2e --- /dev/null +++ b/games-action/heroes/files/heroes-0.21-gcc4.patch @@ -0,0 +1,184 @@ +--- src/hedlite.c.old 2006-01-28 14:05:05.000000000 -0700 ++++ src/hedlite.c 2006-01-28 14:07:20.000000000 -0700 +@@ -45,7 +45,7 @@ + #include "dirname.h" + + static a_pcx_image heditrsc; +-static a_pcx_image tile_set_img; ++static a_pcx_image tile_set_img_local; + + unsigned short int xdalles = 0; + unsigned short int ydalles = 0; +@@ -144,9 +144,9 @@ + static void + copy_tile (int src_, a_pixel *dest) + { +- int i = tile_set_img.width; ++ int i = tile_set_img_local.width; + int j; +- a_pixel *src = tile_set_img.buffer + src_; ++ a_pixel *src = tile_set_img_local.buffer + src_; + for (j = 20; j > 0; j--) { + fastmem4 (src, dest, 24 >> 2); + src += i; +@@ -157,9 +157,9 @@ + static void + copy_tile_pcx (int src_, a_pixel *dest) + { +- int i = tile_set_img.width; ++ int i = tile_set_img_local.width; + int j; +- a_pixel *src = tile_set_img.buffer + src_; ++ a_pixel *src = tile_set_img_local.buffer + src_; + for (j = 20; j > 0; j--) { + fastmem4 (src, dest, 24 >> 2); + src += i; +@@ -170,9 +170,9 @@ + static void + copy_tile_transp (int src_, a_pixel *dest) + { +- int i = tile_set_img.width; ++ int i = tile_set_img_local.width; + int j, k; +- a_pixel *src = tile_set_img.buffer + src_; ++ a_pixel *src = tile_set_img_local.buffer + src_; + for (j = 20; j > 0; j--) { + for (k = 24; k > 0; k--) { + if (*src != 0) +@@ -188,9 +188,9 @@ + static void + copy_tile_transp_pcx (int src_, a_pixel *dest) + { +- int i = tile_set_img.width; ++ int i = tile_set_img_local.width; + int j, k; +- a_pixel *src = tile_set_img.buffer + src_; ++ a_pixel *src = tile_set_img_local.buffer + src_; + for (j = 20; j > 0; j--) { + for (k = 24; k > 0; k--) { + if (*src != 0) +@@ -555,7 +555,7 @@ + static void + update_middle_panel (void) + { +- rectangle_copy (xdalles, 0, 144, 200, 145, 0, &tile_set_img); ++ rectangle_copy (xdalles, 0, 144, 200, 145, 0, &tile_set_img_local); + frame (145 + xdallesdec, ydalles, 23, 19, 15); + rectangle_copy (0, 64, 30, 6, 290, 64, &heditrsc); + sprintf (nombre, "%u", (xdalles + xdallesdec) / 24); +@@ -670,7 +670,7 @@ + curdalled (void) + { + int i = +- (xdalles + xdallesdec) / 24 + (ydalles / 20) * (tile_set_img.width / 24); ++ (xdalles + xdallesdec) / 24 + (ydalles / 20) * (tile_set_img_local.width / 24); + return i; + } + +@@ -894,7 +894,7 @@ + free (tempc); + putc (0xC, fpcx); + for (i1 = 0; i1 < 768; i1++) +- putc (tile_set_img.palette.global[i1] << 2, fpcx); ++ putc (tile_set_img_local.palette.global[i1] << 2, fpcx); + fclose (fpcx); + } + +@@ -1225,7 +1225,7 @@ + } + } else if (i == HK_End) { + if (mod & HK_MOD_Ctrl) { +- xdalles = (tile_set_img.width / 24) * 24 - 144; ++ xdalles = (tile_set_img_local.width / 24) * 24 - 144; + update_middle_panel (); + } + } else if (i == HK_PageDown) { +@@ -1250,7 +1250,7 @@ + } + } else if (i == HK_Right) { + if (mod & HK_MOD_Ctrl) { +- if (xdalles + 168U < tile_set_img.width) { ++ if (xdalles + 168U < tile_set_img_local.width) { + xdalles += 24; + update_middle_panel (); + } else if (xdallesdec < 120) { +@@ -1337,7 +1337,7 @@ + } else if (i == HK_Space) { + j = curdallep (); + level_map[j].number = +- xdalles + xdallesdec + ydalles * (tile_set_img.width); ++ xdalles + xdallesdec + ydalles * (tile_set_img_local.width); + level_map[j].type = ddef[curdalled ()].type; + level_map[j].info = ddef[curdalled ()].info; + gestclav (HK_i, HK_MOD_None); +@@ -1351,9 +1351,9 @@ + level_map[j].collision[3] = 0; + } + for (j = hplaninfo.xt * hplaninfo.yt - 1; j >= 0; j--) { +- k = (((level_map[j].number % tile_set_img.width) / 24) + +- (level_map[j].number / (tile_set_img.width * 20)) * +- (tile_set_img.width / 24)); ++ k = (((level_map[j].number % tile_set_img_local.width) / 24) + ++ (level_map[j].number / (tile_set_img_local.width * 20)) * ++ (tile_set_img_local.width / 24)); + level_map[j].type = ddef[k].type; + if (level_map[j].type != t_tunnel) { + if (level_map[j].type == t_anim || i == 0x1749) +@@ -1404,7 +1404,7 @@ + if (mod & HK_MOD_Ctrl) { + for (j = hplaninfo.xt * hplaninfo.yt - 1; j >= 0; j--) { + level_map[j].number = xdalles + xdallesdec + +- ydalles * (tile_set_img.width); ++ ydalles * (tile_set_img_local.width); + level_map[j].type = ddef[curdalled ()].type; + level_map[j].info = ddef[curdalled ()].info; + } +@@ -1414,7 +1414,7 @@ + + level_map[j].number = + (((j % hplaninfo.xt) + (j / hplaninfo.xt)) & 1) * 20 * +- tile_set_img.width; ++ tile_set_img_local.width; + update_left_panel (); + } + } else if (i == HK_F3) { +@@ -1427,7 +1427,7 @@ + if (level_map[curdallep ()].sprite == 0) + + level_map[curdallep ()].sprite = +- (short int) (xdalles + xdallesdec + ydalles * (tile_set_img.width)); ++ (short int) (xdalles + xdallesdec + ydalles * (tile_set_img_local.width)); + else + level_map[curdallep ()].sprite = 0; + update_left_panel (); +@@ -1707,17 +1707,17 @@ + hplaninfo.tile_set_name), ".pie"); + + pcx_load_from_rsc ("editor-img", &heditrsc); +- pcx_load (tile_set_name, &tile_set_img); ++ pcx_load (tile_set_name, &tile_set_img_local); + + /* read the tileset definition */ +- XCALLOC_ARRAY (ddef, (tile_set_img.width / 24) * 10); ++ XCALLOC_ARRAY (ddef, (tile_set_img_local.width / 24) * 10); + if (!((ftmp = fopen (dallepie, "rb")) == NULL)) +- fread (ddef, sizeof (a_tile_info), (tile_set_img.width / 24) * 10, ftmp); ++ fread (ddef, sizeof (a_tile_info), (tile_set_img_local.width / 24) * 10, ftmp); + fclose (ftmp); + + outwayinit (); + XCALLOC_ARRAY (hedit_buffer, xbuf * 200); +- set_pal (tile_set_img.palette.global, 0, 256 * 3); ++ set_pal (tile_set_img_local.palette.global, 0, 256 * 3); + rectangle_copy (0, 0, 30, 200, 290, 0, &heditrsc); + strupr (levelnomshort); + draw_text (levelnomshort, 305, 29, 8, 1); +@@ -1767,7 +1767,7 @@ + free (ddef); + free (level_map); + img_free (&heditrsc); +- img_free (&tile_set_img); ++ img_free (&tile_set_img_local); + } + + free (dallepie); diff --git a/games-action/heroes/heroes-0.21-r1.ebuild b/games-action/heroes/heroes-0.21-r1.ebuild index 17c85ca8a477..30c8cb053b81 100644 --- a/games-action/heroes/heroes-0.21-r1.ebuild +++ b/games-action/heroes/heroes-0.21-r1.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-action/heroes/heroes-0.21-r1.ebuild,v 1.4 2006/01/28 21:19:10 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/heroes/heroes-0.21-r1.ebuild,v 1.5 2006/04/02 13:10:39 tupone Exp $ inherit eutils games @@ -31,6 +31,7 @@ src_unpack() { unpack ${A} cd ${WORKDIR}/${P} epatch ${FILESDIR}/${PV}-cvs-segfault-fix.patch #56118 + epatch "${FILESDIR}/${P}"-gcc4.patch } src_compile() { -- cgit v1.2.3-65-gdbad