diff options
| author |   Ryan Hill <rhill@gentoo.org> | 2007-07-15 22:16:40 +0000 |
|---|---|---|
| committer | Ryan Hill <rhill@gentoo.org> | 2007-07-15 22:16:40 +0000 |
| commit | fa0247a77708f3eccc4736b6a9e1e6816602e206 (patch) | |
| tree | 5ebbae413b6eb97e3ce769d12bf5c45f750fd8e7 /media-libs | |
| parent | New CVS snapshot, fixes #181973. (diff) | |
| download | historical-fa0247a77708f3eccc4736b6a9e1e6816602e206.tar.gz historical-fa0247a77708f3eccc4736b6a9e1e6816602e206.tar.bz2 historical-fa0247a77708f3eccc4736b6a9e1e6816602e206.zip | |
Remove old.
Package-Manager: portage-2.1.3_rc8
Diffstat (limited to 'media-libs')
17 files changed, 25 insertions, 1344 deletions
diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog index f0292992f323..0cd6d028c557 100644 --- a/media-libs/fontconfig/ChangeLog +++ b/media-libs/fontconfig/ChangeLog @@ -1,6 +1,26 @@ # ChangeLog for media-libs/fontconfig # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.92 2007/07/12 05:11:22 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.93 2007/07/15 22:16:40 dirtyepic Exp $ + + 15 Jul 2007; Ryan Hill <dirtyepic@gentoo.org> + -files/patch/fontconfig-2.1-slighthint.patch, + -files/patch/fontconfig-2.2-blacklist.patch, + -files/patch/fontconfig-2.2-local_fontdir-r1.patch, + -files/patch/fontconfig-2.2-remove_subpixel_test.patch, + -files/fontconfig-2.3.2-noftinternals.patch, + -files/fontconfig-2.3.2-pkg_config.patch, + -files/fontconfig-2.3.2-symbol_alias.patch, -fontconfig-2.2.3.ebuild, + -fontconfig-2.3.2-r1.ebuild, -fontconfig-2.3.2-r2.ebuild, + -fontconfig-2.4.1.ebuild: + Remove old. + + 15 Jul 2007; Ryan Hill <dirtyepic@gentoo.org> + -files/fontconfig-2.3.2-noftinternals.patch, + -files/fontconfig-2.3.2-pkg_config.patch, + -files/fontconfig-2.3.2-symbol_alias.patch, -fontconfig-2.2.3.ebuild, + -fontconfig-2.3.2-r1.ebuild, -fontconfig-2.3.2-r2.ebuild, + -fontconfig-2.4.1.ebuild: + Remove old. 12 Jul 2007; Roy Marples <uberlord@gentoo.org> fontconfig-2.4.2.ebuild: Keyworded ~sparc-fbsd. diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest index e5d1d534f6bd..f3bbe81a4854 100644 --- a/media-libs/fontconfig/Manifest +++ b/media-libs/fontconfig/Manifest @@ -2,78 +2,19 @@ AUX fontconfig-2.3.2-docbook.patch 506 RMD160 c205d99ecc19866da8d0ac4ef7172dcef9 MD5 083e41bbcbce3f6ee01214d8cecf150b files/fontconfig-2.3.2-docbook.patch 506 RMD160 c205d99ecc19866da8d0ac4ef7172dcef98a6299 files/fontconfig-2.3.2-docbook.patch 506 SHA256 c6480dcf19fec22126a9205fa3d9b317e5a97613f86218cf1926a2a07848afd5 files/fontconfig-2.3.2-docbook.patch 506 -AUX fontconfig-2.3.2-noftinternals.patch 18275 RMD160 69c409a41708662bd04b9ba998e5d2b5a77b1016 SHA1 c89e63ef691a779ae1ee5f8a4bda2cc55cd280c6 SHA256 f1b41d3438acf7624c3df767111817dfdea283e418c16b3c74d25768e6d2fedd -MD5 92cad1f7eef3edc6a34a2fd5cbbf352a files/fontconfig-2.3.2-noftinternals.patch 18275 -RMD160 69c409a41708662bd04b9ba998e5d2b5a77b1016 files/fontconfig-2.3.2-noftinternals.patch 18275 -SHA256 f1b41d3438acf7624c3df767111817dfdea283e418c16b3c74d25768e6d2fedd files/fontconfig-2.3.2-noftinternals.patch 18275 -AUX fontconfig-2.3.2-pkg_config.patch 421 RMD160 502c0bf09bf8ffe4fe0f64c8e7c42da7bbd8042e SHA1 5c1ee873eafcbb64cc6314a9a045eaf8cc8eedb0 SHA256 3b536251b30a12d200e40676ae6b040e08394fc19c163b201a1d8d8795d1ea88 -MD5 89e73e244d58f9a2f27bca903ed69000 files/fontconfig-2.3.2-pkg_config.patch 421 -RMD160 502c0bf09bf8ffe4fe0f64c8e7c42da7bbd8042e files/fontconfig-2.3.2-pkg_config.patch 421 -SHA256 3b536251b30a12d200e40676ae6b040e08394fc19c163b201a1d8d8795d1ea88 files/fontconfig-2.3.2-pkg_config.patch 421 -AUX fontconfig-2.3.2-symbol_alias.patch 532 RMD160 a3dbe468e362da99d4c639115f12437d1593dee0 SHA1 8108108700b3e4f3d8b13161d8e8c88611387256 SHA256 c5f30c8a1b8fad5bf3abc15569f74d9a6600af05522f49f32305951e5c595a58 -MD5 a64531ab26e1d4d97f4d6dbd1f7c245c files/fontconfig-2.3.2-symbol_alias.patch 532 -RMD160 a3dbe468e362da99d4c639115f12437d1593dee0 files/fontconfig-2.3.2-symbol_alias.patch 532 -SHA256 c5f30c8a1b8fad5bf3abc15569f74d9a6600af05522f49f32305951e5c595a58 files/fontconfig-2.3.2-symbol_alias.patch 532 -AUX patch/fontconfig-2.1-slighthint.patch 2171 RMD160 58ce193f26b0b14ae5da950a1dbfbadf733577b9 SHA1 1e45e1352a396a7b76a6ea82df1be3b638e23f52 SHA256 d356ed4533d1d21c8d326fb183199c1d554888a5a8dd1e4883c931bcb0b84dc4 -MD5 37e60cdff43bf3f04e9db8931e0d1f47 files/patch/fontconfig-2.1-slighthint.patch 2171 -RMD160 58ce193f26b0b14ae5da950a1dbfbadf733577b9 files/patch/fontconfig-2.1-slighthint.patch 2171 -SHA256 d356ed4533d1d21c8d326fb183199c1d554888a5a8dd1e4883c931bcb0b84dc4 files/patch/fontconfig-2.1-slighthint.patch 2171 -AUX patch/fontconfig-2.2-blacklist.patch 1216 RMD160 9603cd0241b4204bbc22305b8d4d03753c875937 SHA1 86f432773d93fe52842e31483e84616b0efca140 SHA256 e63b6663bb65ba054aa56f553db466d8a89b5a5937c8c03524be9205707ef019 -MD5 1636083efd15746d8f194aff41aa6e02 files/patch/fontconfig-2.2-blacklist.patch 1216 -RMD160 9603cd0241b4204bbc22305b8d4d03753c875937 files/patch/fontconfig-2.2-blacklist.patch 1216 -SHA256 e63b6663bb65ba054aa56f553db466d8a89b5a5937c8c03524be9205707ef019 files/patch/fontconfig-2.2-blacklist.patch 1216 -AUX patch/fontconfig-2.2-local_fontdir-r1.patch 487 RMD160 b458422ed36d28471eeb7054595815630984e87a SHA1 483d761c7815605f3f8f53d0d81369f6e319c54d SHA256 c4d47bf4d6f2f11612f0de54375ee45099a7c8c4b9ccfe9a1aaf0ba0bf6b7fe8 -MD5 4b5453071b61ecef4bb530b0bca695e1 files/patch/fontconfig-2.2-local_fontdir-r1.patch 487 -RMD160 b458422ed36d28471eeb7054595815630984e87a files/patch/fontconfig-2.2-local_fontdir-r1.patch 487 -SHA256 c4d47bf4d6f2f11612f0de54375ee45099a7c8c4b9ccfe9a1aaf0ba0bf6b7fe8 files/patch/fontconfig-2.2-local_fontdir-r1.patch 487 -AUX patch/fontconfig-2.2-remove_subpixel_test.patch 441 RMD160 00b5baf29ab14998111c751c45c49f68d4bb323f SHA1 9464f6090d27617746c880fc2dbbdd4786c52b87 SHA256 efa79cf65ccbfe2255fddb3ba2fd38dcb38fca6768821daf38f7928f6bc3694d -MD5 4d77167b56a7dff0d7c7b5b8168b85ba files/patch/fontconfig-2.2-remove_subpixel_test.patch 441 -RMD160 00b5baf29ab14998111c751c45c49f68d4bb323f files/patch/fontconfig-2.2-remove_subpixel_test.patch 441 -SHA256 efa79cf65ccbfe2255fddb3ba2fd38dcb38fca6768821daf38f7928f6bc3694d files/patch/fontconfig-2.2-remove_subpixel_test.patch 441 -DIST fontconfig-2.2.3.tar.gz 750035 RMD160 57f0ba0610fbafc3f16db4b51800c3a29c85756d SHA1 0abc6f2dabd88a309c645c48aa97256dbe0caeaa SHA256 c98dfc2bdb5e9928068ffa4073731627bde8960b7f1ea9cd2b6305d989d06597 -DIST fontconfig-2.3.2.tar.gz 964045 RMD160 42668475cca88f265a3b12c289eea2ff61ddaa2b SHA1 8ec60da668618383b539db9d70b8e320bd7dd031 SHA256 6f7b91d328d6408c097ec11777bf4b1c2c710613b573b399794bc5999ff12227 -DIST fontconfig-2.4.1.tar.gz 1270946 RMD160 f48bd6a0ccc0cdd945659defeb9d944c629297ff SHA1 4e7d0f86bb4b637b7e66700068c50e044d3cc2e0 SHA256 13f59a7cd5190983412689495c399444cf73c1ced0813149e4480c8848bb9f17 DIST fontconfig-2.4.2.tar.gz 1278340 RMD160 c953020a5193500080c9eceef47b76e61c41b188 SHA1 cd5e30625680a0435563b586275156eaf8d0d34a SHA256 63a3d6413182817b91eea327b58c243f1865acfc40bef61fc52d2b0431341363 -EBUILD fontconfig-2.2.3.ebuild 2743 RMD160 fd5e0c09fe028f1c8ccb7f534cecb624e603b05b SHA1 cd534e7f34767a0d2a4bc6abf55864d41861922b SHA256 f5fd93948bf9a6014ffc80fff050f1bac7ac1aa31bab0a40d191f4bff43b493c -MD5 5e9984a555966897e84bc109c675edd2 fontconfig-2.2.3.ebuild 2743 -RMD160 fd5e0c09fe028f1c8ccb7f534cecb624e603b05b fontconfig-2.2.3.ebuild 2743 -SHA256 f5fd93948bf9a6014ffc80fff050f1bac7ac1aa31bab0a40d191f4bff43b493c fontconfig-2.2.3.ebuild 2743 -EBUILD fontconfig-2.3.2-r1.ebuild 2679 RMD160 ea7c81b2b284eb1fa720982b1d3d993cb6ae3adb SHA1 ca96c118416d4ec9bc2e283b8e9e706104b813d1 SHA256 bcf0976434be92a7a030c8d7d648abd9fbd63dbe8e97d2fbebd01cead87922eb -MD5 3a720444c7e28c5d7b25cbb1dda87020 fontconfig-2.3.2-r1.ebuild 2679 -RMD160 ea7c81b2b284eb1fa720982b1d3d993cb6ae3adb fontconfig-2.3.2-r1.ebuild 2679 -SHA256 bcf0976434be92a7a030c8d7d648abd9fbd63dbe8e97d2fbebd01cead87922eb fontconfig-2.3.2-r1.ebuild 2679 -EBUILD fontconfig-2.3.2-r2.ebuild 2674 RMD160 30a001bb8087263e98911a0effc802455c603f83 SHA1 7c077fdccd75e576f347fd301fc1de243ecff839 SHA256 71dd82061ede89052819aa2ce017ddd88400c61570a8dc677f68075f4aa9dcbe -MD5 9c9d44f542baf3e55250b8ae9700dd6f fontconfig-2.3.2-r2.ebuild 2674 -RMD160 30a001bb8087263e98911a0effc802455c603f83 fontconfig-2.3.2-r2.ebuild 2674 -SHA256 71dd82061ede89052819aa2ce017ddd88400c61570a8dc677f68075f4aa9dcbe fontconfig-2.3.2-r2.ebuild 2674 -EBUILD fontconfig-2.4.1.ebuild 2443 RMD160 caff31b23cd276492a766fe8509754994c997b4e SHA1 490629454e14d26475f4724e17a868eaf27ddcbc SHA256 13541c0b46f9b15a35eec5deb3ae895a72f551cc5cf72e736cc39b672fb59778 -MD5 8ec60cfc43afc2b26d74a5931d02bf0a fontconfig-2.4.1.ebuild 2443 -RMD160 caff31b23cd276492a766fe8509754994c997b4e fontconfig-2.4.1.ebuild 2443 -SHA256 13541c0b46f9b15a35eec5deb3ae895a72f551cc5cf72e736cc39b672fb59778 fontconfig-2.4.1.ebuild 2443 EBUILD fontconfig-2.4.2.ebuild 2456 RMD160 5c80bd1ec72cf21da6d59d8197cbd5a5be75d92c SHA1 b13bb9abaa911836722d794c2c3b933bc7d9be67 SHA256 92dd8ebca46c089e2b534c3f9a1054b3b961e08057f66bc955a7df4fa3f0ba28 MD5 d38eebdd0f2585c7e8f539d80b3bd018 fontconfig-2.4.2.ebuild 2456 RMD160 5c80bd1ec72cf21da6d59d8197cbd5a5be75d92c fontconfig-2.4.2.ebuild 2456 SHA256 92dd8ebca46c089e2b534c3f9a1054b3b961e08057f66bc955a7df4fa3f0ba28 fontconfig-2.4.2.ebuild 2456 -MISC ChangeLog 13228 RMD160 f4326d59dca289345299d874e113b826806982ff SHA1 3a324d90b1aecd37f090350b62b8c93e65de6f96 SHA256 0b5f048fb94209888c25646df59dd4ac716831121ebb5416fb89163f4082b304 -MD5 e94d87bceb13ebf0dec2decfecd7160c ChangeLog 13228 -RMD160 f4326d59dca289345299d874e113b826806982ff ChangeLog 13228 -SHA256 0b5f048fb94209888c25646df59dd4ac716831121ebb5416fb89163f4082b304 ChangeLog 13228 +MISC ChangeLog 14064 RMD160 404101479899598ae1f0af3f6bdd2598917139fc SHA1 d4dc8ae17d6d11aa0de4d89fcbf093cd754c3195 SHA256 5e3aeb6c50b4492d4f4894b2600b0a42e35aa3628316e1878da4b2fb97c2769a +MD5 1d59ee68125c51a3b7150bbeb973a44d ChangeLog 14064 +RMD160 404101479899598ae1f0af3f6bdd2598917139fc ChangeLog 14064 +SHA256 5e3aeb6c50b4492d4f4894b2600b0a42e35aa3628316e1878da4b2fb97c2769a ChangeLog 14064 MISC metadata.xml 419 RMD160 898b8233ab233060d8137dadf28c291b83a65500 SHA1 ee62c352812f8765122e5a65b7df5f8794c6c485 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db MD5 ae7171ca850597a2455b8b10c72a8de1 metadata.xml 419 RMD160 898b8233ab233060d8137dadf28c291b83a65500 metadata.xml 419 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db metadata.xml 419 -MD5 e0fb2a079c7fc99c390d8842d00edc69 files/digest-fontconfig-2.2.3 250 -RMD160 88a21882757a20d4dec3555bca5d3d8cbcf0de90 files/digest-fontconfig-2.2.3 250 -SHA256 4aeebed8b71cc7e9484252644a9b0b27b7f4021ce9f9a9efbc1d6e277bf05c29 files/digest-fontconfig-2.2.3 250 -MD5 c77d154bcfcfd17b636769089ba8a821 files/digest-fontconfig-2.3.2-r1 250 -RMD160 1aeaff56f8319f0831d42d6a367f83a57b51e0f6 files/digest-fontconfig-2.3.2-r1 250 -SHA256 94de40c9bac3de79a1bfc417f64d89398077e18e222d171493901211dac8bcae files/digest-fontconfig-2.3.2-r1 250 -MD5 c77d154bcfcfd17b636769089ba8a821 files/digest-fontconfig-2.3.2-r2 250 -RMD160 1aeaff56f8319f0831d42d6a367f83a57b51e0f6 files/digest-fontconfig-2.3.2-r2 250 -SHA256 94de40c9bac3de79a1bfc417f64d89398077e18e222d171493901211dac8bcae files/digest-fontconfig-2.3.2-r2 250 -MD5 569d3d18cbbf6f0af16a34dda86051f7 files/digest-fontconfig-2.4.1 253 -RMD160 7b843cdbdf5213e2abc05f029f2de55cfabbc327 files/digest-fontconfig-2.4.1 253 -SHA256 5dcfa2b9014eb628f9bb658d56b3aed53e6a1adebe1841ce66d37c4103468f7a files/digest-fontconfig-2.4.1 253 MD5 fefe447bacb538f936842e208c14c256 files/digest-fontconfig-2.4.2 253 RMD160 4429ea91b6eb7e40bc3b187eba17603db99d6b1c files/digest-fontconfig-2.4.2 253 SHA256 9bc90b9f75481e3584bd531ea37f75a3507873a272bfbb1d1a0d8213fbb7b4fc files/digest-fontconfig-2.4.2 253 diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.2.3 b/media-libs/fontconfig/files/digest-fontconfig-2.2.3 deleted file mode 100644 index 4f7e5ffdf1dc..000000000000 --- a/media-libs/fontconfig/files/digest-fontconfig-2.2.3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 2466a797d645cda5eb466080fdaec416 fontconfig-2.2.3.tar.gz 750035 -RMD160 57f0ba0610fbafc3f16db4b51800c3a29c85756d fontconfig-2.2.3.tar.gz 750035 -SHA256 c98dfc2bdb5e9928068ffa4073731627bde8960b7f1ea9cd2b6305d989d06597 fontconfig-2.2.3.tar.gz 750035 diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.3.2-r1 b/media-libs/fontconfig/files/digest-fontconfig-2.3.2-r1 deleted file mode 100644 index cfe4f11048a6..000000000000 --- a/media-libs/fontconfig/files/digest-fontconfig-2.3.2-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7354f9f125ea78a8f2851cb9c31d4866 fontconfig-2.3.2.tar.gz 964045 -RMD160 42668475cca88f265a3b12c289eea2ff61ddaa2b fontconfig-2.3.2.tar.gz 964045 -SHA256 6f7b91d328d6408c097ec11777bf4b1c2c710613b573b399794bc5999ff12227 fontconfig-2.3.2.tar.gz 964045 diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.3.2-r2 b/media-libs/fontconfig/files/digest-fontconfig-2.3.2-r2 deleted file mode 100644 index cfe4f11048a6..000000000000 --- a/media-libs/fontconfig/files/digest-fontconfig-2.3.2-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7354f9f125ea78a8f2851cb9c31d4866 fontconfig-2.3.2.tar.gz 964045 -RMD160 42668475cca88f265a3b12c289eea2ff61ddaa2b fontconfig-2.3.2.tar.gz 964045 -SHA256 6f7b91d328d6408c097ec11777bf4b1c2c710613b573b399794bc5999ff12227 fontconfig-2.3.2.tar.gz 964045 diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.4.1 b/media-libs/fontconfig/files/digest-fontconfig-2.4.1 deleted file mode 100644 index 13c3fbf328e5..000000000000 --- a/media-libs/fontconfig/files/digest-fontconfig-2.4.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 108f9a03fa9ed9dd779cc7ca236da557 fontconfig-2.4.1.tar.gz 1270946 -RMD160 f48bd6a0ccc0cdd945659defeb9d944c629297ff fontconfig-2.4.1.tar.gz 1270946 -SHA256 13f59a7cd5190983412689495c399444cf73c1ced0813149e4480c8848bb9f17 fontconfig-2.4.1.tar.gz 1270946 diff --git a/media-libs/fontconfig/files/fontconfig-2.3.2-noftinternals.patch b/media-libs/fontconfig/files/fontconfig-2.3.2-noftinternals.patch deleted file mode 100644 index 06ee8425d158..000000000000 --- a/media-libs/fontconfig/files/fontconfig-2.3.2-noftinternals.patch +++ /dev/null @@ -1,701 +0,0 @@ -diff -urN fontconfig-2.3.2/src/fcfreetype.c fontconfig-2.3.2-new/src/fcfreetype.c ---- fontconfig-2.3.2/src/fcfreetype.c 2005-04-21 14:37:43.000000000 +0200 -+++ fontconfig-2.3.2-new/src/fcfreetype.c 2005-07-07 13:17:32.224401218 +0200 -@@ -50,14 +50,11 @@ - #include "fcint.h" - #include <ft2build.h> - #include FT_FREETYPE_H --#include FT_INTERNAL_OBJECTS_H - #include FT_TRUETYPE_TABLES_H - #include FT_SFNT_NAMES_H - #include FT_TRUETYPE_IDS_H - #include FT_TYPE1_TABLES_H --#include FT_INTERNAL_STREAM_H --#include FT_INTERNAL_SFNT_H --#include FT_INTERNAL_TRUETYPE_TYPES_H -+#include "fcftglue.h" - #if HAVE_FT_GET_X11_FONT_FORMAT - #include FT_XFREE86_H - #endif -@@ -65,8 +62,7 @@ - #if HAVE_FT_GET_BDF_PROPERTY - #include FT_BDF_H - #include FT_MODULE_H --#define HAS_BDF_PROPERTY(f) ((f) && (f)->driver && \ -- (f)->driver->root.clazz->get_interface) -+#define HAS_BDF_PROPERTY(f) ((f)) - #define MY_Get_BDF_Property(f,n,p) (HAS_BDF_PROPERTY(f) ? \ - FT_Get_BDF_Property(f,n,p) : \ - FT_Err_Invalid_Argument) -@@ -1559,7 +1555,7 @@ - */ - if (FcCharSetCount (cs) == 0) - { -- if (!strcmp(FT_MODULE_CLASS(&face->driver->root)->module_name, "pcf")) -+ if (!strcmp(FT_Get_X11_Font_Format(face),"PCF")) - goto bail2; - } - -@@ -2706,8 +2702,7 @@ - static FT_Error - GetScriptTags(FT_Face face, FT_ULong tabletag, FT_ULong **stags, FT_UShort *script_count) - { -- FT_ULong cur_offset, new_offset, base_offset; -- TT_Face tt_face = (TT_Face)face; -+ FT_ULong cur_offset, new_offset, base_offset; - FT_Stream stream = face->stream; - FT_Error error; - FT_UShort n, p; -@@ -2716,51 +2711,43 @@ - if ( !stream ) - return TT_Err_Invalid_Face_Handle; - -- if (( error = tt_face->goto_table( tt_face, tabletag, stream, 0 ) )) -+ if ( (error = fcft_face_goto_table( face, tabletag, stream )) != 0 ) - return error; - -- base_offset = FT_STREAM_POS(); -+ base_offset = FCFT_STREAM_POS(); - - /* skip version */ - -- if ( FT_STREAM_SEEK( base_offset + 4L ) || FT_FRAME_ENTER( 2L ) ) -- return error; -- -- new_offset = FT_GET_USHORT() + base_offset; -- -- FT_FRAME_EXIT(); -- -- cur_offset = FT_STREAM_POS(); -- -- if ( FT_STREAM_SEEK( new_offset ) != TT_Err_Ok ) -- return error; -- -- base_offset = FT_STREAM_POS(); -+ if ( FCFT_STREAM_SEEK( base_offset + 4L ) || -+ FCFT_READ_USHORT( new_offset ) ) -+ return error; -+ -+ new_offset += base_offset; -+ cur_offset = FCFT_STREAM_POS(); - -- if ( FT_FRAME_ENTER( 2L ) ) -+ if ( FCFT_STREAM_SEEK( new_offset ) != TT_Err_Ok ) - return error; - -- *script_count = FT_GET_USHORT(); -+ base_offset = FCFT_STREAM_POS(); - -- FT_FRAME_EXIT(); -- -- if ( FT_SET_ERROR (FT_MEM_ALLOC_ARRAY( *stags, *script_count, FT_ULong )) ) -- return error; -+ if ( FCFT_READ_USHORT(*script_count) || -+ FCFT_MEM_ALLOC_ARRAY( *stags, *script_count, FT_ULong ) ) -+ return error; - - p = 0; - for ( n = 0; n < *script_count; n++ ) - { -- if ( FT_FRAME_ENTER( 6L ) ) -+ if ( FCFT_FRAME_ENTER( 6L ) ) - goto Fail; - -- (*stags)[p] = FT_GET_ULONG(); -- new_offset = FT_GET_USHORT() + base_offset; -+ (*stags)[p] = FCFT_GET_ULONG(); -+ new_offset = FCFT_GET_USHORT() + base_offset; - -- FT_FRAME_EXIT(); -+ FCFT_FRAME_EXIT(); - -- cur_offset = FT_STREAM_POS(); -+ cur_offset = FCFT_STREAM_POS(); - -- if ( FT_STREAM_SEEK( new_offset ) ) -+ if ( FCFT_STREAM_SEEK( new_offset ) ) - goto Fail; - - if ( error == TT_Err_Ok ) -@@ -2768,7 +2755,7 @@ - else if ( error != TTO_Err_Empty_Script ) - goto Fail; - -- (void)FT_STREAM_SEEK( cur_offset ); -+ (void)FCFT_STREAM_SEEK( cur_offset ); - } - - if (!p) -@@ -2784,7 +2771,7 @@ - - Fail: - *script_count = 0; -- FT_FREE( *stags ); -+ FCFT_FREE( *stags ); - return error; - } - -@@ -2841,7 +2828,7 @@ - if (FcDebug () & FC_DBG_SCANV) - printf("complex features in this font: %s\n", complex); - bail: -- FT_FREE(gsubtags); -- FT_FREE(gpostags); -+ FCFT_FREE(gsubtags); -+ FCFT_FREE(gpostags); - return complex; - } -diff -urN fontconfig-2.3.2/src/fcftglue.c fontconfig-2.3.2-new/src/fcftglue.c ---- fontconfig-2.3.2/src/fcftglue.c 1970-01-01 01:00:00.000000000 +0100 -+++ fontconfig-2.3.2-new/src/fcftglue.c 2005-07-07 13:34:48.630254000 +0200 -@@ -0,0 +1,380 @@ -+#include "fcftglue.h" -+ -+/***************************************************************************/ -+/***************************************************************************/ -+/***** *****/ -+/***** *****/ -+/***** *****/ -+/***************************************************************************/ -+/***************************************************************************/ -+ -+/* only used internall */ -+static FT_Pointer -+fcft_qalloc( FT_Memory memory, -+ FT_ULong size, -+ FT_Error *perror ) -+{ -+ FT_Error error = 0; -+ FT_Pointer block = NULL; -+ -+ if ( size > 0 ) -+ { -+ block = memory->alloc( memory, size ); -+ if ( !block ) -+ error = FT_Err_Out_Of_Memory; -+ } -+ -+ *perror = error; -+ return block; -+} -+ -+#define FCFT_QALLOC(ptr,size) ( (ptr) = fcft_qalloc( memory, (size), &error ), error != 0 ) -+ -+ -+FCFT_APIDEF( FT_Pointer ) -+fcft_alloc( FT_Memory memory, -+ FT_ULong size, -+ FT_Error *perror ) -+{ -+ FT_Error error = 0; -+ FT_Pointer block = NULL; -+ -+ if ( size > 0 ) -+ { -+ block = memory->alloc( memory, size ); -+ if ( !block ) -+ error = FT_Err_Out_Of_Memory; -+ else -+ memset( (char*)block, 0, (size_t)size ); -+ } -+ -+ *perror = error; -+ return block; -+} -+ -+ -+FCFT_APIDEF( FT_Pointer ) -+fcft_realloc( FT_Memory memory, -+ FT_Pointer block, -+ FT_ULong old_size, -+ FT_ULong new_size, -+ FT_Error *perror ) -+{ -+ FT_Pointer block2 = NULL; -+ FT_Error error = 0; -+ -+ if ( block == NULL ) -+ { -+ block2 = fcft_alloc( memory, new_size, &error ); -+ } -+ else if ( new_size <= 0 ) -+ { -+ fcft_free( memory, block ); -+ } -+ else -+ { -+ block2 = fcft_alloc( memory, new_size, &error ); -+ if ( !error ) -+ { -+ memcpy( (char*)block2, (const char*)block, (size_t)old_size ); -+ if ( new_size > old_size ) -+ memset( (char*)block2 + old_size, 0, (size_t)(new_size - old_size) ); -+ } -+ } -+ -+ if ( !error ) -+ block = block2; -+ -+ *perror = error; -+ return block; -+} -+ -+ -+FCFT_APIDEF( void ) -+fcft_free( FT_Memory memory, -+ FT_Pointer block ) -+{ -+ if ( block ) -+ memory->free( memory, block ); -+} -+ -+ -+FCFT_APIDEF( FT_Long ) -+fcft_stream_pos( FT_Stream stream ) -+{ -+ return stream->pos; -+} -+ -+ -+FCFT_APIDEF( FT_Error ) -+fcft_stream_seek( FT_Stream stream, -+ FT_Long pos ) -+{ -+ FT_Error error = 0; -+ -+ stream->pos = pos; -+ if ( stream->read ) -+ { -+ if ( stream->read( stream, pos, 0, 0 ) ) -+ error = FT_Err_Invalid_Stream_Operation; -+ } -+ else if ( pos > stream->size ) -+ error = FT_Err_Invalid_Stream_Operation; -+ -+ return error; -+} -+ -+ -+FCFT_APIDEF( FT_Error ) -+fcft_stream_frame_enter( FT_Stream stream, -+ FT_ULong count ) -+{ -+ FT_Error error = FT_Err_Ok; -+ FT_ULong read_bytes; -+ -+ if ( stream->read ) -+ { -+ /* allocate the frame in memory */ -+ FT_Memory memory = stream->memory; -+ -+ -+ if ( FCFT_QALLOC( stream->base, count ) ) -+ goto Exit; -+ -+ /* read it */ -+ read_bytes = stream->read( stream, stream->pos, -+ stream->base, count ); -+ if ( read_bytes < count ) -+ { -+ FCFT_FREE( stream->base ); -+ error = FT_Err_Invalid_Stream_Operation; -+ } -+ stream->cursor = stream->base; -+ stream->limit = stream->cursor + count; -+ stream->pos += read_bytes; -+ } -+ else -+ { -+ /* check current and new position */ -+ if ( stream->pos >= stream->size || -+ stream->pos + count > stream->size ) -+ { -+ error = FT_Err_Invalid_Stream_Operation; -+ goto Exit; -+ } -+ -+ /* set cursor */ -+ stream->cursor = stream->base + stream->pos; -+ stream->limit = stream->cursor + count; -+ stream->pos += count; -+ } -+ -+Exit: -+ return error; -+} -+ -+ -+FCFT_APIDEF( void ) -+fcft_stream_frame_exit( FT_Stream stream ) -+{ -+ if ( stream->read ) -+ { -+ FT_Memory memory = stream->memory; -+ -+ FCFT_FREE( stream->base ); -+ } -+ stream->cursor = 0; -+ stream->limit = 0; -+} -+ -+ -+FCFT_APIDEF( FT_Byte ) -+fcft_stream_get_byte( FT_Stream stream ) -+{ -+ FT_Byte result = 0; -+ -+ if ( stream->cursor < stream->limit ) -+ result = *stream->cursor++; -+ -+ return result; -+} -+ -+ -+FCFT_APIDEF( FT_Short ) -+fcft_stream_get_short( FT_Stream stream ) -+{ -+ FT_Byte* p; -+ FT_Short result = 0; -+ -+ p = stream->cursor; -+ if ( p + 2 <= stream->limit ) -+ { -+ result = (FT_Short)((p[0] << 8) | p[1]); -+ stream->cursor = p+2; -+ } -+ return result; -+} -+ -+ -+FCFT_APIDEF( FT_Long ) -+fcft_stream_get_long( FT_Stream stream ) -+{ -+ FT_Byte* p; -+ FT_Long result = 0; -+ -+ p = stream->cursor; -+ if ( p + 4 <= stream->limit ) -+ { -+ result = (FT_Long)(((FT_Long)p[0] << 24) | -+ ((FT_Long)p[1] << 16) | -+ ((FT_Long)p[2] << 8) | -+ p[3] ); -+ stream->cursor = p+4; -+ } -+ return result; -+} -+ -+ -+static FT_Error -+fcft_stream_readp( FT_Stream stream, -+ FT_Byte* *pbuffer, -+ FT_ULong count ) -+{ -+ FT_Error error = 0; -+ -+ if ( stream->read ) -+ { -+ FT_ULong read_bytes = stream->read( stream, stream->pos, *pbuffer, count ); -+ -+ if ( read_bytes != count ) -+ goto Fail; -+ -+ stream->pos += count; -+ } -+ else -+ { -+ if ( stream->pos >= stream->size || -+ stream->pos + count > stream->size ) -+ goto Fail; -+ -+ *pbuffer = stream->base + stream->pos; -+ stream->pos += count; -+ } -+ -+Exit: -+ return error; -+ -+Fail: -+ error = FT_Err_Invalid_Stream_Operation; -+ goto Exit; -+} -+ -+ -+FCFT_API( FT_Byte ) -+fcft_stream_read_byte( FT_Stream stream, -+ FT_Error *perror ) -+{ -+ FT_Byte temp[1], *p = temp, result = 0; -+ FT_Error error = fcft_stream_readp( stream, &p, 1 ); -+ -+ if ( !error ) -+ result = *p; -+ -+ return error; -+} -+ -+FCFT_API( FT_Short ) -+fcft_stream_read_short( FT_Stream stream, -+ FT_Error *perror ) -+{ -+ FT_Byte temp[2], *p = temp; -+ FT_Short result = 0; -+ FT_Error error = fcft_stream_readp( stream, &p, 2 ); -+ -+ if ( !error ) -+ result = (FT_Short)((p[0] << 8) | p[1]); -+ -+ return error; -+} -+ -+FCFT_API( FT_Long ) -+fcft_stream_read_long( FT_Stream stream, -+ FT_Error *perror ) -+{ -+ FT_Byte temp[4], *p = temp; -+ FT_Long result = 0; -+ FT_Error error = fcft_stream_readp( stream, &p, 4 ); -+ -+ if ( !error ) -+ result = (FT_Long)((FT_Long)(p[0] << 24) | -+ (FT_Long)(p[1] << 16) | -+ (p[2] << 8) | -+ p[3] ); -+ -+ return error; -+} -+ -+ -+FCFT_APIDEF( FT_Error ) -+fcft_face_goto_table( FT_Face face, -+ FT_ULong the_tag, -+ FT_Stream stream ) -+{ -+ FT_Error error; -+ -+ if ( !FT_IS_SFNT(face) ) -+ error = FT_Err_Invalid_Face_Handle; -+ else -+ { -+ /* parse the directory table directly, without using -+ * FreeType's built-in data structures -+ */ -+ FT_UInt count, nn; -+ FT_ULong offset = 0; -+ -+ if ( face->num_faces > 1 ) -+ { -+ /* deal with TrueType collections */ -+ FT_ULong offset; -+ -+ if ( FCFT_STREAM_SEEK( 12 + face->face_index*4 ) || -+ FCFT_READ_ULONG(offset) ) -+ goto Exit; -+ } -+ -+ if ( FCFT_STREAM_SEEK( offset+4 ) || -+ FCFT_READ_USHORT(count) ) -+ goto Exit; -+ -+ -+ if ( FCFT_STREAM_SEEK( offset+12 ) || -+ FCFT_FRAME_ENTER( count*16 ) ) -+ goto Exit; -+ -+ for ( nn = 0; nn < count; nn++ ) -+ { -+ FT_ULong tag = FCFT_GET_TAG(); -+ FT_ULong checksum = FCFT_GET_ULONG(); -+ FT_ULong start = FCFT_GET_ULONG(); -+ FT_ULong size = FCFT_GET_ULONG(); -+ -+ FT_UNUSED(checksum); -+ FT_UNUSED(size); -+ -+ if ( tag == the_tag ) -+ { -+ error = fcft_stream_seek( stream, offset+start ); -+ goto FoundIt; -+ } -+ } -+ error = FT_Err_Table_Missing; -+ -+ FoundIt: -+ FCFT_FRAME_EXIT(); -+ } -+ -+Exit: -+ return error; -+} -+ -+#undef FCFT_QALLOC -diff -urN fontconfig-2.3.2/src/fcftglue.h fontconfig-2.3.2-new/src/fcftglue.h ---- fontconfig-2.3.2/src/fcftglue.h 1970-01-01 01:00:00.000000000 +0100 -+++ fontconfig-2.3.2-new/src/fcftglue.h 2005-07-07 13:15:43.292717000 +0200 -@@ -0,0 +1,135 @@ -+/* the following contains code used to prevent FontConfig from -+ * abusing FreeType internals. We simply duplicate some of the FreeType -+ * functionality using only publicly defined APIs and structures -+ */ -+#ifndef __FONTCONFIG_FTGLUE_H__ -+#define __FONTCONFIG_FTGLUE_H__ -+ -+#include <ft2build.h> -+#include FT_FREETYPE_H -+ -+FT_BEGIN_HEADER -+ -+ -+/* utility macros */ -+#define FCFT_SET_ERR(c) ( (error = (c)) != 0 ) -+ -+#ifndef FCFT_API -+#define FCFT_API(x) extern x -+#endif -+ -+#ifndef FCFT_APIDEF -+#define FCFT_APIDEF(x) x -+#endif -+ -+/* stream macros used by the OpenType parser */ -+#define FCFT_STREAM_POS() fcft_stream_pos( stream ) -+#define FCFT_STREAM_SEEK(pos) FCFT_SET_ERR( fcft_stream_seek( stream, pos ) ) -+#define FCFT_FRAME_ENTER(size) FCFT_SET_ERR( fcft_stream_frame_enter( stream, size ) ) -+#define FCFT_FRAME_EXIT() fcft_stream_frame_exit( stream ) -+ -+#define FCFT_GET_BYTE() fcft_stream_get_byte( stream ) -+#define FCFT_GET_SHORT() fcft_stream_get_short( stream ) -+#define FCFT_GET_LONG() fcft_stream_get_long( stream ) -+ -+#define FCFT_GET_CHAR() ((FT_Char)FCFT_GET_BYTE()) -+#define FCFT_GET_USHORT() ((FT_UShort)FCFT_GET_SHORT()) -+#define FCFT_GET_ULONG() ((FT_ULong)FCFT_GET_LONG()) -+#define FCFT_GET_TAG() FCFT_GET_ULONG() -+ -+#define FCFT_READ_(val,type,suffix) \ -+ ( (val) = (type) fcft_stream_read_##suffix (stream, &error), error != 0 ) -+ -+#define FCFT_READ_BYTE(val) FCFT_READ_(val,FT_Byte,byte) -+#define FCFT_READ_SHORT(val) FCFT_READ_(val,FT_Short,short) -+#define FCFT_READ_LONG(val) FCFT_READ_(val,FT_Long,long) -+ -+#define FCFT_READ_CHAR(val) FCFT_READ_(val,FT_Char,byte) -+#define FCFT_READ_USHORT(val) FCFT_READ_(val,FT_UShort,short) -+#define FCFT_READ_ULONG(val) FCFT_READ_(val,FT_ULong,long) -+ -+ -+FCFT_API( FT_Long ) -+fcft_stream_pos( FT_Stream stream ); -+ -+FCFT_API( FT_Error ) -+fcft_stream_seek( FT_Stream stream, -+ FT_Long pos ); -+ -+FCFT_API( FT_Error ) -+fcft_stream_frame_enter( FT_Stream stream, -+ FT_ULong size ); -+ -+FCFT_API( void ) -+fcft_stream_frame_exit( FT_Stream stream ); -+ -+FCFT_API( FT_Byte ) -+fcft_stream_get_byte( FT_Stream stream ); -+ -+FCFT_API( FT_Short ) -+fcft_stream_get_short( FT_Stream stream ); -+ -+FCFT_API( FT_Long ) -+fcft_stream_get_long( FT_Stream stream ); -+ -+FCFT_API( FT_Byte ) -+fcft_stream_read_byte( FT_Stream stream, -+ FT_Error *perror ); -+ -+FCFT_API( FT_Short ) -+fcft_stream_read_short( FT_Stream stream, -+ FT_Error *perror ); -+ -+FCFT_API( FT_Long ) -+fcft_stream_read_long( FT_Stream stream, -+ FT_Error *perror ); -+ -+FCFT_API( FT_Error ) -+fcft_face_goto_table( FT_Face face, -+ FT_ULong tag, -+ FT_Stream stream ); -+ -+/* memory macros used by the OpenType parser */ -+#define FCFT_MEM_ALLOC(_ptr,_size) \ -+ ( (_ptr) = fcft_alloc( memory, _size, &error ), error != 0 ) -+ -+#define FCFT_MEM_REALLOC(_ptr,_oldsz,_newsz) \ -+ ( (_ptr) = fcft_realloc( memory, (_ptr), (_oldsz), (_newsz), &error ), error != 0 ) -+ -+#define FCFT_FREE(_ptr) \ -+ FT_BEGIN_STMNT \ -+ if ( (_ptr) ) \ -+ { \ -+ fcft_free( memory, _ptr ); \ -+ _ptr = NULL; \ -+ } \ -+ FT_END_STMNT -+ -+#define FCFT_MEM_ALLOC_ARRAY(_ptr,_count,_type) \ -+ FCFT_MEM_ALLOC(_ptr,(_count)*sizeof(_type)) -+ -+#define FCFT_MEM_REALLOC_ARRAY(_ptr,_oldcnt,_newcnt,_type) \ -+ FCFT_MEM_REALLOC(_ptr,(_oldcnt)*sizeof(_type),(_newcnt)*sizeof(_type)) -+ -+ -+FCFT_API( FT_Pointer ) -+fcft_alloc( FT_Memory memory, -+ FT_ULong size, -+ FT_Error *perror ); -+ -+FCFT_API( FT_Pointer ) -+fcft_realloc( FT_Memory memory, -+ FT_Pointer block, -+ FT_ULong old_size, -+ FT_ULong new_size, -+ FT_Error *perror ); -+ -+FCFT_API( void ) -+fcft_free( FT_Memory memory, -+ FT_Pointer block ); -+ -+/* */ -+ -+FT_END_HEADER -+ -+#endif /* __OPENTYPE_FCFT_H__ */ -diff -urN fontconfig-2.3.2/src/Makefile.am fontconfig-2.3.2-new/src/Makefile.am ---- fontconfig-2.3.2/src/Makefile.am 2004-12-05 06:49:20.000000000 +0100 -+++ fontconfig-2.3.2-new/src/Makefile.am 2005-07-07 13:09:15.416637082 +0200 -@@ -86,6 +86,7 @@ - fcdefault.c \ - fcdir.c \ - fcfreetype.c \ -+ fcftglue.c \ - fcfs.c \ - fcinit.c \ - fclang.c \ -diff -urN fontconfig-2.3.2/src/Makefile.in fontconfig-2.3.2-new/src/Makefile.in ---- fontconfig-2.3.2/src/Makefile.in 2005-04-27 21:08:51.000000000 +0200 -+++ fontconfig-2.3.2-new/src/Makefile.in 2005-07-07 13:09:15.417636939 +0200 -@@ -228,6 +228,7 @@ - fcdefault.c \ - fcdir.c \ - fcfreetype.c \ -+ fcftglue.c \ - fcfs.c \ - fcinit.c \ - fclang.c \ -@@ -257,7 +258,7 @@ - libfontconfig_la_DEPENDENCIES = - am_libfontconfig_la_OBJECTS = fcatomic.lo fcblanks.lo fccache.lo \ - fccfg.lo fccharset.lo fcdbg.lo fcdefault.lo fcdir.lo \ -- fcfreetype.lo fcfs.lo fcinit.lo fclang.lo fclist.lo fcmatch.lo \ -+ fcfreetype.lo fcftglue.lo fcfs.lo fcinit.lo fclang.lo fclist.lo fcmatch.lo \ - fcmatrix.lo fcname.lo fcpat.lo fcstr.lo fcxml.lo - libfontconfig_la_OBJECTS = $(am_libfontconfig_la_OBJECTS) - diff --git a/media-libs/fontconfig/files/fontconfig-2.3.2-pkg_config.patch b/media-libs/fontconfig/files/fontconfig-2.3.2-pkg_config.patch deleted file mode 100644 index eb483db69278..000000000000 --- a/media-libs/fontconfig/files/fontconfig-2.3.2-pkg_config.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- fontconfig-2.3.2/fontconfig.pc.in 2003-03-05 07:09:14.000000000 +0100 -+++ fontconfig-2.3.2/fontconfig.pc.in.new 2006-04-07 12:54:19.000000000 +0200 -@@ -6,5 +6,5 @@ - Name: Fontconfig - Description: Font configuration and customization library - Version: @VERSION@ --Libs: -L${libdir} -lfontconfig --Cflags: -I${includedir} -+Libs: -L${libdir} @FREETYPE_LIBS@ -lfontconfig -lexpat -+Cflags: -I${includedir} @FREETYPE_CFLAGS@ diff --git a/media-libs/fontconfig/files/fontconfig-2.3.2-symbol_alias.patch b/media-libs/fontconfig/files/fontconfig-2.3.2-symbol_alias.patch deleted file mode 100644 index 2d35ff139cf7..000000000000 --- a/media-libs/fontconfig/files/fontconfig-2.3.2-symbol_alias.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- fontconfig-2.3.2/fonts.conf.in 2005-04-03 23:07:50.000000000 +0200 -+++ fontconfig-2.3.2/fonts.conf.in.new 2006-04-07 13:10:55.000000000 +0200 -@@ -311,6 +311,19 @@ - </prefer> - </alias> - -+<!-- -+ Suitable free alias for Symbol font -+ --> -+ -+ <alias> -+ <family>Symbol</family> -+ <accept><family>Standard Symbols L</family></accept> -+ </alias> -+ <alias> -+ <family>ZapfDingbats</family> -+ <accept><family>Dingbats</family></accept> -+ </alias> -+ - <!-- - Artificial oblique for fonts without an italic or oblique version - --> diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.1-slighthint.patch b/media-libs/fontconfig/files/patch/fontconfig-2.1-slighthint.patch deleted file mode 100644 index b26785aac5db..000000000000 --- a/media-libs/fontconfig/files/patch/fontconfig-2.1-slighthint.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- fontconfig/fontconfig/fontconfig.h.slighthint Sun Aug 11 14:10:41 2002 -+++ fontconfig/fontconfig/fontconfig.h Mon Aug 12 16:23:51 2002 -@@ -55,6 +55,7 @@ - #define FC_FOUNDRY "foundry" /* String */ - #define FC_ANTIALIAS "antialias" /* Bool (depends) */ - #define FC_HINTING "hinting" /* Bool (true) */ -+#define FC_HINT_STYLE "hintstyle" /* Int */ - #define FC_VERTICAL_LAYOUT "verticallayout" /* Bool (false) */ - #define FC_AUTOHINT "autohint" /* Bool (false) */ - #define FC_GLOBAL_ADVANCE "globaladvance" /* Bool (true) */ -@@ -102,6 +103,12 @@ - #define FC_RGBA_VRGB 3 - #define FC_RGBA_VBGR 4 - -+/* hinting style */ -+#define FC_HINT_NONE 0 -+#define FC_HINT_SLIGHT 1 -+#define FC_HINT_MEDIUM 2 -+#define FC_HINT_FULL 3 -+ - typedef enum _FcType { - FcTypeVoid, - FcTypeInteger, ---- fontconfig/src/fcdefault.c.slighthint Tue Jul 9 18:08:14 2002 -+++ fontconfig/src/fcdefault.c Mon Aug 12 16:22:01 2002 -@@ -137,4 +137,9 @@ - FcPatternAddString (pattern, FC_LANG, (FcChar8 *) lang); - } - } -+ -+ if (FcPatternGet (pattern, FC_HINT_STYLE, 0, &v) == FcResultNoMatch) -+ { -+ FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL); -+ } - } ---- fontconfig/src/fcname.c.slighthint Sun Aug 11 14:10:42 2002 -+++ fontconfig/src/fcname.c Mon Aug 12 16:24:28 2002 -@@ -40,6 +40,7 @@ - { FC_FOUNDRY, FcTypeString, }, - /* { FC_CORE, FcTypeBool, }, */ - { FC_ANTIALIAS, FcTypeBool, }, -+ { FC_HINT_STYLE, FcTypeInteger, }, - { FC_HINTING, FcTypeBool, }, - { FC_VERTICAL_LAYOUT, FcTypeBool, }, - { FC_AUTOHINT, FcTypeBool, }, -@@ -158,6 +158,11 @@ - { (FcChar8 *) "vrgb", "rgba", FC_RGBA_VRGB }, - { (FcChar8 *) "vbgr", "rgba", FC_RGBA_VBGR }, - { (FcChar8 *) "none", "rgba", FC_RGBA_NONE }, -+ -+ { (FcChar8 *) "hintnone", "hintstyle", FC_HINT_NONE }, -+ { (FcChar8 *) "hintslight", "hintstyle", FC_HINT_SLIGHT }, -+ { (FcChar8 *) "hintmedium", "hintstyle", FC_HINT_MEDIUM }, -+ { (FcChar8 *) "hintfull", "hintstyle", FC_HINT_FULL }, - }; - - #define NUM_FC_CONSTANTS (sizeof _FcBaseConstants/sizeof _FcBaseConstants[0]) diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.2-blacklist.patch b/media-libs/fontconfig/files/patch/fontconfig-2.2-blacklist.patch deleted file mode 100644 index bd181c33bdf3..000000000000 --- a/media-libs/fontconfig/files/patch/fontconfig-2.2-blacklist.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- fontconfig/src/fcdir.c.blacklist Mon Aug 26 15:57:40 2002 -+++ fontconfig/src/fcdir.c Fri Aug 30 14:59:05 2002 -@@ -150,6 +150,41 @@ - return ret; - } - -+static FcBool -+FcBlackListed (const char *name) -+{ -+ static const char * const black_listed_names[] = { -+ "bodt.ttf", -+ "hrger.pfa", -+ "hrgrr.pfa", -+ "hritr.pfa", -+ "hrpld.pfa", -+ "hrpldi.pfa", -+ "hrplt.pfa", -+ "hrplti.pfa", -+ "hrscc.pfa", -+ "hrscs.pfa", -+ "u003043t.gsf", -+ "u004006t.gsf" -+ }; -+ -+ int low = 0; -+ int high = sizeof(black_listed_names) / sizeof(black_listed_names[0]) - 1; -+ -+ while (low <= high) { -+ int mid = (low + high) / 2; -+ int res = strcmp (name, black_listed_names[mid]); -+ if (res == 0) -+ return FcTrue; -+ else if (res < 0) -+ high = mid - 1; -+ else -+ low = mid + 1; -+ } -+ -+ return FcFalse; -+} -+ - #define FC_MAX_FILE_LEN 4096 - - FcBool -@@ -201,7 +235,8 @@ - } - while (ret && (e = readdir (d))) - { -- if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN) -+ if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN && -+ !FcBlackListed (e->d_name)) - { - strcpy ((char *) base, (char *) e->d_name); - ret = FcFileScan (set, dirs, cache, blanks, file, force); diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.2-local_fontdir-r1.patch b/media-libs/fontconfig/files/patch/fontconfig-2.2-local_fontdir-r1.patch deleted file mode 100644 index 3eb7aa0438f9..000000000000 --- a/media-libs/fontconfig/files/patch/fontconfig-2.2-local_fontdir-r1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur fontconfig-2.1.94/fonts.conf.in fontconfig-2.1.94.patched/fonts.conf.in ---- fontconfig-2.1.94/fonts.conf.in 2003-04-16 23:57:38.000000000 +0200 -+++ fontconfig-2.1.94.patched/fonts.conf.in 2003-04-18 02:59:54.000000000 +0200 -@@ -25,6 +25,10 @@ - - <dir>@FC_DEFAULT_FONTS@</dir> - @FC_FONTPATH@ -+ <dir>/usr/share/fonts</dir> -+ <dir>/usr/local/share/fonts</dir> -+ <dir>/usr/X11R6/lib/X11/fonts/75dpi</dir> -+ <dir>/usr/X11R6/lib/X11/fonts/100dpi</dir> - <dir>~/.fonts</dir> - - <!-- diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.2-remove_subpixel_test.patch b/media-libs/fontconfig/files/patch/fontconfig-2.2-remove_subpixel_test.patch deleted file mode 100644 index 8fc51a705f50..000000000000 --- a/media-libs/fontconfig/files/patch/fontconfig-2.2-remove_subpixel_test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur fontconfig-2.2.0/local.conf fontconfig-2.2.0.patched/local.conf ---- fontconfig-2.2.0/local.conf 2003-04-04 22:17:40.000000000 +0200 -+++ fontconfig-2.2.0.patched/local.conf 2003-05-14 18:48:16.000000000 +0200 -@@ -5,9 +5,6 @@ - <!-- - Enable sub-pixel rendering - <match target="font"> -- <test qual="all" name="rgba"> -- <const>unknown</const> -- </test> - <edit name="rgba" mode="assign"><const>rgb</const></edit> - </match> - --> diff --git a/media-libs/fontconfig/fontconfig-2.2.3.ebuild b/media-libs/fontconfig/fontconfig-2.2.3.ebuild deleted file mode 100644 index a785ab210775..000000000000 --- a/media-libs/fontconfig/fontconfig-2.2.3.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.2.3.ebuild,v 1.15 2007/02/09 10:30:17 grobian Exp $ - -inherit eutils - -DESCRIPTION="A library for configuring and customizing font access" -HOMEPAGE="http://freedesktop.org/Software/fontconfig" -#SRC_URI="http://pdx.freedesktop.org/software/fontconfig/releases/${P}.tar.gz" -SRC_URI="http://freedesktop.org/fontconfig/release/${P}.tar.gz" - -LICENSE="fontconfig" -SLOT="1.0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="" - -RDEPEND=">=media-libs/freetype-2.1.4 - >=dev-libs/expat-1.95.3" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" - -src_unpack() { - - unpack ${A} - cd ${S} - - local PPREFIX="${FILESDIR}/patch/${PN}" - - # Some patches from Redhat - epatch ${PPREFIX}-2.1-slighthint.patch - # Add our local fontpaths (duh dont forget!) - epatch ${PPREFIX}-2.2-local_fontdir-r1.patch - # Blacklist some fonts that break fontconfig - epatch ${PPREFIX}-2.2-blacklist.patch - # Remove the subpixel test from local.conf (#12757) - epatch ${PPREFIX}-2.2-remove_subpixel_test.patch - - # The date can be troublesome - sed -i "s:\`date\`::" configure - - epunt_cxx #74077 -} - -src_compile() { - - [ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ] && \ - die "Dont compile fontconfig with ccc, it doesnt work very well" - - # disable docs only disables docs generation (!) - econf --disable-docs \ - --with-docdir=/usr/share/doc/${PF} \ - --x-includes=/usr/X11R6/include \ - --x-libraries=/usr/X11R6/lib \ - --with-default-fonts=/usr/X11R6/lib/X11/fonts/Type1 || die - - # this triggers sandbox, we do this ourselves - sed -i "s:fc-cache/fc-cache -f -v:sleep 0:" Makefile - - emake -j1 || die - - # remove Luxi TTF fonts from the list, the Type1 are much better - sed -i "s:<dir>/usr/X11R6/lib/X11/fonts/TTF</dir>::" fonts.conf - -} - -src_install() { - - make DESTDIR=${D} install || die - - insinto /etc/fonts - doins ${S}/fonts.conf - newins ${S}/fonts.conf fonts.conf.new - - cd ${S} - - newman fc-cache/fc-cache.man fc-cache.1 - newman fc-list/fc-list.man fc-list.1 - newman src/fontconfig.man fontconfig.3 - dodoc AUTHORS ChangeLog NEWS README -} - -pkg_postinst() { - - # Changes should be made to /etc/fonts/local.conf, and as we had - # too much problems with broken fonts.conf, we force update it ... - # <azarah@gentoo.org> (11 Dec 2002) - ewarn "Please make fontconfig related changes to /etc/fonts/local.conf," - ewarn "and NOT to /etc/fonts/fonts.conf, as it will be replaced!" - mv -f ${ROOT}/etc/fonts/fonts.conf.new ${ROOT}/etc/fonts/fonts.conf - rm -f ${ROOT}/etc/fonts/._cfg????_fonts.conf - - if [ "${ROOT}" = "/" ] - then - echo - einfo "Creating font cache..." - HOME="/root" /usr/bin/fc-cache - fi - -} diff --git a/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild b/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild deleted file mode 100644 index 4cd1ddf5d87a..000000000000 --- a/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild,v 1.18 2007/02/09 10:30:17 grobian Exp $ - -WANT_AUTOMAKE=1.9 -inherit eutils libtool autotools - -DESCRIPTION="A library for configuring and customizing font access" -HOMEPAGE="http://fontconfig.org/" -SRC_URI="http://fontconfig.org/release/${P}.tar.gz" - -LICENSE="fontconfig" -SLOT="1.0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="doc" - -DEPEND=">=media-libs/freetype-2.1.4 - >=dev-libs/expat-1.95.3" -# autotools.eclass RDEPEND overrides implicit DEPEND=RDEPEND -RDEPEND=${DEPEND} - -src_unpack() { - unpack ${A} - - cd "${S}" - # alias for Symbol and dingbats font (#124238) - epatch "${FILESDIR}"/${P}-symbol_alias.patch - # fix pkgconfig includes (#83623) - epatch "${FILESDIR}"/${P}-pkg_config.patch - # add docbook switch so we can disable it - epatch "${FILESDIR}"/${P}-docbook.patch - - eautoreconf - - # elibtoolize - epunt_cxx #74077 -} - -src_compile() { - - [ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ] && \ - die "Dont compile fontconfig with ccc, it doesnt work very well" - - # disable docs only disables local docs generation, they come with the tarball - econf --disable-docs \ - --disable-docbook \ - --with-docdir=/usr/share/doc/${PF} \ - --with-default-fonts=/usr/share/fonts \ - --with-add-fonts=/usr/local/share/fonts,/usr/X11R6/lib/X11/fonts \ - || die - - # this triggers sandbox, we do this ourselves - sed -i "s:fc-cache/fc-cache -f -v:sleep 0:" Makefile - - emake -j1 || die -} - -src_install() { - make DESTDIR="${D}" install || die - - insinto /etc/fonts - doins "${S}"/fonts.conf - newins "${S}"/fonts.conf fonts.conf.new - - cd "${S}" - newman doc/fonts-conf.5 fonts-conf.5 - newman fc-cache/fc-cache.man fc-cache.1 - newman fc-list/fc-list.man fc-list.1 - - dohtml doc/fontconfig-user.html - dodoc doc/fontconfig-user.{txt,pdf} - - if use doc; then - doman doc/Fc*.3 - dohtml doc/fontconfig-devel.html doc - dohtml -r doc/fontconfig-devel - dodoc doc/fontconfig-devel.{txt,pdf} - fi - - dodoc AUTHORS ChangeLog NEWS README -} - -pkg_postinst() { - - # Changes should be made to /etc/fonts/local.conf, and as we had - # too much problems with broken fonts.conf, we force update it ... - # <azarah@gentoo.org> (11 Dec 2002) - ewarn "Please make fontconfig related changes to /etc/fonts/local.conf," - ewarn "and NOT to /etc/fonts/fonts.conf, as it will be replaced!" - mv -f ${ROOT}/etc/fonts/fonts.conf.new ${ROOT}/etc/fonts/fonts.conf - rm -f ${ROOT}/etc/fonts/._cfg????_fonts.conf - - if [ "${ROOT}" = "/" ] - then - echo - einfo "Creating font cache..." - /usr/bin/fc-cache - fi - -} diff --git a/media-libs/fontconfig/fontconfig-2.3.2-r2.ebuild b/media-libs/fontconfig/fontconfig-2.3.2-r2.ebuild deleted file mode 100644 index acbf9fabb46d..000000000000 --- a/media-libs/fontconfig/fontconfig-2.3.2-r2.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.3.2-r2.ebuild,v 1.3 2007/02/09 10:30:17 grobian Exp $ - -inherit eutils libtool autotools - -DESCRIPTION="A library for configuring and customizing font access" -HOMEPAGE="http://fontconfig.org/" -SRC_URI="http://fontconfig.org/release/${P}.tar.gz" - -LICENSE="fontconfig" -SLOT="1.0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="doc" - -DEPEND=">=media-libs/freetype-2.1.4 - >=dev-libs/expat-1.95.3" - -src_unpack() { - unpack ${A} - - cd "${S}" - # alias for Symbol and dingbats font (#124238) - epatch "${FILESDIR}"/${P}-symbol_alias.patch - # fix pkgconfig includes (#83623) - epatch "${FILESDIR}"/${P}-pkg_config.patch - # add docbook switch so we can disable it - epatch "${FILESDIR}"/${P}-docbook.patch - # fix build with ft 2.2 (#140359) - epatch ${FILESDIR}/${P}-noftinternals.patch - - eautoreconf - - # elibtoolize - epunt_cxx #74077 -} - -src_compile() { - - [ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ] && \ - die "Dont compile fontconfig with ccc, it doesnt work very well" - - # disable docs only disables local docs generation, they come with the tarball - econf --disable-docs \ - --disable-docbook \ - --with-docdir=/usr/share/doc/${PF} \ - --with-default-fonts=/usr/share/fonts \ - --with-add-fonts=/usr/local/share/fonts,/usr/X11R6/lib/X11/fonts \ - || die - - # this triggers sandbox, we do this ourselves - sed -i "s:fc-cache/fc-cache -f -v:sleep 0:" Makefile - - emake -j1 || die -} - -src_install() { - make DESTDIR="${D}" install || die - - insinto /etc/fonts - doins "${S}"/fonts.conf - newins "${S}"/fonts.conf fonts.conf.new - - cd "${S}" - newman doc/fonts-conf.5 fonts-conf.5 - newman fc-cache/fc-cache.man fc-cache.1 - newman fc-list/fc-list.man fc-list.1 - - dohtml doc/fontconfig-user.html - dodoc doc/fontconfig-user.{txt,pdf} - - if use doc; then - doman doc/Fc*.3 - dohtml doc/fontconfig-devel.html doc - dohtml -r doc/fontconfig-devel - dodoc doc/fontconfig-devel.{txt,pdf} - fi - - dodoc AUTHORS ChangeLog NEWS README -} - -pkg_postinst() { - - # Changes should be made to /etc/fonts/local.conf, and as we had - # too much problems with broken fonts.conf, we force update it ... - # <azarah@gentoo.org> (11 Dec 2002) - ewarn "Please make fontconfig related changes to /etc/fonts/local.conf," - ewarn "and NOT to /etc/fonts/fonts.conf, as it will be replaced!" - mv -f ${ROOT}/etc/fonts/fonts.conf.new ${ROOT}/etc/fonts/fonts.conf - rm -f ${ROOT}/etc/fonts/._cfg????_fonts.conf - - if [ "${ROOT}" = "/" ] - then - echo - einfo "Creating font cache..." - /usr/bin/fc-cache - fi - -} diff --git a/media-libs/fontconfig/fontconfig-2.4.1.ebuild b/media-libs/fontconfig/fontconfig-2.4.1.ebuild deleted file mode 100644 index 39a14f02ab8a..000000000000 --- a/media-libs/fontconfig/fontconfig-2.4.1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.4.1.ebuild,v 1.2 2007/02/09 10:30:17 grobian Exp $ - -inherit eutils libtool autotools - -DESCRIPTION="A library for configuring and customizing font access" -HOMEPAGE="http://fontconfig.org/" -SRC_URI="http://fontconfig.org/release/${P}.tar.gz" - -LICENSE="fontconfig" -SLOT="1.0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="doc xml" - -RDEPEND=">=media-libs/freetype-2.1.4 - !xml? ( >=dev-libs/expat-1.95.3 ) - xml? ( >=dev-libs/libxml2-2.6 )" - -DEPEND="${RDEPEND} - doc? ( app-text/docbook-sgml-utils )" - -src_unpack() { - - unpack ${A} - - cd "${S}" - # add docbook switch so we can disable it - epatch "${FILESDIR}"/${PN}-2.3.2-docbook.patch - - eautoreconf - - # elibtoolize - epunt_cxx #74077 - -} - -src_compile() { - - [ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ] && \ - die "Dont compile fontconfig with ccc, it doesnt work very well" - - # disable docs only disables local docs generation, they come with the tarball - econf $(use_enable doc docs) \ - $(use_enable doc docbook) \ - --localstatedir=/var \ - --with-docdir=/usr/share/doc/${PF} \ - --with-default-fonts=/usr/share/fonts \ - --with-add-fonts=/usr/local/share/fonts,/usr/X11R6/lib/X11/fonts \ - $(use_enable xml libxml2) \ - || die - - emake -j1 || die - -} - -src_install() { - - make DESTDIR="${D}" install || die - - insinto /etc/fonts - doins "${S}"/fonts.conf - newins "${S}"/fonts.conf fonts.conf.new - - cd "${S}" - newman doc/fonts-conf.5 fonts-conf.5 - - dohtml doc/fontconfig-user.html - dodoc doc/fontconfig-user.{txt,pdf} - - if use doc; then - doman doc/Fc*.3 - dohtml doc/fontconfig-devel.html doc - dohtml -r doc/fontconfig-devel - dodoc doc/fontconfig-devel.{txt,pdf} - fi - - dodoc AUTHORS ChangeLog NEWS README - -} - -pkg_postinst() { - - # Changes should be made to /etc/fonts/local.conf, and as we had - # too much problems with broken fonts.conf, we force update it ... - # <azarah@gentoo.org> (11 Dec 2002) - ewarn "Please make fontconfig configuration changes in /etc/fonts/conf.d/" - ewarn "and NOT to /etc/fonts/fonts.conf, as it will be replaced!" - mv -f ${ROOT}/etc/fonts/fonts.conf.new ${ROOT}/etc/fonts/fonts.conf - rm -f ${ROOT}/etc/fonts/._cfg????_fonts.conf - - if [ "${ROOT}" = "/" ] - then - ebegin "Creating global font cache..." - /usr/bin/fc-cache -s - eend $? - fi - -} |