diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2013-12-10 09:51:03 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2013-12-10 09:51:03 +0000 |
| commit | ca7c2115b0f9bd8c01137c48cf0f89d10bb7fb2c (patch) | |
| tree | 2512b44f7c26bb61b1538df6dcbbda1f12fd217f | |
| parent | Version bump wrt bug #485960, drop old (diff) | |
| download | historical-ca7c2115b0f9bd8c01137c48cf0f89d10bb7fb2c.tar.gz historical-ca7c2115b0f9bd8c01137c48cf0f89d10bb7fb2c.tar.bz2 historical-ca7c2115b0f9bd8c01137c48cf0f89d10bb7fb2c.zip | |
Fixed compilation with >=media-libs/freetype-2.5.1 (bug #493588)
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC
| -rw-r--r-- | media-libs/sk1libs/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/sk1libs/Manifest | 35 | ||||
| -rw-r--r-- | media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild | 9 |
3 files changed, 28 insertions, 21 deletions
diff --git a/media-libs/sk1libs/ChangeLog b/media-libs/sk1libs/ChangeLog index 2903a5964bae..0333ee68b2d2 100644 --- a/media-libs/sk1libs/ChangeLog +++ b/media-libs/sk1libs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/sk1libs # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sk1libs/ChangeLog,v 1.23 2013/09/05 18:55:06 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sk1libs/ChangeLog,v 1.24 2013/12/10 09:51:02 polynomial-c Exp $ + + 10 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> sk1libs-0.9.1-r3.ebuild: + Fixed compilation with >=media-libs/freetype-2.5.1 (bug #493588). 05 Sep 2013; Michał Górny <mgorny@gentoo.org> sk1libs-0.9.1-r2.ebuild, sk1libs-0.9.1-r3.ebuild: diff --git a/media-libs/sk1libs/Manifest b/media-libs/sk1libs/Manifest index 56cb8199182e..fbfdc449498a 100644 --- a/media-libs/sk1libs/Manifest +++ b/media-libs/sk1libs/Manifest @@ -1,29 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +DIST sk1libs-0.9.1-freetype251.patch 658 SHA256 1e283f0ee8bef9fc1bdc5e34885be8da7e246e348183a4cabc681f779f0eea65 SHA512 7868690d92ff5721b5c5ee9e1dd4741d47f2077d13fc96c3763e9a132151c787c4a55c8281998a81c2ca2d0a76cc4852091c8af083f84e48bca8bf169b831faf WHIRLPOOL de55a2214b39b8bcd95d56b798702adcd1889c859f849431ac3fe92c30837ed8a425462a2e0335a788ab17eed4c9d60591c446c518bb20f94cb070ecec3d068c DIST sk1libs-0.9.1.tar.gz 1019443 SHA256 bb44520a5fab2998a8013a91874ff109f25bbd8e01bbddafe0b6e7db0631719a SHA512 dfb1880d5bb043395e4ec6e0c9dc373f97d43458c20c95a152a1cadacbd41ac9b3cee30dc55544ee67f7c5747c8be38ca2da816c458bb993069d9f29d72f35be WHIRLPOOL d08b8d94c8c30ba6d58281128b71092b0687c51c22fe1b3fbd149cdd753a6a4a1df7a780d4371824a7b64a7c198c58eefd5d327be927ad7cafef3735842fc64f EBUILD sk1libs-0.9.1-r1.ebuild 1309 SHA256 6aec98ef99259a9dd88cf48256a50d444651b5495adc1adb43c60e82b002cbc7 SHA512 934e061bcf8de278791e769fa0378a7b040f9c22aace045d5b28cd7459d0a5d69cfb4c241182c3dca816d249f2427765e02f6106f9bcf5b1f47acc2a17813f4c WHIRLPOOL 81ac2f6261f3efb775794ff8abc84f47d278fa36e457d35feda7197cb8b8246e610c532e734746066d8476fc14720371fddf66873ac936bcbf9e9111ff55dc2c EBUILD sk1libs-0.9.1-r2.ebuild 1366 SHA256 8d55960f344f20acf9c4cb37f3489c9fa9636b88116ef7eea1df0413006d1fcf SHA512 127d13dc8ad7824f1403b0568f14fbff185c53c7f0b4c87c1c4990ad9bc0b3f33483b9ce2b87b2c0fba75abb05fa2dd7242edc89080f012f26736047c8de5803 WHIRLPOOL 1afe20589a306940b21ad06b30a63eaaf357dce71f146517531aeeb3db12b916ec3194d3a7cb7d81adf4926f104adf62f171b97fb431a0fe3533754123e592e1 -EBUILD sk1libs-0.9.1-r3.ebuild 1409 SHA256 4d6ef6e16f39e5f1fb6ac826e68229924381b11b054abbb3d6c490e540fca20a SHA512 6cab870abf5c7348fdec3021264ea28628ef475fc20204b217a65c327222c34b0191d47574ffb1fca49b7d11ef8f7b6211e3b9bf6d9db0008f490d2c12103c84 WHIRLPOOL 1f3e95c67b97ffc26bf860085c60f8444ee6e5a5ac3921d387198658b0af256cc4954e5d50db4bd68f44bf3a47fda7ca7e403502728d66f0b0cf1629f8ee2984 +EBUILD sk1libs-0.9.1-r3.ebuild 1672 SHA256 8906feff18cb21d0441d8abd64a1b3cc4d375eb74d8656f3ff7052ab1eb0e305 SHA512 3afe7d13206cb3ffe200a566b478748d7b06e48ed4c0a8183eca10c5447393c5a9de646f4eaf1e885b9f0a7d17054e2ae960a9e5e4775f7dce76bbc2b4e573f8 WHIRLPOOL a42e11b2dca6a893c9996ca0ada7ebf4615190c200e090afe9efa964a24546e0cb05b9c23172849ad69fbbacf50130f089e5c2fb7783a14215d0e62f3403833c EBUILD sk1libs-0.9.1.ebuild 884 SHA256 b94c65c8d905e2ffc1a959028b37f0240c33539f550bc0001e02ee4974f52dfc SHA512 79f2adb4ce650a2f0dda78b251e7386034233c89edceff3ed3475e2bc32918df44bba60cb8779201541f065bbbf35a6b69871286c945e28423778efd64a81342 WHIRLPOOL ae49392dc4942ae9e3310b7594ab26bbd7d70628d4c71ac115c57f43d706131921f14b478b1969d10c83cff2bc781aef7768947eda7039162ffef51dac345568 -MISC ChangeLog 3032 SHA256 65b010b7d530ccd1688e2201c71e33f7084d0f17c7f62b4cc268bd920526a470 SHA512 e5d90cb0e85de468700db56994b1726b7fdd18049b535478fc7fa46cd372920c3c20d7628b4c0a76d8b5f5e0ada500cbeea196b0c47d0e9b68db89c9b0af7d64 WHIRLPOOL d4c36231da2e27ff04d80ce8c52571e6d250b616453ab35a30208aa56557c72e162e05d5f22b90d360c2c41e7df7b418e4f9b0ebfb844b22b8d9ea7fff237033 +MISC ChangeLog 3186 SHA256 4c8a977bb65d4c1ae31bd973c4b1f46dbffa3f13e98df017da9a9c56d70b5b1e SHA512 fe44e3f3392ff5d7c9d316015567653d74c1a2563523da0cff8eeafe7f8fd76f6f9edf70d2bf5fed08141d0c798b692993ebd6c085c75d84c18391929a337e26 WHIRLPOOL de7d16e24268d5f6cad014e001affe6351171ffb96477ebd8eeae181e230bdade1e74e77b3f5e279a0813345308bc6a18493656e81c63ff866f317ebfe0e4a0e MISC metadata.xml 360 SHA256 21e4a8e8f8294265f2277f640ec4a60adb995404a5a1dda8d7c4e502df28b200 SHA512 2de604046fed652f3fbdc8e3a50516124017b198f7e0bb0f3e162091f9792009e9b6097945e4e5788bafb25e73a8354ae576e37589d29f41c1985949c5ca03df WHIRLPOOL 12447244ab4db1fd923ac6824a9f6496559934e850e4ad3c03ba99efa67024b902b386f863bd3ee7fa273b58d9381507f4a7b704f325880abc56c08747d77957 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.21 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iQJ8BAEBCABmBQJSKNOoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO/UsQAMFYXDeed/OanwyB9T6+/yI7 -YK+Xm2q2sQ09CWhDTJkY7ffJeUlTFw+zuE9c26+vqd8jGUWEXQDixiEptwNMVGbX -uitQgwVhXaIZh79FXcLlpZpolkxt6ZiPDTRVmW9/3GTRAlHJpS0AYwnrHXfuU7/A -OxUW2QGexPnSFNjeKscnYZLfk42Jt3AMRjIFm/LtGxATtlymIFQ3TgEvzjtYbn54 -UfBUmYf09BNG83lxf6e+e9qLNCMs4vBu/aSORyu9PD00iyqzS9/GWLpoImUB+mkJ -UgM/KVtH53SPEUP0LAVlzXDpnAyvmqnqNZxeZTqZJa/IQLvcQ7k67xE8cgmle4+V -omryarKpq/FtqNQuoFLVin5jLrsRyolv6PsW3n07QqF8eFtMCGm6FX9Exxp0Y/hZ -z0UEYYrKU1aoKc9eNGjXEpQ0G7vPqEm/Z81C54LGjEppXdJaEv3gKb7iIo2aHzS5 -lSBZ48IwhCVL2F3/cztj1y4gCtnOlDwpzY6gLVTeSbiA8OzOniUZTZpYDWws/Abg -k+JgzPRfEjX7qBM28zGSOdzR7u02IWNc1mKHQdB8fKH082Tl9nqda2pAQdFJ6Cl7 -VIHwM6u36SDJW3Xq353+nF1ifRPDghwW1l6mbcG4ghN8Vu3DPZB4/2jQmYWtQkDP -rPbMyEdjvwjbHy+J1umi -=jEKo +iQIcBAEBCAAGBQJSpuQHAAoJEPiazRVxLXTFmlwP/3NLFBrSWdYUXPqskMF1hlAP +HUNeFy/OxMmBu5PAqzk3vzGz9aPy+hcKwWzISGN6gkCCyVi/FxzE8LpKpoy8WhdO +Aj4I9eYJAZWvJO+kW59shYB6yMShrs/ffH7/NXinN5TxV4UrPM3n8g4t3DpSIoPc +bvidvV4bHaG60OD+m79yWxN3BfFPR2t4JAuH1kwFouzSc6nbCHVtHZGh0PhEMxzy +xsqRLqAuoAKYSfpgSlSK9ePssQA1qflSnXuhJAuZVCOwxzmKKyUs3cATniL6RnEC +ekpC0JaJc3cHPvpOYEYMazVbKuS7GR3xhTyJjmB/NiB/mM3Z1r3Qq6Vehiuyc9Lt +JK8BUiW2/VuA9D4iq5WqEqxndc8eKEZge9l8jnCQbelPWgkLpMT1k7XdSUWdxYgL +ZCQqUYkw0GoQluZEkebUIz0B7ieVvL9bZpEndNZreUlA0ZneARbiRp+qpR3nulfE +f9nfM5wNGHZJxPy12sMdReDZZD1Wx7ituM74AGt6nYI9ONKnshtWEPYKRUptRk3o +SxRLJu5QftSVV2IUn/7TfETp9XBqVFUcKaIXBg12BCBoxsv7jTmZo7bO67fc8GIY +m878p/Xx2AF7L0KGcCAD9E/3Zvyd7LfujG9bx/npKHMJ7icfj77jV2M+B2kflop+ +V7E7dyDNrLBR6+10MFfZ +=816d -----END PGP SIGNATURE----- diff --git a/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild b/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild index 2d6862e0006a..502b9202149b 100644 --- a/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild +++ b/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild,v 1.3 2013/09/05 18:55:06 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild,v 1.4 2013/12/10 09:51:02 polynomial-c Exp $ EAPI=5 @@ -10,7 +10,8 @@ inherit distutils-r1 python-r1 DESCRIPTION="sk1 vector graphics lib" HOMEPAGE="http://sk1project.org" -SRC_URI="http://uniconvertor.googlecode.com/files/${P}.tar.gz" +SRC_URI="http://uniconvertor.googlecode.com/files/${P}.tar.gz + https://github.com/python-imaging/Pillow/commit/c6040f618d8f2706a7b46d1cdf37d1a587f9701f.patch -> ${PN}-0.9.1-freetype251.patch" LICENSE="LGPL-2" SLOT="0" @@ -32,6 +33,10 @@ RDEPEND="${DEPEND} " python_prepare_all() { + pushd src/imaging/libimagingft &>/dev/null || die + epatch "${DISTDIR}"/${PN}-0.9.1-freetype251.patch + popd &>/dev/null || die + sed \ -e "/include_dirs/s:\(/usr/include/freetype2\):${EPREFIX}\1:" \ -i setup.py || die |