From: Ben de Groot Date: Sat, 18 Apr 2015 12:45:32 +0000 (+0000) Subject: Version bump to development snapshot release. Roll new latin reorder patch, adding... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=74da6950cc466347f25e95e166a7bdeab9fd06f0;p=gentoo.git Version bump to development snapshot release. Roll new latin reorder patch, adding Liberation as default font family. Add 3 post-release patches from upstream. Drop old. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x4FDF9CFD2FAC514E! --- diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog index b3fa04ada1a1..da87076fe25f 100644 --- a/media-libs/fontconfig/ChangeLog +++ b/media-libs/fontconfig/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for media-libs/fontconfig # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.208 2015/04/17 08:45:38 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.209 2015/04/18 12:45:21 yngwin Exp $ + +*fontconfig-2.11.93 (18 Apr 2015) + + 18 Apr 2015; Ben de Groot + +files/fontconfig-2.11.93-addfile.patch, + +files/fontconfig-2.11.93-fix-sigfpe.patch, + +files/fontconfig-2.11.93-latin-update.patch, + +files/fontconfig-2.11.93-rmdead.patch, +fontconfig-2.11.93.ebuild, + -fontconfig-2.10.92.ebuild: + Version bump to development snapshot release. Roll new latin reorder patch, + adding Liberation as default font family. Add 3 post-release patches from + upstream. Drop old. 17 Apr 2015; Mikle Kolyada fontconfig-2.11.1-r2.ebuild: sparc stable wrt bug #520010 diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest index 1ebd2733ffed..677686c78725 100644 --- a/media-libs/fontconfig/Manifest +++ b/media-libs/fontconfig/Manifest @@ -14,21 +14,35 @@ AUX fontconfig-2.11.0-baseconfigdir_fix.patch 576 SHA256 94bdda4f676926e38a81e83 AUX fontconfig-2.11.0-solaris.patch 1294 SHA256 b7e283ba13df3723d216134510f1d75a66a1c18430c230fb341117246a8bd151 SHA512 f1fa71cf698a4ba122950a6009c2ba78b75ff697d3d55ab5afa777eeab17e8e1c2f20b1a50423556d405b8eeeb0568299b2bb767cc6b650db815c77b3fed0eb9 WHIRLPOOL 46a92d1b0abe36b1f62c3dc8b21855b6da6f45d22a80e863e6ee16a93ff132b5c75b7b5b3c00dc4d8253fd78e03c97a5757140e2997c33597c118effd7099a74 AUX fontconfig-2.11.0-solaris10.patch 1867 SHA256 35e8215ea28e39a8b3c26a93fa2398277e4785a31751aa7a0fe574eea4fae1dc SHA512 a7cee3c525a4edd05ed41c11861f967e00352279c32d07a6ba3d1e1b51dcbf3bffe53154ad847e6744b05feb14425dac170cdce8d25481309f094ab31376c372 WHIRLPOOL 19c052c55511f145085bc30af172a75113ba7ac1b599ec8f7ac39e90735ad9918419000945da0fcab3850738ec09a8ac15939563be413a5a58ce36616c1caa8c AUX fontconfig-2.11.1-fc-cache-r.patch 854 SHA256 e2ff1b583ff569a3cb9540d6b5ab6ed2c81e8c7ff0c5557646c2e8c94714b963 SHA512 6f9fc84720fab01dc86ec626501114b5e8ab979e87057c40374afd31deeed4b424e5f576734a0214b666a8b1867294da138f25d8b4fcf39e1bd99ca951ff48a4 WHIRLPOOL 0aa128a1b71d170a85506e8ed7e6c18c469d42fa3884f017fa6bb1fae424bec582f8efc1c7fdccc2fd9abaa7961e9c5ebb69bf90fe08833075e96f00d9682283 +AUX fontconfig-2.11.93-addfile.patch 3593 SHA256 e3a740d5c4399d59652cf22300ec921a80f98f171d1f6a1fc7b5f4e288d32971 SHA512 41dd49937f16299521b99adf41d65fed8301b166b0caa02585805cd94db9614cae57fbf70786d87b7e4fa07001adc2e38ca4e9b75161eb5e14f72686a6ef2cb7 WHIRLPOOL bb1860de24e6c5ccf2bdf473cd7deddf591d5e257f28437ea9b6e30122c51a4461ba8d1b95c7258dee363a90f8054c49616e15c296d9fcb7d7851644e3a1017a +AUX fontconfig-2.11.93-fix-sigfpe.patch 599 SHA256 5580f57d07f58aa4d36f5b3c278dbd87ebdb3822406a6c296a35e9381654ea06 SHA512 4160353b0d84ffdd07075e29667e239e8f2073667c1a73bd29f8a345637193697d44dd489605a70b7b931c76befe50083ba2bd9175232b01b498955f59302a60 WHIRLPOOL 1740cc8d421245bc1437ecd8ea6b59755d247382a707bb23fb41a71d726f000b816ebba6a34e903332569eea876d1e42870e3017e760aae28886666f58fc73e5 +AUX fontconfig-2.11.93-latin-update.patch 2092 SHA256 fc5bd4f92e2db3dcf11ceb4a786cd89c6301d6faf5a18c236af00cc6d9eb4ecf SHA512 27e9f6a9e49965f8a078d49333bb156796f900f98c904e479f3a2433f5cb80604d4a9cff118e411bfd35c5087b63b5df078b72cf39fd7138f083ecbb3ef9f422 WHIRLPOOL 22c1be498fc2df41679a4e799b50829550f57d293b28fdd191c6af4cfe555f2145aafc4c257c79e8ee823ee2cbae2c2de60d2069c32ef0dff1a6ba8760923bdf +AUX fontconfig-2.11.93-rmdead.patch 504 SHA256 d6d999a6b2adbfff974be679393e823af736fa1cc0dee566dd95a556ef559c10 SHA512 6cb5297e63d6cf639daae16cfc3d4c6b0cf0ce9a6912507c2b212e0ca79db34367f7ca6493cec9b6556731488b22482c7585d38eba8ab170c089db6d145c2199 WHIRLPOOL 72f1010e25a9dc024147a72072077df5abf9b3954d158a9cfb1ef188f014fcf3893f693fced562623a93e0ee31a5dfbcece5778dccebe6913e2fbf7e21eb0131 AUX fontconfig-2.3.2-docbook.patch 506 SHA256 c6480dcf19fec22126a9205fa3d9b317e5a97613f86218cf1926a2a07848afd5 SHA512 8c5bc39c6d5c3b0457c626c678c0a7c94c5e5a4f041b5b2a42df04701750961e24950135d2e6df4d4e1c64a7f28e50a2533ab154d7226cf0a63db0853149f64f WHIRLPOOL 84de35d8f5755a10eb170b2f54afc5b89f4c1757b10f053adc9b5e96aebcd5bbfc47d16963f01a2b3bc0f791a736439b3317f823221794f9fc93e5c57162734f AUX fontconfig-2.7.1-latin-reorder.patch 1701 SHA256 cd27212a9e8a3045106fd427f2e5079ea348789c8760e7af443c2745479c8f82 SHA512 8fc514649e40ecd0c52e4fef9479e0945baa3aaa396335650bf827a983f6d9187b0f66ab97bf5b11b14917518b2e955b0a1bca126a336feafbebf754ff646d5d WHIRLPOOL e6e90c38c7ce04e297c48f5b9859c5e9230a59e9722dacde5ddd434cca8fbd33fab55f704df540eea3f3efd6ee05884987e6ce5da544d2b41f869e47ce3d259d AUX fontconfig-2.8.0-urw-aliases.patch 509 SHA256 4a1e122dd3b140765163ca72eba8c2c52daa9e9459ddbcb6a2eba9a5bebe76d4 SHA512 774c57a28e10eb666c18e69dd7cf59fe1110fe13bbbade185dbd21be4917d4d7fb632be56805b2739ea9b47ee96560c8dd1d3d1916fed56ac32a16757a911f7e WHIRLPOOL 11d7056d1830a7e48aea00a22bb81397c9025f59817fd476dc26083e7ac2603aefd2ace261dfd04df78b6caa8d9c07f66027f37438b4677a7efe28b3cff260b6 -DIST fontconfig-2.10.92.tar.bz2 1525585 SHA256 1162059927120f2321f12917189b524e6b2f09e11ac643278d0bb82634035b22 SHA512 b09996f1715a1d563cfc95a986847d0895fff96fb8a5db4b006a560764654db749675ed5d4ca2369296c0f6d2c21581e63892df2883d021ff6b92ede04788a1b WHIRLPOOL 75164908ce454c26583afde9575e4dac2985dd947f8abaf3a5173777fc738c11430c72674c342ae9445f2a749d0414b7d291032203f62e2cb5d6db5b119f14f5 DIST fontconfig-2.11.1.tar.bz2 1516095 SHA256 dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99 SHA512 acf4e6293e0e5521e4b8f29f4b48860ecd1d39744d0eab21c7332e56bfc3ccc63548e459243c5e425b8e5ef265f2cf065eece02460725e794041219d41188149 WHIRLPOOL 45009a1e0fcbbe2f532c6f642a0d57af35af3f6abfb50098c89fe39c71da96597078eb4babdd80a713ef4456e07481d70def7c1c18b7314452136d5b30a4858b -EBUILD fontconfig-2.10.92.ebuild 4313 SHA256 440dde767dd92ef8c12f275e72c44b0e68ab33e25968dbb89d88646cd19a454c SHA512 10f5dd710cb14ee732c92f37d718fa60f1695a5f85a35f5162fd555473fb07973abe2972416cf3e5ba78693c194a8b6d29b4a89c3932228c695eea24154b1866 WHIRLPOOL 187c811266addf63321b82e25282a6a0530328199932253a0bb939e6772b7418a6be514278580ecf61056f14a12ebc83bdb6ebacd07327832367bfea68c33342 +DIST fontconfig-2.11.93.tar.bz2 1565609 SHA256 381e7c14c7a8bc268a9c07589837f0ea24139abc15f46171b7f94751c969a0af SHA512 68e1728884e4c1bc236cd164fe0b8912c194e8b69bcbffdb3bc8a718737e640061d01a543d90d4198fb2a2d2df0d36b40fac40a27d9845579e1893428d3a22bd WHIRLPOOL b596c1e015e48945158d9d8ffe5e1bf91e6912ac9187fefa829960897fba5c9810ff73ec5ea255b6ca490adb768bd20a50ca0eda41763824cd59b180071600f2 EBUILD fontconfig-2.11.1-r2.ebuild 4935 SHA256 728ad35b973e860892c52eb38de22608fa1be56d1b07c47061b770a0bf3bda90 SHA512 d418b56759f561506bc596aff4ee49bbd44869cb4d9da0a3b9724f49696af1fa2e15527ab67ea319673f38acfc24a94aca559abca7f4dd2bd0c957f9bde8d5aa WHIRLPOOL dbdd342240be986d1c3991f1cd4cac12fc6274ebaf9bd412f296eab09f6093e73107bd3f4cf5bda047399cb847d5a7a1b6d0ce987d726dc57ece33c0fdf15812 -MISC ChangeLog 33334 SHA256 e0edd29f52d3bfeea71649bb0dd85c2829e3084390a5493b1286549a19f92c76 SHA512 30e434ce92fbda3cff8e1836eaf2072a516b9a7d7ed0d169e883f7d99552a5015d23dba8bedda85aea8a51c45948127a77eea0f14fa7f115d008f3d4c38a45ed WHIRLPOOL abfb1a4e19c63552bda50d9da6f9883999e853ee4a3ecfab23e95eb86fb2d1481b0dad9ff7c8faaea3f338bdfed34885cb7930103431c83c19890da1d2e13a63 +EBUILD fontconfig-2.11.93.ebuild 5032 SHA256 392e5099625d88b6e9c483f7089a4ebbe32a57d5b1e8d88cb00b51fd11ff6b2b SHA512 b795f66d347485ebc41cb3cb26c5724afc6f2dffdaf1a82c3271cd8ca3a095517cf4324ae0f68b1bd32a3aeb6761f260c4169be1ae8da89ce2930ac932de07ba WHIRLPOOL 1364b982006a3551f76b25894e27c7ba23f810c2707aca49f2ceb8887666601f8efc7d4de89c2541fbd2434dfe56ac920b1c1a26a1d5e1aa4dbafcc6eb76698c +MISC ChangeLog 33830 SHA256 4f8cc7d56048b92291909b8a9190adc966fbc82b0119ffb8aefdbfc8bee69412 SHA512 bcd8a9ea3f20cc45406a87f2009fa0c1e142e0d8f748ec4c45120106233188985171c25c53ed1e97542da7908a060bbf8e514a244e4d846897ed7d69546fc312 WHIRLPOOL 3305fdec2f1c5affdcc7d33181abff66b3aa2483c2cdd2c2fe08e310ec29f1aaab2579e435b90895c72a082bec813df5458971670b8ae553151d387bf379ae3a MISC metadata.xml 727 SHA256 90e4744ccb449b368e08690f44e02d4d8812b2a85223fb28943e5cbfd9bc1cbc SHA512 57e7f4ccb02227afe7ff2a9e2ad78a7ad54932d900a82c470bf0a71056357e8393d27c73e7f9f78940d8dc35d83182a14a0ca8feffe4c08a029c158ba343724d WHIRLPOOL fb47925fc948cac4a70befbf369a1cafcc94b00b607e07709692288fca5dd4fadb2e8e2e0b1e495d92ed3746d9fa9d45fd45d6aa4dea403617aa78b13e8b4f89 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.1 -iJwEAQEIAAYFAlUwx8EACgkQG9wOWsQutda55QP/fVDZFBYVxWZIotiqEzBCAImq -VMBIoOlw+Ex52fkNn5v1O0085S8ZWbPnmZXh6O9DsY60xk+YaURR9dAr3+hIr9r7 -dhKcElnhO0gnzIiWGyqYl+Upvq4T8/p/Q8FWrk2cOtThGfLyDB7sy3DcQl42XSth -1EcfNZurXZZMkYQOWeA= -=rMpK +iQJ8BAEBCABmBQJVMlHlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0 +RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFO+1YP/2PKxY1/OhDMN/uy13lQVc7B +q7eQ07AnklNfR2gjCOTKvMqSjQlG8TuZL2wVSGFFiUihZbcupYwKWhBaFeYca7Ui +Mfz0hwEj8zt7UZw6vDJqV9W08Pi6KDtE3iE9kk1RmwJ2PoyQWS88l8QTvG5tUljI +bRqUl/1yKr+q6RU62WyXE5p0xddMX+xzehP/Tyc6DJ3ggx7JG5EYp9Y2D9l7Ic17 +P37Vs8KpnTFIGFSOWebo2pRccIDG5oDQ/HBlL/Np5JhnTzxsdB2lkSiCwPyK2QPO +auoCx3gzSKNBuEjag6uD9T/uhso2Rg8tmidDzb2xqZPGZ876+93QfEb5nHEwBVZj +7p3emGfN2a0K5N+d8If1FJBHK47Q2MQBnFdV/vKpZ/fS6neHZVnTaLiVNX70V2iS +3ye/y0h3MmAaiEg52XqhuBHjxqtABKnEp2Zfp3DSzKtcZdDqoDqOCAX9LgAiBh5U +ZD+YWO3mZ56k/h3QyaK5n0/RnxLT+3SqmE64SUUIjJq6MaKW0AMqKnIByxlft6+u +1V4Ib1hw5AF7yrCvsSSSnGqHBjT/Jr1nW5o4u2wyjyLHw3SLGUNW0ItLYA4tmtUi +7I7rn3vGNbjxmCN2913NmV03vs4ux7d2oS49l+0/Kgmv9uVXSjVytbX0ud5OsH02 +2jmwdUETsD5Rayh4//nc +=AZrD -----END PGP SIGNATURE----- diff --git a/media-libs/fontconfig/files/fontconfig-2.11.93-addfile.patch b/media-libs/fontconfig/files/fontconfig-2.11.93-addfile.patch new file mode 100644 index 000000000000..8b96da2e5946 --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.11.93-addfile.patch @@ -0,0 +1,109 @@ +From c965c9f67759585909fa03236bad826de85bd39c Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Mon, 23 Mar 2015 13:30:59 +0900 +Subject: Bug 89617 - FcConfigAppFontAddFile() returns false on any font file + +Prior to the change of 32ac7c75e8db0135ef37cf86f92d8b9be000c8bb +FcConfigAppFontAddFile() always returned FcTrue no matter what +fonts was added. after that, it always returned FcFalse because +adding a font doesn't add any subdirs with FcFileScanConfig(). +so changing that to simply ignore it. + +Also fixing it to return FcFalse if non-fonts was added, i.e. +FcFreeTypeQuery() fails. + +https://bugs.freedesktop.org/show_bug.cgi?id=89617 + +diff --git a/src/fccfg.c b/src/fccfg.c +index b92270b..5467493 100644 +--- a/src/fccfg.c ++++ b/src/fccfg.c +@@ -2227,7 +2227,9 @@ FcConfigAppFontAddFile (FcConfig *config, + FcStrSetDestroy (subdirs); + return FcFalse; + } +- if ((sublist = FcStrListCreate (subdirs))) ++ if (subdirs->num == 0) ++ ret = FcTrue; ++ else if ((sublist = FcStrListCreate (subdirs))) + { + while ((subdir = FcStrListNext (sublist))) + { +diff --git a/src/fcdir.c b/src/fcdir.c +index 00dee72..2e7f0dc 100644 +--- a/src/fcdir.c ++++ b/src/fcdir.c +@@ -136,6 +136,8 @@ FcFileScanFontConfig (FcFontSet *set, + ret = FcFalse; + } + } ++ else ++ ret = FcFalse; + id++; + } while (font && ret && id < count); + return ret; +diff --git a/test/Makefile.am b/test/Makefile.am +index f270b50..bf1ec24 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -24,6 +24,13 @@ test_pthread_LDADD = $(top_builddir)/src/libfontconfig.la + # to meaningfully test anything, and we are not installed yet. + #TESTS += test-pthread + endif ++check_PROGRAMS += test-bz89617 ++test_bz89617_CFLAGS = \ ++ -DSRCDIR="\"$(abs_srcdir)\"" ++ ++test_bz89617_LDADD = $(top_builddir)/src/libfontconfig.la ++TESTS += test-bz89617 ++ + noinst_PROGRAMS = $(check_PROGRAMS) + + if !OS_WIN32 +diff --git a/test/test-bz89617.c b/test/test-bz89617.c +new file mode 100644 +index 0000000..389f470 +--- /dev/null ++++ b/test/test-bz89617.c +@@ -0,0 +1,38 @@ ++/* ++ * fontconfig/test/test-bz89617.c ++ * ++ * Copyright © 2000 Keith Packard ++ * Copyright © 2015 Akira TAGOH ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of the author(s) not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. The authors make no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++#include ++#include ++ ++int ++main (void) ++{ ++ FcConfig *config = FcConfigGetCurrent (); ++ ++ if (!FcConfigAppFontAddFile (config, SRCDIR "/4x6.pcf") || ++ FcConfigAppFontAddFile (config, "/dev/null")) ++ return 1; ++ ++ return 0; ++} +-- +cgit v0.10.2 + diff --git a/media-libs/fontconfig/files/fontconfig-2.11.93-fix-sigfpe.patch b/media-libs/fontconfig/files/fontconfig-2.11.93-fix-sigfpe.patch new file mode 100644 index 000000000000..e5a5558e2c49 --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.11.93-fix-sigfpe.patch @@ -0,0 +1,22 @@ +From 7bc07cf6c2a5685ab95f146f5af2b3bcd5f5864d Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Mon, 30 Mar 2015 15:18:44 +0900 +Subject: Fix SIGFPE + + +diff --git a/src/fcrange.c b/src/fcrange.c +index 37cf067..9b1b67b 100644 +--- a/src/fcrange.c ++++ b/src/fcrange.c +@@ -204,7 +204,7 @@ FcRangeHash (const FcRange *r) + { + FcRange c = FcRangeCanonicalize (r); + int b = (int) (c.u.d.begin * 100); +- int e = (int) (c.u.d.end * 100); ++ int e = FcDoubleCmpEQ (c.u.d.end, DBL_MAX) ? INT_MAX : (int) (c.u.d.end * 100); + + return b ^ (b << 1) ^ (e << 9); + } +-- +cgit v0.10.2 + diff --git a/media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch b/media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch new file mode 100644 index 000000000000..033fe895bc10 --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch @@ -0,0 +1,67 @@ +--- fontconfig-2.11.93.orig/conf.d/60-latin.conf 2015-04-18 20:06:06.070687989 +0800 ++++ fontconfig-2.11.93/conf.d/60-latin.conf 2015-04-18 20:14:15.245732796 +0800 +@@ -4,46 +4,49 @@ + + serif + +- Bitstream Vera Serif ++ Liberation Serif + DejaVu Serif + Times New Roman +- Thorndale AMT + Luxi Serif + Nimbus Roman No9 L + Nimbus Roman + Times ++ Thorndale AMT ++ Bitstream Vera Serif + + + + sans-serif + +- Bitstream Vera Sans ++ Liberation Sans + DejaVu Sans +- Verdana + Arial +- Albany AMT + Luxi Sans + Nimbus Sans L + Nimbus Sans + Helvetica + Lucida Sans Unicode + BPG Glaho International ++ Verdana + Tahoma ++ Albany AMT ++ Bitstream Vera Sans + + + + monospace + +- Bitstream Vera Sans Mono ++ Liberation Mono + DejaVu Sans Mono + Inconsolata + Andale Mono + Courier New +- Cumberland AMT + Luxi Mono + Nimbus Mono L + Nimbus Mono + Courier ++ Cumberland AMT ++ Bitstream Vera Sans Mono + + +