From c6c1d606bfd3bc1e5d204c1af4d956491690d37a Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Wed, 19 Oct 2011 08:06:03 +0000 Subject: [PATCH] Fix graphite detection, pc file is graphite2. Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64 --- media-libs/harfbuzz/ChangeLog | 6 +++- media-libs/harfbuzz/Manifest | 30 +++++++++---------- .../files/harfbuzz-automagicness.patch | 2 +- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/media-libs/harfbuzz/ChangeLog b/media-libs/harfbuzz/ChangeLog index 376399b450db..f524715adeb9 100644 --- a/media-libs/harfbuzz/ChangeLog +++ b/media-libs/harfbuzz/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/harfbuzz # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.7 2011/10/06 14:48:14 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.8 2011/10/19 08:06:02 scarabeus Exp $ + + 19 Oct 2011; Tomáš Chvátal + files/harfbuzz-automagicness.patch: + Fix graphite detection, pc file is graphite2. 06 Oct 2011; Tomáš Chvátal harfbuzz-9999.ebuild: Add missing gtk-doc-am dependency. Fixes bug #385853 diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest index 7aa113063a17..55bdb5f92c02 100644 --- a/media-libs/harfbuzz/Manifest +++ b/media-libs/harfbuzz/Manifest @@ -1,26 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX harfbuzz-automagicness.patch 13459 RMD160 951aead3955bdbfb16a50dfece0fa39db824d2a2 SHA1 a21a323f09e6925d7bc9e6837e526856012d631e SHA256 2875be73250178ff28bb9c084ec2a4840cf8aab2a5a10125b9adabf0f7e06aa3 +AUX harfbuzz-automagicness.patch 13460 RMD160 e6148f09a4c31df716ff5f8bf6c4250449d1f643 SHA1 99d5c1e1ab57a6a35e56531d2daa2cad8fcff055 SHA256 7b9491d7be932ff629156d38b867ee926b3f9ffdf0667ea4f5ba0a6d5922cc04 DIST harfbuzz-0.7.0_pre20110904.tar.xz 457592 RMD160 950d17e1b2e765b47c0df37b62ad64adaa65f078 SHA1 c4e39156086cdb65e5a3d0c9784721a8182bfebd SHA256 1b65864883da8f95f6148242e85336ea6b3a7a98a1659b8b9256c6a76e68bb98 EBUILD harfbuzz-0.7.0_pre20110904.ebuild 866 RMD160 b53dd300cd82d131465410061c294a1205192c4c SHA1 5e5cee7a81dd6f5bff6948a8f56a55b11a4fb673 SHA256 b2dc805f895d5af01dd67263c6c1ae6e8c8bd4f3d431bab90bd20144ae7c660b EBUILD harfbuzz-9999.ebuild 1271 RMD160 5e1d611f7624657f99cdb0b24ad9ab821a5b0f25 SHA1 fc8db4bc36ba4f62acb0aaf248f7c9a6bd5f384d SHA256 8618811636f46010fa0912dc784572853ce605d63faab85e5860a64ed7336546 -MISC ChangeLog 1347 RMD160 e38965c6d2cb4ea4ff6c4342dcfe49104095a8c7 SHA1 1b7e3b42e0f64ae6c337e12046ab69218d95fcfb SHA256 58b41eeda5ac13271eb5b62dbd056651ef0d07d852ea18788c02943b658c8563 +MISC ChangeLog 1489 RMD160 8de34af5dd1454df28e27f1586cc2450c96af125 SHA1 c27146bef0f3fcab59f8796ac97e5e0299e7502c SHA256 af3ed38968360135ba24418f4e8e6f9e56b44897f7a7ebbe2aba48860044a02c MISC metadata.xml 375 RMD160 7d24678ad500a40b6454fbe2e13aeff82b3f3e32 SHA1 c8393eec0ba25f6c5636aad166e1fcb916a16caf SHA256 89dc3ba3ae026693c6a25fc1f768fcf2e8be9a1ea67e351b4c72c4d750421c4c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJOjb+BAAoJEOSiRoyO7jvo8CUP/RGoJqjk8Mc+mPHHfeYpxwBY -BVJdQ/K+DNnk/cRzYnOzNp09G0+Nj4gzLZ+ozZDbxv6lFpA8WISgsD3ftm8VCy6y -SwMX4T9DgtByW1Xd2FONCbfEpas0hWNn2UP8Hn5WT97jf/8Xu5og7s7868W/QpMi -mmiDSK6aJ4ZDA0HZSV2Fne3rKTbNVxVZkz8S1CCwrKGAuCninjOgcy1qUYIr6G2z -f61mkYQ0t0AYZw8Z2DPUjJVa9MBSL7spvxQCsxC2A0iOlPT1JrD8McEiJpviBAI6 -eK/jDWAYNWqsC2T3ELEmATRmBBucIDzbIsJpD7IPJffmve6np2zaTOILCAedp7Mi -zfphHmC8mhANH+pFJKZ7TY70+S25Zbo7HRVb8rxrvPHa14GzZk70tyeSv9AY5pzH -Jar6Q1BNmstEUaybF0ou5VUeHREQTgVY2M+H2zLbeNAh5+4svlHqFxQspxD/h4QN -wvO4CuYBeuaOk4r1cJm5F5C2e7G7cjCbIBKNvXlRVpFkgskqtb/eiKpPfwWubS5G -Qg9OVyGmPZs8tGlUzAi9lujQ8wtW7nOiMrRsfRbeD+hhryuxwrGR7PbOcDG2QUQI -wjlJqYZPgC22FjVtwJeCGRexmrnZ4gjGCu1U6xVdlRE+hfFm1HMbSO0xj0xnX0Hs -pgAqeKtvjP3RLM71Dh5I -=pRzy +iQIcBAEBAgAGBQJOnoSYAAoJEOSiRoyO7jvorOgP/RCtcZipBCqeT/Y1gX1F8e+R +AJWU/QkMwhfO5SFvX9KDfLOI4+kPyK1MvW/AxXSY3ZATdoR8T7lZZKpkfSyx7Ax8 +1KXaQiY+lp/B4haVMutrn/BbXgCTPAUKy/f5Yk3Pa0IQmvHDcxLK9KVI4X5zsuj5 +PimA7bHyhk3iuumYnbiyn+flzJufyl09ks42bv95JEBaDghdQeQk9Qj6DizBpE0I +FBroTDC+9LDYHO8fK3Yfjv8GwgpRuO/DfsRe9rwTO+7n3osSHKXzMHXQr93nUF6v +yBDyvPK/2Ps/FZK1cgH5iimhLS1Rkipfa/WrQHnQhPjk4h+9qAK4kDptLsfSW5n4 +xK9g5l5R+VEmGigYnDPPMy3tTfYGdah7/Klf1zByLxjqZ1+IaqKudV+Kq00Zzwsv +YaG+JTBURKPqnGd/KFM6E11QhIVx16/N1VWZiLXTSI0bTpKyWJ8pCqt5gszI0Ape +erL/l897gnp3xtGjXwSypoQIWkoSZD6AEI1NAYGE91ZAZrCsrE2/65+e+SswV8Vw +PAzzZ8q8H73moZT5Kfj2a7hKnEc6Rxf1muxPE7tkGICjOXDAEZL/BNHJZoMT6oK/ +qCZzw0mM5KC0ODdMl7vaRxw4zVa/tTMgDIC31iQm5dJn5W5xg2srj9r3fVY804yy +zAlGpaB9KkaDFCl98Iab +=4gbh -----END PGP SIGNATURE----- diff --git a/media-libs/harfbuzz/files/harfbuzz-automagicness.patch b/media-libs/harfbuzz/files/harfbuzz-automagicness.patch index 3444e6a583c9..bebbb7142557 100644 --- a/media-libs/harfbuzz/files/harfbuzz-automagicness.patch +++ b/media-libs/harfbuzz/files/harfbuzz-automagicness.patch @@ -264,7 +264,7 @@ index 856fb98..98e0670 100644 + [AS_HELP_STRING([--without-graphite], [Build with graphite2 library])] +) +AS_IF([test "x$with_graphite" != "xno"], [ -+ PKG_CHECK_MODULES(GRAPHITE, graphite, have_graphite=yes, have_graphite=no) ++ PKG_CHECK_MODULES(GRAPHITE, graphite2, have_graphite=yes, have_graphite=no) +], [ + have_graphite=no +]) -- 2.26.2