diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2015-05-15 10:31:32 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2015-05-15 10:31:32 +0000 |
| commit | d115e86623de0c2ca91a90e72b0add2f049159f9 (patch) | |
| tree | 463fca0d6216a2506ee1f69eab3f4655a1809df1 /dev-python | |
| parent | Add REQUIERED_USE for tools -> tcl, bug #549308 (diff) | |
| download | historical-d115e86623de0c2ca91a90e72b0add2f049159f9.tar.gz historical-d115e86623de0c2ca91a90e72b0add2f049159f9.tar.bz2 historical-d115e86623de0c2ca91a90e72b0add2f049159f9.zip | |
Fix build with freetype-2.5 (#533516)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/soya/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/soya/Manifest | 23 | ||||
| -rw-r--r-- | dev-python/soya/files/soya-0.14-freetype-2.5.patch | 16 | ||||
| -rw-r--r-- | dev-python/soya/soya-0.14-r1.ebuild | 5 |
4 files changed, 30 insertions, 20 deletions
diff --git a/dev-python/soya/ChangeLog b/dev-python/soya/ChangeLog index 6a4fe4c9f866..10af8efeea9e 100644 --- a/dev-python/soya/ChangeLog +++ b/dev-python/soya/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/soya # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/ChangeLog,v 1.37 2015/04/08 08:05:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/ChangeLog,v 1.38 2015/05/15 10:31:31 pacho Exp $ + + 15 May 2015; Pacho Ramos <pacho@gentoo.org> + +files/soya-0.14-freetype-2.5.patch, soya-0.14-r1.ebuild: + Fix build with freetype-2.5 (#533516) 08 Apr 2015; Michał Górny <mgorny@gentoo.org> soya-0.14-r1.ebuild: Drop old Python implementations diff --git a/dev-python/soya/Manifest b/dev-python/soya/Manifest index 6df5e8c64de6..5461d75cdc2c 100644 --- a/dev-python/soya/Manifest +++ b/dev-python/soya/Manifest @@ -1,30 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX soya-0.14-freetype-2.5.patch 508 SHA256 bb28522fabcdb5fd83cc5f1861123e7f4cfc8ac751da800657d7dc4f19f9d192 SHA512 729cdb429321969ae25ec4f5103f1dccea41e09a6cb2089cf8e1452a2a8d9548267d360ead6e0ca70348d8153e963005f5747911490fe71332921f5b7e714896 WHIRLPOOL e8a40f87030a914c494012dfc7d1adfaae2611aad2578bedbe2c29b1e19598dc68b1366a6b24b15d80eb846f48324645ca6683ae7f0811798efc976355d0fa9f AUX soya-0.14-glu.patch 501 SHA256 523443a2dae6e24c0d3a8502475a8d7a6fef03fa3d098630f57f21297b230778 SHA512 aa834bceba523b387104cb7717701b841fb4c54be4fdd97867031ccad7303f79b99cc42cd855c81d5fcf626e6687205d8c52069da1354b9ad59c7fa7caf3c6b7 WHIRLPOOL 38e6eed05386c03ebb8f244859c7e2f9b9b3f5a085bb3f5092ae11330bb2882b4197863ceae25c03537498483e5c38efa327d9a39249f36c25b5d5c2807a5004 AUX soya-pillow.patch 607 SHA256 cd9014c6642c918c5541084480b3768c07fcbfc7421d90a10a362110dd1413a9 SHA512 2c3bc0626a7c03dcfd9085434c372a06a68fd03bec9293a314c1f4c3a42f99aaedba8d56ca04983ddea9c94acf85c116e1a6e2cc4da7df4fa8e5a6247eb76676 WHIRLPOOL 4905391db04e457037b9c8e2abb26227e1a1d47ebf665f5242def0480f15843d40eb7c1d128d98acd960f86a18ceff0b319c9040bc82eb0ead22f6b168601c7e DIST Soya-0.14.tar.bz2 905659 SHA256 dcb93206d7154dc575ec6eeb7fa3ecfd6bfb78fa233db639e423857cd2a99590 SHA512 3a6d8d0523cd13d1e9e8e2260612f23dfd2d33526b40d11ea1568a3b3c3eb7172ab94b8c8e9490203128c1fbe0b840d29a04d1c7b9d93bd273eb318ad286b711 WHIRLPOOL 1e0df42cb2a066ed9d5faa043c85844729a8f637051c945ad573c3d9510b8c650583b0e5e4162b8ca4ea098c500181e2d11729e39272c9a2fadecf6b0cb83141 DIST SoyaTutorial-0.14.tar.bz2 5223674 SHA256 86d5b8189e7f7b4269976a65f23a51291bb99c6272f2884cbd129a6e9cc6cbec SHA512 484bc93c2561aa1f2c8bd7101b75c8ea5d42a2bae7c0431ef1e7719bd86da2f47fb68129d60ce1923b26cce1b7915ab6576d0c5f6c8ee889736971be166b4623 WHIRLPOOL 035bb56a66e231cb2d7600003519c9eeca540a9eae2ccbfd15c7bda09450bc4ad5ef086f8f871d0f8284cd397e26df34a74a74e7323272b972f1789de771a612 -EBUILD soya-0.14-r1.ebuild 1602 SHA256 5af78919921dfa7ad86e1bfc1a6b19b9c3e816f018dd40f41e0d85b10378abce SHA512 688ca2d1f1d6dd034478d94c2bcad72ef5e9c9efc4ce20ddca8562cc19307b6f0922a2383cb7105227c4203ebec0a210e67447d34c1d53fb50250a41c5b5011f WHIRLPOOL c14d283a3c442e8da33f68b3c771147d7f6951f3bf82151d9ac993658a00eae199ee41e9910982176f02968f63c33d4b9ca2821964ea28b3da1812f75b5bc361 +EBUILD soya-0.14-r1.ebuild 1638 SHA256 e9e6995e2ff4d66ae22166293f2bdf005de836bfb0863d1e01b70fbeeaf54b9a SHA512 9535b81359b52ecca45c2d47c1eda85bf404c7705a03215219cd8c8431102356bb629020fee5def3634b22c2b4e123f26d924065034bd95dd538b12b41b7eb74 WHIRLPOOL f9a85fee74ddcaeca564ca0509be9bcf9a2ff2328def0369a597014f38fb97c913960b4bfe068fb6ca00c194a8bc58ec810fd7b57ecdd9e28209a8ebd453283f EBUILD soya-0.14.ebuild 1534 SHA256 4eedf3d6e7352bb32062f46da12a1e6a68c800da1e652e70dd4438c8a784748b SHA512 c41415db02aad0a5e5f8c03761e2a8758e07463d8cebed607164ed6471dd31828896dbcf4fb062e71c96cb929eeef764fcde9beb04344ed43669ae45511ff82b WHIRLPOOL f0b56c1bd989c061b0b2cae76aee585fc1f210ba027db8e517472349b83f4ee67cc6dad9f6ce182e5df140d459455212e55d4a5caf6cd0c3843da337a07ab590 -MISC ChangeLog 5096 SHA256 8734cdc783bffd5e89d15a2f64cff9fb6a4cfa48ccaa07b0a2d8ca0dc24fb550 SHA512 6aa2b693af794788aaa276b541e7ca005f541915432083c70075640db5c529b74c3e83668cc354aeafe066724dc8731b09e8fc22781b01ec6e22c176900849da WHIRLPOOL 5ddbd8dff46a38fff75835a9a68a5d3f4720f916751f6b22c14a960c286a101cb5b6d961c4218de4f99cb8e9d211d66c0a3f7d8afd372d3cc890dcaf013c0ef7 +MISC ChangeLog 5242 SHA256 c12544f498ec779a548f26b50a62cc53200d962c8e223e99f89c3b3390c0db1b SHA512 555c4016cd7ffac17d914d722a048a394f19302db2204b6ea8ddf018ef72a1807c4db902f32b1b370ae293e40afd31f0d04fd404c51c56da24c11dbe91ddcf37 WHIRLPOOL 82568cbb7c06c69cc3d5b5a93d1ce3181c6686dfe5f8bbeae1cc83e2f32d4511eaa1e17b8b8cc977d62b501449a7efb8f9ec1f8ec5e88d7dd703bacfd3606346 MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJVJOKVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO9egQANgafW1hdPtI6dYZzs8tF1Th -s1dKTrSk3Mf/uZQOwuYlfns0TpadGx8MY/x0gP2/tAzTY5b+3M1PTEtGZhjVKqta -G3RX0y4QKu7yAl21oTdiR/Sfa0S+vTheC9YIrClRfYqXiHxMDLEv7/U5bIEUYCFI -xkpD2G+7EFRlmtlOqocPkPJ56QdadaQYVGATLKaX8ReQD62ExKmwDbsDtkJ/yZTR -QdufHtFGx8BuMQQqSpNSzHaTHvWaOIb3F/2w0EOcnAR9qrvmcm99aSy56q/F8316 -YzjcrzNtURzYNlO152ksXawgPvmN+pMk9bnuF4a4bT/x39abMowXLDhBQQx9mMcn -AvtoV9i7D2/BwX/LY0oxcg80BJZoJ9sfvH6ebIM7sG1lHUIaj9XFStM8rqLsZpv4 -7yPa3plkfFzkbvhdcsDNDAzYIJFf4uK0rk7N4yEiokpNQJpBPQ0fsQyQusmT8C9W -tjrsuH9tHeen6kojVqxK5hwTc9gf4J/MPsvCMRyfJn8+2WqmxHGQBLsW7+ZaEgrH -lGdbC/jcQWsbQzEQEkPONxJMCI9T5VvoACYlkCApPBtdDvBYkbXMsT14/i19F3OK -doGI3gOC0C8ilXOha/PL7XJolzvAVo5rarHVYkz974uYsKm5/0ch4KTIWKw+2BTI -F8jcODpzGFfVQ98zMZ0o -=XgCF +iEYEAREIAAYFAlVVywQACgkQCaWpQKGI+9RuPQCgg2To87FmQ3ZAcd9mDW0K59MM +QUwAn2dEVDLRVBh4uiqjRZ0BrGoh142Y +=/3xl -----END PGP SIGNATURE----- diff --git a/dev-python/soya/files/soya-0.14-freetype-2.5.patch b/dev-python/soya/files/soya-0.14-freetype-2.5.patch new file mode 100644 index 000000000000..a4d568033109 --- /dev/null +++ b/dev-python/soya/files/soya-0.14-freetype-2.5.patch @@ -0,0 +1,16 @@ +diff -ru soya.old/include_freetype.h soya/include_freetype.h +--- soya.old/include_freetype.h 2014-06-01 23:27:17.970830047 +0900 ++++ soya/include_freetype.h 2014-06-01 23:27:35.320864678 +0900 +@@ -21,8 +21,8 @@ + + #include <ft2build.h> + #include FT_FREETYPE_H // this is not do-able in Pyrex +-#include <freetype/freetype.h> +-#include <freetype/ftoutln.h> +-#include <freetype/ftimage.h> +-#include <freetype/ftglyph.h> ++#include <freetype.h> ++#include <ftoutln.h> ++#include <ftimage.h> ++#include <ftglyph.h> + diff --git a/dev-python/soya/soya-0.14-r1.ebuild b/dev-python/soya/soya-0.14-r1.ebuild index cf7374eaba39..f41923999906 100644 --- a/dev-python/soya/soya-0.14-r1.ebuild +++ b/dev-python/soya/soya-0.14-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.14-r1.ebuild,v 1.4 2015/04/08 08:05:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.14-r1.ebuild,v 1.5 2015/05/15 10:31:31 pacho Exp $ EAPI="5" PYTHON_COMPAT=( python2_7 ) @@ -29,7 +29,7 @@ DEPEND="=dev-games/ode-0.11.1 media-fonts/freefonts >=media-libs/cal3d-0.10 media-libs/freeglut - >=media-libs/freetype-2.1.5 + >=media-libs/freetype-2.5 >=media-libs/glew-1.3.3 >=media-libs/libsdl-1.2.8[opengl] media-libs/openal @@ -41,6 +41,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/${P}-glu.patch" "${FILESDIR}/${PN}-pillow.patch" + "${FILESDIR}/${P}-freetype-2.5.patch" ) python_compile() { |