Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove the FreeMono font for licensing reasons

Browse Source
This commit is contained in:
macallan 2012-04-05 02:46:21 +00:00
parent a2edf997c0
commit 89fafab322
3 changed files with 3 additions and 5916 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5905
sys/dev/wsfont/FreeMono_12x22.h
View File

File diff suppressed because it is too large Load Diff

3
sys/dev/wsfont/files.wsfont
View File

@ -1,4 +1,4 @@
# $NetBSD: files.wsfont,v 1.18 2011/12/28 18:29:48 macallan Exp $
# $NetBSD: files.wsfont,v 1.19 2012/04/05 02:46:21 macallan Exp $
defpseudo wsfont
@ -24,6 +24,5 @@ defflag opt_wsfont.h FONT_BOLD8x16
FONT_DEJAVU_SANS_MONO12x22
FONT_DROID_SANS_MONO12x22
FONT_DROID_SANS_MONO9x18
FONT_FREEMONO12x22
file dev/wsfont/wsfontdev.c wsfont needs-flag

11
sys/dev/wsfont/wsfont.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsfont.c,v 1.54 2012/01/13 16:08:02 macallan Exp $ */
/* $NetBSD: wsfont.c,v 1.55 2012/04/05 02:46:21 macallan Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.54 2012/01/13 16:08:02 macallan Exp $");
__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.55 2012/04/05 02:46:21 macallan Exp $");
#include "opt_wsfont.h"
@ -127,10 +127,6 @@ __KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.54 2012/01/13 16:08:02 macallan Exp $")
#include <dev/wsfont/Droid_Sans_Mono_9x18.h>
#endif
#ifdef FONT_FREEMONO12x22
#include <dev/wsfont/FreeMono_12x22.h>
#endif
/* Make sure we always have at least one bitmap font. */
#ifndef HAVE_FONT
#define HAVE_FONT 1
@ -219,9 +215,6 @@ static struct font builtin_fonts[] = {
#endif
#ifdef FONT_DROID_SANS_MONO9x18
{ { NULL, NULL }, &Droid_Sans_Mono_9x18, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
#endif
#ifdef FONT_FREEMONO12x22
{ { NULL, NULL }, &FreeMono_12x22, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
#endif
{ { NULL, NULL }, NULL, 0, 0, 0 },
};