Add sed patch to support building with newer zlib (bug #385029)

Package-Manager: portage-2.1.10.11/cvs/Linux i686

diff --git a/games-strategy/widelands/ChangeLog b/games-strategy/widelands/ChangeLog
index 575929d93c834e12e8b2745fbe063f5f76a0bfba..c8d9ebdd7f078358b41c802581538a78b6e2005d 100644 (file)
--- a/games-strategy/widelands/ChangeLog
+++ b/games-strategy/widelands/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/widelands
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.36 2011/09/15 03:32:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.37 2011/09/30 21:32:33 mr_bones_ Exp $
+
+  30 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org> widelands-0.16.ebuild:
+  Add sed patch to support building with newer zlib (bug #385029)
 
   15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> widelands-0.16.ebuild,
   +files/widelands-0.16-libpng15.patch:

diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index d5ee25472e654010f13ea9e31a3b798d90679cca..61a9db0fafe0125a009028c4fcaf91157067869d 100644 (file)
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX widelands-0.15-build.patch 1839 RMD160 baedf2f0e20815fdafd8c256a1d339bf32170f21 SHA1 71544823e8c75784db9fa4dcb875fe03f4c1cab8 SHA256 002afd51479536cf796cbab60515ff133bc6fb31d9e9322f966e6217dfdcdd1d
 AUX widelands-0.15-gcc45.patch 1968 RMD160 be797bf86bb24896b7ccc46848726ba8ee15e71d SHA1 b5e5ecb72ad004f39cc77c5b1e0cce5f26bf3746 SHA256 f30fb6ed536fc9caa97fe2fa0b14c162b6469d9e9371beeb183ab7bbb342686b
 AUX widelands-0.15-gcc46.patch 245 RMD160 8b126b213d1eb69ee88903a0b4f1f88743472fa4 SHA1 9cc1519c842afc5e4132b511b5f782b00d1c832d SHA256 fb57dfd043e1ede92ada6b0592d269eef8217ca40cceccf0d6b2a23f8b3d3922
@@ -10,13 +7,6 @@ AUX widelands-0.16-libpng15.patch 2064 RMD160 a8c9e83438f41e015a42f7d02d4b51bb53
 DIST widelands-build15-src.tar.bz2 107471022 RMD160 23dd238978cf97cea2abcb2b8178b090d790cf77 SHA1 dfa3c1bf701dec55cefb5b10f278da037c9288ea SHA256 99cfc86318e74a9abfe85493bf0a072d7ac99d9a3cdaa44922e9a5e027d1be03
 DIST widelands-build16-src.tar.bz2 137808494 RMD160 aa7d14fe0071041227cebf5b5974feb74e7b8c8f SHA1 3e6df06337a4e422236bb0c0bb21068cddb6e274 SHA256 d8db3c15c30314cb220c6d79d93d3d31e7bce2722c93d2c385d643c3c669625d
 EBUILD widelands-0.15.ebuild 1658 RMD160 8c3bda1c60f64ba132a860eb4c9b630c544a98cd SHA1 f8c4c083a20742dc2a9f88e6f1925cfe4ccb452c SHA256 8b1beef3d2c92ce817eb427d65cc2e9ba796a4516641feaed3027d3eb0cfa5b9
-EBUILD widelands-0.16.ebuild 1555 RMD160 542114f7685892f619ba3e027c4e6ec126318e91 SHA1 5dc06ce9a77c15c8d65eaf79b649cba06dbbd2c9 SHA256 1eed46ddd16ce9b69e9a3ab4b13e9e419d1957f631f83dc1928367a2f9a863b7
-MISC ChangeLog 6081 RMD160 2ccabf033305afb673cf0274db661857118446e4 SHA1 1ef8f1389a15d0a04a043b47a23f65d87b7f1790 SHA256 ae7d77caca7e413582ac0ebcfb7aa409e3f43d82abaeba4a807ce77717077d37
+EBUILD widelands-0.16.ebuild 1658 RMD160 8a2bb3e028432a4385f23c6d455ab8178f2ca4da SHA1 7a2acfb2b341aa9b1538b39cb2f6fbe3c96d5f04 SHA256 d635986b4580274da1a8eff6bcd8591935a422edc7814dfc4be9ad1f1be28c49
+MISC ChangeLog 6226 RMD160 ba8b1f22a4923d68b488d6702bfe390afd38f8ae SHA1 d73cd9c387742b2cb3331cb783c30224f2154c84 SHA256 d4824c048f9000ceab6a73f5de4a4068924f7f99b9faa7d55d5c1ef898184bff
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk5xciMACgkQXkR9YqOcLPFFkgD+MEBHbzr7XBFN9j/Vh0dkgLz3
-VFGICiHtEKy4ichecQ0A/2pihZRvlRC/VmvSfbLP5NgwT/RkNXHXzKC6KuZthQVR
-=Tdbw
------END PGP SIGNATURE-----

diff --git a/games-strategy/widelands/widelands-0.16.ebuild b/games-strategy/widelands/widelands-0.16.ebuild
index 375d7efe757c6b9660248acb3af9a606f02192ce..a256c4fedd8a3764f18d43e50ca1dfcfed284dc6 100644 (file)
--- a/games-strategy/widelands/widelands-0.16.ebuild
+++ b/games-strategy/widelands/widelands-0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.16.ebuild,v 1.3 2011/09/15 03:32:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.16.ebuild,v 1.4 2011/09/30 21:32:33 mr_bones_ Exp $
 
 EAPI=3
 inherit versionator cmake-utils games
@@ -33,9 +33,9 @@ CMAKE_BUILD_TYPE=Release
 PREFIX=${GAMES_DATADIR}/${PN}
 
 src_prepare() {
-       sed -i \
-               -e 's:__ppc__:__PPC__:' src/s2map.cc \
-               || die "sed s2map.cc failed"
+       sed -i -e 's:__ppc__:__PPC__:' src/s2map.cc || die
+       sed -i -e '74i#define OF(x) x' src/io/filesystem/{un,}zip.h || die
+       sed -i -e '22i#define OF(x) x' src/io/filesystem/ioapi.h || die
        epatch \
                "${FILESDIR}"/${P}-goldmine.patch \
                "${FILESDIR}"/${P}-libpng15.patch