Support 'ExtraLight' and 'Heavy' weights, bug #386715.

Package-Manager: portage-2.1.10.27/cvs/Linux x86_64

4 files changed, 75 insertions, 6 deletions

diff --git a/x11-apps/mkfontscale/ChangeLog b/x11-apps/mkfontscale/ChangeLog
index 648c46f44a87..7ba8129cf31c 100644
--- a/x11-apps/mkfontscale/ChangeLog
+++ b/x11-apps/mkfontscale/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/mkfontscale
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/ChangeLog,v 1.84 2011/10/03 17:49:48 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/ChangeLog,v 1.85 2011/10/15 04:58:57 pva Exp $
+
+*mkfontscale-1.0.9-r1 (15 Oct 2011)
+
+  15 Oct 2011; Peter Volkov <pva@gentoo.org> +mkfontscale-1.0.9-r1.ebuild,
+  +files/mkfontscale-1.0.9-heavy-support.txt:
+  Support 'ExtraLight' and 'Heavy' weights, bug #386715.
 
   03 Oct 2011; Joseph Jezak <josejx@gentoo.org> mkfontscale-1.0.9.ebuild:
   Marked ppc/ppc64 stable for bug #380421.
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
index 935d7c562c51..037594e6d72c 100644
--- a/x11-apps/mkfontscale/Manifest
+++ b/x11-apps/mkfontscale/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX mkfontscale-1.0.9-heavy-support.txt 1288 RMD160 3bfe2d7c69406f2f119ba25b6c2884f08b682764 SHA1 1b3695f3b6911c9738b29abeeb48e5358f219e24 SHA256 b7828588ef16e46626a5de1d591e847424a4c2062893562f4d78617cdecaef32
 DIST mkfontscale-1.0.8.tar.bz2 120005 RMD160 fd541fcde06a92a2d688c9dd52d80663a08ec218 SHA1 accfb12751bf3b7ae7b28c1b0b863d5be871398f SHA256 6eb57786cd79eebfbaca386fe24dcfe50689dbf433d052e58291c2925f2050f9
 DIST mkfontscale-1.0.9.tar.bz2 126524 RMD160 7cfbbbe621cfb8da66174c786c4fd58eb7717795 SHA1 5a8ac438d6d6694dcf1314b74c4d9f029da4f486 SHA256 1e911c361c7617aebf2c9bffdc15b7b8956d64a49cef449f533ef1cc418e7e76
 EBUILD mkfontscale-1.0.8.ebuild 686 RMD160 3c3f9731522ad7a1468c9184ad61bdf9f57f4d2d SHA1 6c73cb78602aab1e44d599558e89331b8853db98 SHA256 5f0f034ef1f78c89a04ca43b6ca678a6135f635ebc8a31effbae0d1e8687f6ee
+EBUILD mkfontscale-1.0.9-r1.ebuild 764 RMD160 254bae358ec1f4b19eba561bd47d90f961bf3430 SHA1 c3d2a9cf74699808931492d4b051fb828080a3c2 SHA256 0418f5062aea82e9852168ce18746e321c22495e9a1e49010d8fe4481ac7bf8a
 EBUILD mkfontscale-1.0.9.ebuild 690 RMD160 2895fa185857c8f36671a12a59ceeb157d45757f SHA1 52a23aa82020fe8c466f8213c11e0670b7525b62 SHA256 595ed88fd9b37b03706da2029ff94eeae44e7848b8e26b185402e7881268b90e
-MISC ChangeLog 10106 RMD160 61403e2ae38cd44eca45b457ebfb4ea522b5878f SHA1 908722fa4c540474a13844aff0a651cea27eb488 SHA256 b6e7bf5881c00b3e17775d31f12aafadf67ea5cb5d6576129ebdd2c8497e5a8a
+MISC ChangeLog 10319 RMD160 c2f1045ebe75960ae0566ac1b565e58abc7fbac5 SHA1 50eaf8807cef7d643302b9b6ef3d7dedff6e86c5 SHA256 8551f56a051a3ac95f2218a5fcaa900e3062069dd6a75dd5de4a712d6a77c87c
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6J9cIACgkQcsIHjyDViGSBIwCdEveUxnD9+bDfx1GdiMI7bADu
-X64An1JX66COfeKWLl4hxGg/9nE4XkxQ
-=3N9x
+iF4EAREIAAYFAk6ZEqYACgkQGrk+8vGYmwdZEwD/dbsVuHUlzQmPTBnXW7+pw3QT
+HTC4Q1PycTTLQOpodHcBAI3y2hvGkRcrZw8s1/6wjOBY87ZAlDui+X8mMYdXLXsW
+=ulDx
 -----END PGP SIGNATURE-----
diff --git a/x11-apps/mkfontscale/files/mkfontscale-1.0.9-heavy-support.txt b/x11-apps/mkfontscale/files/mkfontscale-1.0.9-heavy-support.txt
new file mode 100644
index 000000000000..7f14ae6b9519
--- /dev/null
+++ b/x11-apps/mkfontscale/files/mkfontscale-1.0.9-heavy-support.txt
@@ -0,0 +1,36 @@
+From 8ee3b3f73a6c14c4326435fea7136c09fe2822d1 Mon Sep 17 00:00:00 2001
+From: Maxim Iorsh <iorsh@users.sourceforge.net>
+Date: Mon, 03 Oct 2011 19:52:15 +0000
+Subject: mkfontscale: Support FontForge weight designations.
+
+Fontforge uses 'ExtraLight' and 'Heavy' weights in Type 1 fonts, which
+should be understood by mkfontscale. Other FontForge designations are
+already addressed.
+
+Signed-off-by: Maxim Iorsh <iorsh@users.sourceforge.net>
+Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+diff --git a/mkfontscale.c b/mkfontscale.c
+index 31553cb..49bbe77 100644
+--- a/mkfontscale.c
++++ b/mkfontscale.c
+@@ -426,6 +426,8 @@ t1Weight(char *weight)
+         return NULL;
+     if(strcmp(weight, "Thin") == 0)
+         return "thin";
++    if(strcmp(weight, "ExtraLight") == 0) /* FontForge uses this for 200*/
++        return "extralight";
+     if(strcmp(weight, "Light") == 0)
+         return "light";
+     if(strcmp(weight, "Regular") == 0)
+@@ -446,6 +448,8 @@ t1Weight(char *weight)
+         return "semibold";
+     else if(strcmp(weight, "Bold") == 0)
+         return "bold";
++    else if(strcmp(weight, "Heavy") == 0) /* FontForge uses this for 800*/
++        return "extrabold";
+     else if(strcmp(weight, "Black") == 0)
+         return "black";
+     else {
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-apps/mkfontscale/mkfontscale-1.0.9-r1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.0.9-r1.ebuild
new file mode 100644
index 000000000000..67225e574133
--- /dev/null
+++ b/x11-apps/mkfontscale/mkfontscale-1.0.9-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/mkfontscale-1.0.9-r1.ebuild,v 1.1 2011/10/15 04:58:57 pva Exp $
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="create an index of scalable font files for X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libfontenc
+	media-libs/freetype:2"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	app-arch/gzip
+	app-arch/bzip2"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-bzip2
+)
+
+PATCHES=( "${FILESDIR}/mkfontscale-1.0.9-heavy-support.txt" )