From df411d75d4fecef42efd300c061aea35a0a98084 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 30 Jul 2015 15:12:40 +0200 Subject: [PATCH] Make stable in arm Package-Manager: portage-2.2.14 RepoMan-Options: --force --- dev-dotnet/libgdiplus/ChangeLog | 7 ++++++- dev-dotnet/libgdiplus/Manifest | 5 +++-- ...gdiplus-2.10.x-use-freetype-include-macro.patch | 14 ++++++++++++++ dev-dotnet/libgdiplus/libgdiplus-2.6.7-r1.ebuild | 5 +++-- 4 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 dev-dotnet/libgdiplus/files/libgdiplus-2.10.x-use-freetype-include-macro.patch diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog index bbea2ca..72aefee 100644 --- a/dev-dotnet/libgdiplus/ChangeLog +++ b/dev-dotnet/libgdiplus/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for dev-dotnet/libgdiplus -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 30 Jul 2015; Mario Fetka + +files/libgdiplus-2.10.x-use-freetype-include-macro.patch, + libgdiplus-2.6.7-r1.ebuild: + Make stable in arm + 20 Nov 2013; Mario Fetka libgdiplus-2.6.7-r1.ebuild: add giflib 5.0 patch diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest index 613cc8e..de5d317 100644 --- a/dev-dotnet/libgdiplus/Manifest +++ b/dev-dotnet/libgdiplus/Manifest @@ -1,7 +1,8 @@ AUX libgdiplus-2.10.1-libpng15.patch 5491 SHA256 ae18bac02341af98ed17b14ee510c33cc87d0637a9cf56fedaf21603aa04198c SHA512 292e8f83cd5a10c99a543a0fe85a9b2770e29627f60afd7e6ab7824b135870d9bfb20c8919ec9104110e645a039f69e7378d9295c330423a2725bb8840ceeffd WHIRLPOOL c33f9e5a164585411421d369ef728fd963367735bf8352567112603f7ce37b91246df517c005f25eb1153911b28af310400aaffec8605a939cdabaa2f5025cf6 AUX libgdiplus-2.10.9-giflib-quantizebuffer.patch 12869 SHA256 84d08006e21b667fd668d921b0d8db88f46e46cbed97d88372e092cf196c8e99 SHA512 3ad5ebd2bf9ef980dd273df9b036284d2217cee9ba09dbb6fa9d5b54da132eab0460597a63c53947d7d3f16b1079284413139937cc58b4694b102d1061e776c9 WHIRLPOOL b385e193652af68934d9400262554f7c9a42018a5a34b2452b859a4f2ad50c663313456efecbe86ce34a0fa9e7e55d4df50c44c8224b0dddfe16807e6dc26215 +AUX libgdiplus-2.10.x-use-freetype-include-macro.patch 468 SHA256 a3a3a89ece9e09fa86b2a60d7aa0a2f08523f78dbea6d64dcb9d34f2c91908f3 SHA512 b87ae7cada9526c6245adbd2d1348dc5db2a9c61e94b892e7223ed39eec6293fa2e2375591b51e815af4b3e03ed0ab1e72942a1703c3643b170d838ab11e0935 WHIRLPOOL 91be5a2d8f52e931cfb39591c282f99b0652888d13aad5384cdd292f2442cdd8a00775f0b2f2268aa217e56a95cbe0308cd732fb6169e4bc2b8ba2ea8046d3d8 AUX libgdiplus-2.6.7-fix-overflows.patch 7963 SHA256 5e0143cf657d9dee39e4e2226816c5acf12616e329f469a7d468f2baf1630627 SHA512 e272c9e4c1b13b1b6b001a02cc8bc9196d5378ded866a6305958ecf949dee74d650416815fd47dd5d637b898f43f207fd7816bbe7778feec4926cf370388a574 WHIRLPOOL 3df48630e3203e99a2352f0d7442ff225ea7879cb0580d39a8cb39a27548a07613367b4f4907db14530967e48d9a0605aaecfbb324f3558087b0e0ed21a2c23c DIST libgdiplus-2.6.7.tar.bz2 1960822 SHA256 7ebe427d6486cdab56fb6715e2d14a484e8ffe5cb6f183e133abca7d4f8f7144 SHA512 e476eded32280f7f87c1c98f7c2148cbe99d4134fb66e7af2fe49b21579a306c22f337b37c26babcf921bd21c2a17fe7aecd850c358dd8701ec8ede2e921f61c WHIRLPOOL 2149d6224c7898b6c65c042fafe8f08db2953f9b4502ea06cea0dd4f50b1bd73b64cb5568422f8b59e9b19e0cec2994db0655b1962cdb504001bd6c3ef4b2e7c -EBUILD libgdiplus-2.6.7-r1.ebuild 1339 SHA256 2e2eb5964f446c6d1efe1d8f0ccb6a4eb589f1acd06eb015c6de79f9bce177e0 SHA512 3dae9458dfa451b22fbcc76a35de8ad6c071e5c3d21470b6b3bbcbf7ddf2750cfc545d31b3de330e7e44d5723f8dd8ca608cfb5d0a512483ed69f4ac3fb3f5a7 WHIRLPOOL 00b0dfec8495a90752de1b5036b1145aed0366bc3a95756ddc7ab04e902c38dff6fc93f049cf2cb2eb82d647bf09dca233dafc8aaae486b5de98669db1a60586 -MISC ChangeLog 645 SHA256 de5f04348480a8372e0782653ad30a5454bc96533545822d2271ce93c94055fd SHA512 f08aef340a6eebab250b77494989a8814553d9d417bab73889d4cbba9e994622014e72872df17557d5bf2b6d3ed13d221b23db3f0bfd61db427c099ece0fa847 WHIRLPOOL bde482b251758d3d0814f8228e157235f4eb9f5151125927625908b16ce17cc2218da9b1fe40f16263a6720b528c8cae3fc7fb6ccfe57de956643b6dff4cbc5c +EBUILD libgdiplus-2.6.7-r1.ebuild 1411 SHA256 026b5f8e3cae7d714d94187160f200fe259d7a3452421a3ea4a5ca53c89fb4f0 SHA512 75ac2ff614a62b9b5f3de4918bf2a32ec49c3a8effe6e3b0394729c37bcf876dbfd7de098a8bad763a23c803f9fa75a76146bd4da6030eaa2edf645ffb275d3e WHIRLPOOL 58652fbb9be5192d389dc055175766ba9ccbc4326b699ad919b7a6028428c652d9ad5e520a838a469fb98259ebc6bd5d0aa30213a0f27de22c5451772548340c +MISC ChangeLog 809 SHA256 d980370a04613f1854452690f467d37711e4a5a637e586f805eaf6e6f15acc60 SHA512 2cbb84c26e19f003ea5d84b066f2f437a4c6b2da3a2c8ab192f5784c8ccda6bac96dc7800426037e8b234f106c36f0fe43f82bce83c4f6e4fbe75254d27f82a4 WHIRLPOOL 200fb7e50b39e9979bb10f204cb4cadc8507f117871c897d138397e7b41058d3f2d15dff9755412e8a185723cf34442907ce8dbf407bd6c87edccee80b382317 MISC metadata.xml 160 SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687 SHA512 087fcbf85988f071b9ce3491d0b6e1a767758e970950ef4247759ef48bcc4335c973dcc53b69fd712ac7e9704614878506fa342ba09edcf1c067e9ee478f94d7 WHIRLPOOL 65533bc6b7e60c26732efd476ed2c3aa0938bbea25140b8402ab2e05f0ac34c7a6d838ed7af763b2ec0a34317fcd8baf814f7c7ea8718ca5901160083d9525b8 diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-2.10.x-use-freetype-include-macro.patch b/dev-dotnet/libgdiplus/files/libgdiplus-2.10.x-use-freetype-include-macro.patch new file mode 100644 index 0000000..bce4e9b --- /dev/null +++ b/dev-dotnet/libgdiplus/files/libgdiplus-2.10.x-use-freetype-include-macro.patch @@ -0,0 +1,14 @@ +diff -ur libgdiplus-2.10.8.org/src/gdiplus-private.h libgdiplus-2.10.8/src/gdiplus-private.h +--- libgdiplus-2.10.8.org/src/gdiplus-private.h 2014-02-05 17:50:30.979205246 +0000 ++++ libgdiplus-2.10.8/src/gdiplus-private.h 2014-02-05 17:51:54.519205465 +0000 +@@ -30,7 +30,8 @@ + #include + #include + #include +-#include ++#include ++#include FT_TRUETYPE_TABLES_H + #include + #include + + diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.6.7-r1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.6.7-r1.ebuild index 4422c27..f3e5117 100644 --- a/dev-dotnet/libgdiplus/libgdiplus-2.6.7-r1.ebuild +++ b/dev-dotnet/libgdiplus/libgdiplus-2.6.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/Attic/libgdiplus-2.6.7-r1.ebuild,v 1.6 2011/11/05 14:27:23 ssuominen dead $ @@ -11,7 +11,7 @@ HOMEPAGE="http://www.go-mono.com/" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ppc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="amd64 arm ppc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE="cairo" RDEPEND=">=dev-libs/glib-2.16 @@ -39,6 +39,7 @@ src_prepare() { epatch "${FILESDIR}/${P}-fix-overflows.patch" epatch "${FILESDIR}/${PN}-2.10.1-libpng15.patch" epatch "${FILESDIR}/${PN}-2.10.9-giflib-quantizebuffer.patch" + epatch "${FILESDIR}/${PN}-2.10.x-use-freetype-include-macro.patch" } src_configure() {