diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2011-09-21 10:44:04 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2011-09-21 10:44:04 +0000 |
| commit | 3589622ac4c31d0a7f4e2d14a1da018d2c321b1a (patch) | |
| tree | bae5827c6f5570a61eb74344ac19033714a96695 /games-emulation/daphne | |
| parent | Introduce botan-bundled useflag as a temp fix for bug #383033 (diff) | |
| download | historical-3589622ac4c31d0a7f4e2d14a1da018d2c321b1a.tar.gz historical-3589622ac4c31d0a7f4e2d14a1da018d2c321b1a.tar.bz2 historical-3589622ac4c31d0a7f4e2d14a1da018d2c321b1a.zip | |
Fix underlink. Bug #379489
Build with sys-libs/zlib-1.2.5.1-r1
Package-Manager: portage-2.1.10.19/cvs/Linux i686
Diffstat (limited to 'games-emulation/daphne')
| -rw-r--r-- | games-emulation/daphne/ChangeLog | 9 | ||||
| -rw-r--r-- | games-emulation/daphne/Manifest | 16 | ||||
| -rw-r--r-- | games-emulation/daphne/daphne-1.0.ebuild | 8 | ||||
| -rw-r--r-- | games-emulation/daphne/files/daphne-1.0-underlink.patch | 8 | ||||
| -rw-r--r-- | games-emulation/daphne/files/daphne-1.0-zlib.patch | 13 |
5 files changed, 47 insertions, 7 deletions
diff --git a/games-emulation/daphne/ChangeLog b/games-emulation/daphne/ChangeLog index c2399ee3f781..996938f3c284 100644 --- a/games-emulation/daphne/ChangeLog +++ b/games-emulation/daphne/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-emulation/daphne -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/ChangeLog,v 1.16 2010/10/05 07:42:25 tupone Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/ChangeLog,v 1.17 2011/09/21 10:44:04 tupone Exp $ + + 21 Sep 2011; Tupone Alfredo <tupone@gentoo.org> daphne-1.0.ebuild, + +files/daphne-1.0-underlink.patch, +files/daphne-1.0-zlib.patch: + Fix underlink. Bug #379489 by Diego Elio Pettenò + Build with sys-libs/zlib-1.2.5.1-r1 05 Oct 2010; Tupone Alfredo <tupone@gentoo.org> daphne-1.0.ebuild, +files/daphne-1.0-ldflags.patch: diff --git a/games-emulation/daphne/Manifest b/games-emulation/daphne/Manifest index 3ce5630c94ae..ef01eea6a250 100644 --- a/games-emulation/daphne/Manifest +++ b/games-emulation/daphne/Manifest @@ -1,8 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX daphne-1.0-gcc43.patch 482 RMD160 232e35f3b8fedb792129d782aa14deb278895095 SHA1 00cfe7cd467008f4a29355ee96f70a1c70b56480 SHA256 a13e0f8490bd099dd70874ff7a8c3906fe7673f7921042f928acb0e258cac929 AUX daphne-1.0-ldflags.patch 612 RMD160 9612e8a945ce3083a1de070946949fffcff4bf2d SHA1 3b00501a23549f5045f3fd762bf1c8b435af0277 SHA256 f5d6cdb9d2f357a721806ede353d0a7fba3c3dce28f270a430d856e5b6fad9c1 AUX daphne-1.0-typefix.patch 1959 RMD160 3973c9964d7588158a78926eaafcbee4e60b1dd9 SHA1 1520ea3dddee2a651634ae43d957461c81f88947 SHA256 116cd49bbf8558bc082b784388269d1095d50acc4139cd01e9f1c075fbfaba9b +AUX daphne-1.0-underlink.patch 403 RMD160 a4f5a59e688e4cce44c75bfd30fe34467e9779ee SHA1 7aa91a8cbf320805ab28feb8bec84f85e314c18b SHA256 42651692b7243af89851eafc32f57e5146a686ea59fc2eee143c79068e6201b3 AUX daphne-1.0-vorbisfilefix.patch 467 RMD160 ee994068c9e767798a663428945d6b4a06057536 SHA1 6c63b3e0689b778a781ba7de2ef58cf5722710d6 SHA256 357a909c253af836f0628ea02f211fbacf9ddb48b82b6bec0d049b5afabbc120 +AUX daphne-1.0-zlib.patch 356 RMD160 887086b2bccaf5165813ed8d9ba94b6729ff3142 SHA1 0215185dc93fc1bf5595c46b82559c1211a523de SHA256 3a0b13be874de8c3441ee88047fdc3c1dfd05ada596b54f697b752671cb7f2d6 DIST daphne-1.0-src.tar.gz 4316387 RMD160 23c03ccd7bcddc2bf4616f17da9bd012f9f36858 SHA1 36f40b4d7ac9b9f502c659346a17aea81fe9ab9c SHA256 b3df3cbb49b3b0d1c2d9f8ab9ae22ef39b1627db09b67a4d10122d754443a588 -EBUILD daphne-1.0.ebuild 2241 RMD160 d3dee9ca46ea8897c3b24626fdc74c0448848b2e SHA1 3ec4675f892ec2fe807dd753984d34953200eaec SHA256 ccfce82de73cd9f3da88f1d7bc754f5c89cb96626759b92e0859b11144ae5bbc -MISC ChangeLog 2338 RMD160 1d6eaac41104d2b56975af14d0207e28ededc122 SHA1 a96b8577ba69223d5c02daf8d20ce9a97be39308 SHA256 a63099ea5cda3ca4f8b5758e1ac41bbb9112f7ac5930a3fba385d2917dd2ebf9 +EBUILD daphne-1.0.ebuild 2311 RMD160 3f37f19d2cc0d35c96bbf2cc4d5d21b07cd74ee3 SHA1 2b8fe2949b937e9f4b965435a9ef128c863c23df SHA256 9962768053b4e1faa38e4eaa97d6047d10bddad35b5bc5746fb6ba874ef032a5 +MISC ChangeLog 2566 RMD160 2534183dd6025951cf405779757676f03fa2e0c9 SHA1 3121c92dae6f6ba161b0f9abc33312161dd6f039 SHA256 015f1f0da3e11c10b13913d23af05f7729f7279219d02a208a887ca875fb3e9c MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iEYEARECAAYFAk55v5sACgkQIY77eQFFFC2uawCg63fdzQTP6DApptHIOJQBN122 +srsAn0lrOlgsVacp9ZHXdUVKrYP+trVW +=vcuG +-----END PGP SIGNATURE----- diff --git a/games-emulation/daphne/daphne-1.0.ebuild b/games-emulation/daphne/daphne-1.0.ebuild index eb60a0a4dc48..bd6e7d43254a 100644 --- a/games-emulation/daphne/daphne-1.0.ebuild +++ b/games-emulation/daphne/daphne-1.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/daphne-1.0.ebuild,v 1.6 2010/10/12 06:02:56 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/daphne-1.0.ebuild,v 1.7 2011/09/21 10:44:04 tupone Exp $ EAPI=2 inherit eutils toolchain-funcs games @@ -30,7 +30,9 @@ src_prepare() { epatch "${FILESDIR}/${P}"-typefix.patch epatch "${FILESDIR}/${P}"-gcc43.patch \ - "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-ldflags.patch \ + "${FILESDIR}"/${P}-zlib.patch \ + "${FILESDIR}"/${P}-underlink.patch sed -i "/m_appdir =/s:\.:${GAMES_DATADIR}/${PN}:" \ io/homedir.cpp \ diff --git a/games-emulation/daphne/files/daphne-1.0-underlink.patch b/games-emulation/daphne/files/daphne-1.0-underlink.patch new file mode 100644 index 000000000000..f04f3f6c5fd1 --- /dev/null +++ b/games-emulation/daphne/files/daphne-1.0-underlink.patch @@ -0,0 +1,8 @@ +--- Makefile.vars.linux_x86.old 2011-09-21 12:27:42.480566742 +0200 ++++ Makefile.vars.linux_x86 2011-09-21 12:27:57.490564959 +0200 +@@ -24,4 +24,4 @@ + -DUSE_MMX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DUSE_OPENGL + + # platform-specific lib flags +-LIBS = `sdl-config --libs` -ldl -lz -logg -lvorbis -lvorbisfile -lGLEW ++LIBS = `sdl-config --libs` -ldl -lz -logg -lvorbis -lvorbisfile -lGLEW -lGL -lm diff --git a/games-emulation/daphne/files/daphne-1.0-zlib.patch b/games-emulation/daphne/files/daphne-1.0-zlib.patch new file mode 100644 index 000000000000..dbae7b31fe9c --- /dev/null +++ b/games-emulation/daphne/files/daphne-1.0-zlib.patch @@ -0,0 +1,13 @@ +--- io/unzip.h.old 2011-09-21 12:13:28.911668053 +0200 ++++ io/unzip.h 2011-09-21 12:14:53.074658064 +0200 +@@ -57,6 +57,10 @@ + #include "zlib.h" + #endif + ++#ifndef OF ++#define OF _Z_OF ++#endif ++ + #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP) + /* like the STRICT of WIN32, we define a pointer that cannot be converted + from (void*) without cast */ |