diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2003-04-27 11:53:28 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2003-04-27 11:53:28 +0000 |
commit | f66c9d9178a26f9ca5fea088454f1eada9d4e7cb (patch) | |
tree | 7020b1b543c95dfd169ff9ba35fe77e39a8899b0 /media-libs | |
parent | stupid manifest (diff) | |
download | gentoo-2-f66c9d9178a26f9ca5fea088454f1eada9d4e7cb.tar.gz gentoo-2-f66c9d9178a26f9ca5fea088454f1eada9d4e7cb.tar.bz2 gentoo-2-f66c9d9178a26f9ca5fea088454f1eada9d4e7cb.zip |
add some patches
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/fontconfig/ChangeLog | 9 | ||||
-rw-r--r-- | media-libs/fontconfig/Manifest | 33 | ||||
-rw-r--r-- | media-libs/fontconfig/files/digest-fontconfig-2.2.0-r1 | 1 | ||||
-rw-r--r-- | media-libs/fontconfig/files/patch/fontconfig-2.2-blacklist.patch | 54 | ||||
-rw-r--r-- | media-libs/fontconfig/files/patch/fontconfig-2.2-defaultconfig.patch | 110 | ||||
-rw-r--r-- | media-libs/fontconfig/fontconfig-2.2.0-r1.ebuild | 96 |
6 files changed, 302 insertions, 1 deletions
diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog index e5c17e7ab345..b3c0c120de35 100644 --- a/media-libs/fontconfig/ChangeLog +++ b/media-libs/fontconfig/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/fontconfig # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.27 2003/04/23 12:34:33 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.28 2003/04/27 11:53:28 azarah Exp $ + +*fontconfig-2.2.0-r1 (27 Apr 2003) + + 27 Apr 2003; Martin Schlemmer <azarah@gentoo.org> fontconfig-2.2.0-r1.ebuild, + fontconfig-2.2-blacklist.patch, fontconfig-2.2-defaultconfig.patch : + Add blacklist patch from MDK to filter known fonts that borks. Add + defaultconfig patch from MDK that add more font family's. *fontconfig-2.2.0 (23 Apr 2003) diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest new file mode 100644 index 000000000000..a6a6004f41c5 --- /dev/null +++ b/media-libs/fontconfig/Manifest @@ -0,0 +1,33 @@ +MD5 3ab5e4bb58fda0debc814da7576b0efc ChangeLog 4357 +MD5 eef8f0259c7a8394066342c9a621ce66 fontconfig-2.0-r2.ebuild 1906 +MD5 5662a992925b976c35a0a4d60a824cfe fontconfig-2.0-r3.ebuild 2112 +MD5 fb9e314a96d258bcc394e9b8d9b2afb5 fontconfig-2.0-r4.ebuild 2144 +MD5 639d45a8156b6f1c081a103c3e3578bf fontconfig-2.1.ebuild 2370 +MD5 d35168948d28ccdf0660706e7a9595b1 fontconfig-2.1-r1.ebuild 2530 +MD5 2ce969d3f5ab210eb66a48ef291ba2ea fontconfig-2.1.94-r1.ebuild 2560 +MD5 c901db0af50691f7dc0a8d0d26dfab5a fontconfig-2.2.0.ebuild 2553 +MD5 ab9ae42d2adfdb42d97a5282deddf596 fontconfig-2.2.0-r1.ebuild 2704 +MD5 b4f83e6bceffd2f7e7a85f7b0269fdd7 files/digest-fontconfig-2.0-r2 65 +MD5 b4f83e6bceffd2f7e7a85f7b0269fdd7 files/digest-fontconfig-2.0-r3 65 +MD5 b4f83e6bceffd2f7e7a85f7b0269fdd7 files/digest-fontconfig-2.0-r4 65 +MD5 9d8a6b53e0aa951959a3026fb4d8deef files/digest-fontconfig-2.1 65 +MD5 be6ad03d595378054511740d1eeb5e8a files/digest-fontconfig-2.2.0-r1 68 +MD5 9d8a6b53e0aa951959a3026fb4d8deef files/digest-fontconfig-2.1-r1 65 +MD5 1fe50d73a77e3e4cd516a24d47bf53c7 files/digest-fontconfig-2.1.94-r1 69 +MD5 be6ad03d595378054511740d1eeb5e8a files/digest-fontconfig-2.2.0 68 +MD5 e177f9d83b13ab68fffe4c127ae89ea1 files/patch/fontconfig-0.0.1.020811.1151-slighthint.patch 2169 +MD5 b38e62e98fd1b99871a5929893cc5902 files/patch/fontconfig-0.0.1.020826.1330-blacklist.patch 1202 +MD5 02faf1cd55aa11892ede7560867d6ae4 files/patch/fontconfig-2.0-defaultconfig.patch 2491 +MD5 f0caeb63a72c25f75268d7a257425e5b files/patch/fontconfig-2.0-font-matrix.patch 575 +MD5 96098d7e10f3b850b01baa0c7782a3f4 files/patch/fontconfig-2.0-remove-stupid-date.patch 360 +MD5 42abe429c1a3ce0d2954e9290e694218 files/patch/fontconfig-2.0-subdir.patch 2676 +MD5 24a80846e464bda0f30e574bd5eaa502 files/patch/fontconfig-2.0-x11fontpath-date-configure.patch 865 +MD5 37e60cdff43bf3f04e9db8931e0d1f47 files/patch/fontconfig-2.1-slighthint.patch 2171 +MD5 8791cc317d1e601f2cff7218460fb5fc files/patch/fontconfig-2.1-x11fontpath-date-configure.patch 585 +MD5 a56fb55c5b144375a684c1626fe5c5db files/patch/fontconfig-2.1-cvs-update-20021221.patch 7727 +MD5 603a8531876d27be276f7325c12b71e8 files/patch/fontconfig-2.1-x11fontpath-date-configure-v2.patch 624 +MD5 4cf5fc54b6e6229ed6526ebc607d8379 files/patch/fontconfig-2.1-fixedwidth.patch 1681 +MD5 bae29a772ce1d8bb56ba41b28c1c82d4 files/patch/fontconfig-2.2-local_fontdir.patch 361 +MD5 e25e1e93eed0e40e559f971959c8cfda files/patch/fontconfig-2.2-local_fontdir-r1.patch 450 +MD5 e9b608d43bce5aa6e135b0047c6b9254 files/patch/fontconfig-2.2-defaultconfig.patch 3608 +MD5 1636083efd15746d8f194aff41aa6e02 files/patch/fontconfig-2.2-blacklist.patch 1216 diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.2.0-r1 b/media-libs/fontconfig/files/digest-fontconfig-2.2.0-r1 new file mode 100644 index 000000000000..8660f2779997 --- /dev/null +++ b/media-libs/fontconfig/files/digest-fontconfig-2.2.0-r1 @@ -0,0 +1 @@ +MD5 cf0ce6c87e5d6362e9ebc8d94a45fdc4 fontconfig-2.2.0.tar.gz 612758 diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.2-blacklist.patch b/media-libs/fontconfig/files/patch/fontconfig-2.2-blacklist.patch new file mode 100644 index 000000000000..bd181c33bdf3 --- /dev/null +++ b/media-libs/fontconfig/files/patch/fontconfig-2.2-blacklist.patch @@ -0,0 +1,54 @@ +--- 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-defaultconfig.patch b/media-libs/fontconfig/files/patch/fontconfig-2.2-defaultconfig.patch new file mode 100644 index 000000000000..7c00840edfe2 --- /dev/null +++ b/media-libs/fontconfig/files/patch/fontconfig-2.2-defaultconfig.patch @@ -0,0 +1,110 @@ +--- fontconfig-2.1.94/fonts.conf.in.defaultconfig 2003-04-17 18:34:08.000000000 +0200 ++++ fontconfig-2.1.94/fonts.conf.in 2003-04-17 18:43:12.000000000 +0200 +@@ -265,41 +265,99 @@ + <family>serif</family> + <prefer> + <family>Bitstream Vera Serif</family> +- <family>Times New Roman</family> + <family>Nimbus Roman No9 L</family> + <family>Luxi Serif</family> +- <family>Times</family> ++ <family>Tomas</family> ++ <family>Artsounk</family> ++ <family>BPG UTF8 M</family> ++ <family>Phaisarn</family> ++ <family>Phaisarn98</family> ++ <family>Norasi</family> ++ <family>Times-Hebrew</family> ++ <family>Dror</family> ++ <family>JG LaoTimes</family> ++ <family>Saysettha Unicode</family> ++ <family>Pigiarniq</family> ++ <family>KacstBook</family> ++ <family>Urdu Naqsh Nastalique</family> ++ <family>Raghindi</family> ++ <family>malayalam</family> ++ <family>MS Mincho</family> + <family>Kochi Mincho</family> ++ <family>ZYSong18030</family> ++ <family>MS Song</family> + <family>AR PL SungtiL GB</family> + <family>AR PL Mingti2L Big5</family> +- <family>Baekmuk Batang</family> ++ <family>Baekmuk Batang</family> ++ <family>TSCu_Times</family> ++ <family>Times New Roman</family> ++ <family>Times</family> + </prefer> + </alias> + <alias> + <family>sans-serif</family> + <prefer> + <family>Bitstream Vera Sans</family> +- <family>Verdana</family> +- <family>Nimbus Sans L</family> +- <family>Luxi Sans</family> ++ <family>Luxi Sans</family> ++ <family>Nimbus Sans L</family> + <family>Arial</family> + <family>Helvetica</family> ++ <family>Arija</family> ++ <family>Verdana</family> ++ <family>Lucida Sans Unicode</family> ++ <family>Tahoma</family> ++ <family>Yudit Unicode</family> ++ <family>Kerkis</family> ++ <family>ArmNet Helvetica</family> ++ <family>Artsounk</family> ++ <family>BPG UTF8 M</family> ++ <family>Norasi</family> ++ <family>Nachlieli</family> ++ <family>Saysettha Unicode</family> ++ <family>JG Lao Old Arial</family> ++ <family>GF Zemen Unicode</family> ++ <family>Pigiarniq</family> ++ <family>KacstBook</family> ++ <family>Urdu Naqsh Nastalique</family> ++ <family>Raghindi</family> ++ <family>malayalam</family> ++ <family>Teams</family> ++ <family>MS Gothic</family> + <family>Kochi Gothic</family> ++ <family>ZYSong18030</family> ++ <family>AR PL SungtiL GB</family> ++ <family>AR PL Mingti2L Big5</family> ++ <family>Baekmuk Gulim</family> + <family>AR PL KaitiM GB</family> + <family>AR PL KaitiM Big5</family> + <family>Baekmuk Dotum</family> + <family>SimSun</family> ++ <family>TSCu_Paranar</family> ++ <family>Arial Unicode</family> ++ <family>Code2000</family> + </prefer> + </alias> + <alias> + <family>monospace</family> + <prefer> + <family>Bitstream Vera Sans Mono</family> +- <family>Andale Mono</family> +- <family>Courier New</family> + <family>Luxi Mono</family> + <family>Nimbus Mono L</family> ++ <family>Courier</family> ++ <family>Kurjeris</family> ++ <family>Courier MonoThai</family> ++ <family>Courier-Hebrew</family> ++ <family>Hasida</family> ++ <family>GF Zemen Unicode</family> + <family>Kochi Gothic</family> ++ <family>MS Gothic</family> ++ <family>ZYSong18030</family> ++ <family>AR PL SungtiL GB</family> ++ <family>AR PL Mingti2L Big5</family> ++ <family>Baekmuk Gulim</family> ++ <family>Andale Mono</family> ++ <family>Courier New</family> ++ <family>TSC_AvarangalFxd</family> + <family>AR PL KaitiM GB</family> + <family>Baekmuk Dotum</family> + </prefer> diff --git a/media-libs/fontconfig/fontconfig-2.2.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.2.0-r1.ebuild new file mode 100644 index 000000000000..bd439029a806 --- /dev/null +++ b/media-libs/fontconfig/fontconfig-2.2.0-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.2.0-r1.ebuild,v 1.1 2003/04/27 11:53:28 azarah Exp $ + +inherit eutils + +DESCRIPTION="A library for configuring and customizing font access." +SRC_URI="http://fontconfig.org/release/${P}.tar.gz" +HOMEPAGE="http://fontconfig.org/" + +LICENSE="fontconfig" +SLOT="1.0" +KEYWORDS="~x86 ~alpha ~ppc ~sparc ~mips ~hppa ~arm" + +# Seems like patches in freetype-2.1.2-r2 fixes bug #10028 +DEPEND=">=media-libs/freetype-2.1.4 + >=dev-libs/expat-1.95.3 + >=sys-apps/ed-0.2" + +src_unpack() { + unpack ${A} + + cd ${S} + local PPREFIX="${FILESDIR}/patch/${PN}" + + # Some patches from Redhat + epatch ${PPREFIX}-2.1-slighthint.patch + # Add our local fontpath (duh dont forget!) + epatch ${PPREFIX}-2.2-local_fontdir-r1.patch + # Blacklist some fonts taht breaks fontconfig + epatch ${PPREFIX}-2.2-blacklist.patch + # Add more font family's + epatch ${PPREFIX}-2.2-defaultconfig.patch + + # The date can be troublesome + mv configure configure.old + sed -e "s:\`date\`::" configure.old > configure + chmod +x configure +} + +src_compile() { + # FIXME : docs do not work + econf --disable-docs \ + --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 + mv Makefile Makefile.old + sed -e "s:fc-cache/fc-cache -f -v:sleep 0:" Makefile.old > Makefile + + emake || die + + # remove Luxi TTF fonts from the list, the Type1 are much better + mv fonts.conf fonts.conf.old + sed -e "s:<dir>/usr/X11R6/lib/X11/fonts/TTF</dir>::" fonts.conf.old > fonts.conf +} + +src_install() { + einstall confdir=${D}/etc/fonts \ + datadir=${D}/usr/share || die + + insinto /etc/fonts + doins ${S}/fonts.conf + newins ${S}/fonts.conf fonts.conf.new + + cd ${S} + + mv fc-cache/fc-cache.man fc-cache/fc-cache.1 + mv fc-list/fc-list.man fc-list/fc-list.1 + mv src/fontconfig.man src/fontconfig.3 + for x in fc-cache/fc-cache.1 fc-list/fc-list.1 src/fontconfig.3 + do + doman ${x} + done + + dodoc AUTHORS COPYING 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 -f + fi +} + |