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

(Portage version: 2.1.10.27/cvs/Linux x86_64)

3 files changed, 68 insertions, 1 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/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" )