diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-06-10 23:01:12 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-06-10 23:01:12 +0000 |
| commit | f18e563dfe5ac04fca4f9f3c50f4ad3177337621 (patch) | |
| tree | a9a7b843ecd9572d8f6c1e218ded472be476e2b2 /dev-games/cegui | |
| parent | version bump (diff) | |
| download | historical-f18e563dfe5ac04fca4f9f3c50f4ad3177337621.tar.gz historical-f18e563dfe5ac04fca4f9f3c50f4ad3177337621.tar.bz2 historical-f18e563dfe5ac04fca4f9f3c50f4ad3177337621.zip | |
fix compilation of USE="static-libs zip" wrt bug #420293
Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64
Diffstat (limited to 'dev-games/cegui')
| -rw-r--r-- | dev-games/cegui/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-games/cegui/Manifest | 18 | ||||
| -rw-r--r-- | dev-games/cegui/cegui-0.7.6-r1.ebuild | 7 |
3 files changed, 19 insertions, 11 deletions
diff --git a/dev-games/cegui/ChangeLog b/dev-games/cegui/ChangeLog index 64f45c7c59b6..af4a6437c422 100644 --- a/dev-games/cegui/ChangeLog +++ b/dev-games/cegui/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-games/cegui # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.47 2012/06/07 21:51:20 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.48 2012/06/10 23:01:12 hasufell Exp $ + + 10 Jun 2012; Julian Ospald <hasufell@gentoo.org> cegui-0.7.6-r1.ebuild: + fix compilation of USE="static-libs zip" wrt bug #420293 07 Jun 2012; Julian Ospald <hasufell@gentoo.org> cegui-0.7.6-r1.ebuild: fix static-libs useflag wrt bug #412675 diff --git a/dev-games/cegui/Manifest b/dev-games/cegui/Manifest index 8825d0e5d509..96ae31ad1fe0 100644 --- a/dev-games/cegui/Manifest +++ b/dev-games/cegui/Manifest @@ -14,17 +14,17 @@ DIST CEGUI-DOCS-0.7.5.tar.gz 11001948 RMD160 17455c07b56594bcd150a1e4f9c31ff5bdc DIST CEGUI-DOCS-0.7.6.tar.gz 11809064 RMD160 d855ab9b05dffe7975d976453a59821cc09727d4 SHA1 bd1085b485c7a279679f6db1554d6624b03fefab SHA256 891285f68284b75211874c27bdea55dbc351233dead261ec0c6848eabfe16894 EBUILD cegui-0.6.2b.ebuild 2503 RMD160 d33f974cf0fe848214a2b4ae9fa2fcb8643818d5 SHA1 758a342a95611edefa3542a053c54aba4a0157ad SHA256 be76082e512f27fb71cc449834c7f280bc561cfc8addee74c1a826973f1a03df EBUILD cegui-0.7.5-r1.ebuild 2766 RMD160 92867c0adc15f502cba88d12a08d40dca25af0ab SHA1 a1f5e92cfa581dbda304deb5b08bcd9cd9f7490e SHA256 6386481560bb7824176ea4c648b9374ed0bf8b1e95a960840aea5442cd37089d -EBUILD cegui-0.7.6-r1.ebuild 3641 RMD160 038907e5d06a9077bb0293edf7e061daa9a7aad0 SHA1 65a425506522dae866eed2eefee13ececdc9e24d SHA256 5955bb25cb6dce90dcf84f588ab154396a7d6193a7106f08498355c82f7d0b49 -MISC ChangeLog 6396 RMD160 e5a6722535c9b0f5ef21aaa0301034e669a042b3 SHA1 a5de78aba08a144e20c276530c1065f33cbd69bf SHA256 ae1ffdf61c1689c651609a0b7710fb266d5b7e053a49220f6b5514ab9837ed18 +EBUILD cegui-0.7.6-r1.ebuild 3841 RMD160 ec963f621e570881beaf2149d45ce0baca3cd92c SHA1 5781fc2237522f3176df95e40b59fd1ce3aeb60e SHA256 5e01872e3f1dcd4f2aeeac9fa91ac902665097b6fb2360c6514bbf69971b536d +MISC ChangeLog 6530 RMD160 8221cf61d89dcdf069f47e292183b9be86ccff38 SHA1 bf7571dc73f8760c12f7e01c8918d35f0130b2b7 SHA256 09b01f63b10853054491046b8d5898e8d90607024c70930c91b27f94746dd895 MISC metadata.xml 558 RMD160 528f673643b01b6b0999eb432da7b92ba67daa78 SHA1 5cbd46ca0d6ed654b23c86b9569304bcc6378bfc SHA256 9b89adc7d9ebb8284daf3aaeb00facae942818a075698be43a1b9911e1ad56d9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBAgAGBQJP0SGxAAoJEFpvPKfnPDWznGYH/iE+x0AxxjwpHmT3+NCOxaxO -WvbN6lai+vLhNpjUvYH0CcYPx0yatkqahVS1Ia0zg8n4Tadu8mas4A+OCV0bcOu7 -7guBFtjUe9BiYbh/quydc8mjpQ4mALiCiEsLbGPkF2Ayj27u9opnsd2FX5r56OJI -jgeWn5O0E0o2dSxdKrIhBggngupAea0GXG9l9lVr0hKYuRiPG2roSmGYep/nWKm9 -pU0fVW5IFM/QOgWT5Mb+7XXu9Fl0jLdODQfvUdhhVSE5Mkk22NjIghXDjVOse4DQ -q90VaQQ/58C2n6oZbKOVFXh1zrpkRfNX5rl8Lv0ekdeOHXNKkwZiYvF141NW6Lc= -=aX5l +iQEcBAEBAgAGBQJP1SaNAAoJEFpvPKfnPDWzva0H/Ry9I7nHCH/fz39DiAEuFiJf +UrI1RcOcf6NYdMFcUyNtNnQuI20exjtDcpAufsdgW8WNrUP5Wz17i86j6AffOnhI +xTwftP2YVl9zQGEKVPV8Od9v3ORGxOmCq1jkI3+PGF4vLthqM22gDDDaMH4iUs1b +1uvy2Dk54w5WurxH9W1v1wLtMx5qAQrOe5hq3cxzF0H5G+uh9F6jIycoU/aj+wqU +H50NSfHFMP2Bj9eizpq/RqPtza/Or1ZwaEXc7oRL3MwRCNXSyl0lNPZQm6cjhNGI +GZ9m8qM8XHXNpw66QOSPcLFRZylX+LNstFN3OINXy2veMBD4DnBP7kgpiAz8XlQ= +=21ZZ -----END PGP SIGNATURE----- diff --git a/dev-games/cegui/cegui-0.7.6-r1.ebuild b/dev-games/cegui/cegui-0.7.6-r1.ebuild index 9dd3240cc5c6..5ac450c18dd9 100644 --- a/dev-games/cegui/cegui-0.7.6-r1.ebuild +++ b/dev-games/cegui/cegui-0.7.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild,v 1.6 2012/06/07 21:51:20 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild,v 1.7 2012/06/10 23:01:12 hasufell Exp $ EAPI="4" @@ -70,6 +70,11 @@ src_prepare() { cp -r Samples Samples.clean rm -f $(find Samples.clean -name 'Makefile*') fi + + # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug #420293 + # and http://www.cegui.org.uk/mantis/view.php?id=813 + sed -i '1i#define OF(x) x' \ + "${S2}"/cegui/src/minizip/{ioapi,unzip}.h || die } src_configure() { |