Mercurial Mercurial > upstream > oracle > xnv / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6639996 Include 'Liberation' fonts
authorGlynn Foster <Glynn.Foster@Sun.COM>
Thu, 20 Mar 2008 14:36:45 -0700
changeset 372 010a9497c63b
parent 371 d0a78a85764b
child 373 83a13de68771
6639996 Include 'Liberation' fonts
open-src/font/Makefile file | annotate | diff | comparison | revisions
open-src/font/liberation/Makefile file | annotate | diff | comparison | revisions
packages/SUNWxwfnt/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxwfnt/prototype_com file | annotate | diff | comparison | revisions 
--- a/open-src/font/Makefile	Wed Mar 19 16:31:55 2008 -0700
+++ b/open-src/font/Makefile	Thu Mar 20 14:36:45 2008 -0700
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.5	08/02/05 SMI
+# @(#)Makefile	1.6	08/03/20 SMI
 #
 ###############################################################################
 
@@ -37,6 +37,7 @@
 	sun-aliases \
 	bitstream-vera \
 	deja-vu \
+	liberation \
 	adobe-utopia-type1 \
 	bh-type1 \
 	bitstream-type1 \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/liberation/Makefile	Thu Mar 20 14:36:45 2008 -0700
@@ -0,0 +1,101 @@
+###############################################################################
+#
+# Liberation Fonts Makefile
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile	1.1	08/03/19 SMI
+#
+
+PWD:sh=pwd
+TOP=$(PWD)/../..
+
+# Version number (used in path names)
+SOURCE_VERSION=3
+VERSION=0.2
+
+# Source tarball
+SOURCE_TARBALL_NAME=liberation-fonts-ttf-$(SOURCE_VERSION).tar.gz
+
+# Download site for source
+SOURCE_URL=http://www.redhat.com/f/fonts/$(SOURCE_TARBALL_NAME)
+SOURCE_URL_SET=yes
+SOURCE_UNCOMPRESS=gzcat
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=		# None
+
+# Directory created by unpacking source
+SOURCE_DIR=$(BUILD_DIR)/liberation-fonts-$(VERSION)
+
+# What to build
+BUILD_TARGETS=$(SOURCE_DIR)/fonts.scale
+
+# Directory to install to
+FONT_DEST_DIR=$(PROTODIR)$(TRUETYPE_DIR)
+FONTCONF_DEST_DIR=$(PROTODIR)/etc/fonts
+
+# License file
+LICENSE_FILE=License.txt
+LICENSE_FILE_SET=yes
+
+### Include common rulesets
+include $(TOP)/common/Makefile.inc
+
+### Rules specific to this directory:
+
+LIBERATION_FONT_FILES= \
+	LiberationMono-Bold.ttf \
+	LiberationMono-BoldItalic.ttf \
+	LiberationMono-Italic.ttf \
+	LiberationMono-Regular.ttf \
+	LiberationSans-Bold.ttf \
+	LiberationSans-BoldItalic.ttf \
+	LiberationSans-Italic.ttf \
+	LiberationSans-Regular.ttf \
+	LiberationSerif-Bold.ttf \
+	LiberationSerif-BoldItalic.ttf \
+	LiberationSerif-Italic.ttf \
+	LiberationSerif-Regular.ttf
+
+build_gen: $(BUILD_TARGETS)
+
+$(SOURCE_DIR)/fonts.scale: $(UNPACK_TARGET)
+	(cd $(SOURCE_DIR) && \
+	 LD_LIBRARY_PATH=$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
+	 $(PROTODIR)$(X11_DIR)/bin/mkfontscale . )
+
+install_gen:: $(BUILD_TARGETS)
+	mkdir -p $(FONT_DEST_DIR)
+	-( cd $(FONT_DEST_DIR) ; rm -f $(LIBERATION_FONT_FILES) )
+	( cd $(SOURCE_DIR)/ ; cp -p $(LIBERATION_FONT_FILES) $(FONT_DEST_DIR) )
+	touch $(FONT_DEST_DIR)/fonts.scale
+	chmod +w $(FONT_DEST_DIR)/fonts.scale
+	../merge-fonts.scale.pl -i $(FONT_DEST_DIR)/fonts.scale \
+		-i $(SOURCE_DIR)/fonts.scale -o $(FONT_DEST_DIR)/fonts.scale
--- a/packages/SUNWxwfnt/copyright.add	Wed Mar 19 16:31:55 2008 -0700
+++ b/packages/SUNWxwfnt/copyright.add	Thu Mar 20 14:36:45 2008 -0700
@@ -25,3 +25,15 @@
  DejaVuSansMono-BoldOblique.ttf  
 
 include font/deja-vu/COPYING
+
+------------------------------------------------------------------------------
+For these font files in /usr/X11/lib/X11/fonts/TrueType:
+
+ LiberationMono-Bold.ttf              LiberationSans-Italic.ttf
+ LiberationMono-BoldItalic.ttf        LiberationSans-Regular.ttf
+ LiberationMono-Italic.ttf            LiberationSerif-Bold.ttf
+ LiberationMono-Regular.ttf           LiberationSerif-BoldItalic.ttf
+ LiberationSans-Bold.ttf              LiberationSerif-Italic.ttf
+ LiberationSans-BoldItalic.ttf        LiberationSerif-Regular.ttf
+
+include font/liberation/COPYING
--- a/packages/SUNWxwfnt/prototype_com	Wed Mar 19 16:31:55 2008 -0700
+++ b/packages/SUNWxwfnt/prototype_com	Thu Mar 20 14:36:45 2008 -0700
@@ -29,7 +29,7 @@
 #
 ###########################################################################
 #
-#	@(#)prototype_com	35.50	08/03/07	Sun Microsystems
+#	@(#)prototype_com	35.51	08/03/20	Sun Microsystems
 #
 #  X Window System required core fonts package
 
@@ -786,6 +786,18 @@
 f none openwin/lib/X11/fonts/TrueType/GillSans-BoldItalic.ttf 0644 root bin
 f none openwin/lib/X11/fonts/TrueType/GillSans-Italic.ttf 0644 root bin
 f none openwin/lib/X11/fonts/TrueType/GillSans.ttf 0644 root bin
+f none openwin/lib/X11/fonts/TrueType/LiberationMono-Bold.ttf 0644 root bin
+f none openwin/lib/X11/fonts/TrueType/LiberationMono-BoldItalic.ttf 0644 root bin
+f none openwin/lib/X11/fonts/TrueType/LiberationMono-Italic.ttf 0644 root bin
+f none openwin/lib/X11/fonts/TrueType/LiberationMono-Regular.ttf 0644 root bin
+f none openwin/lib/X11/fonts/TrueType/LiberationSans-Bold.ttf 0644 root bin
+f none openwin/lib/X11/fonts/TrueType/LiberationSans-BoldItalic.ttf 0644 root bin
+f none openwin/lib/X11/fonts/TrueType/LiberationSans-Italic.ttf 0644 root bin
+f none openwin/lib/X11/fonts/TrueType/LiberationSans-Regular.ttf 0644 root bin
+f none openwin/lib/X11/fonts/TrueType/LiberationSerif-Bold.ttf 0644 root bin
+f none openwin/lib/X11/fonts/TrueType/LiberationSerif-BoldItalic.ttf 0644 root bin
+f none openwin/lib/X11/fonts/TrueType/LiberationSerif-Italic.ttf 0644 root bin
+f none openwin/lib/X11/fonts/TrueType/LiberationSerif-Regular.ttf 0644 root bin
 f none openwin/lib/X11/fonts/TrueType/LucidaBrightDemiBold.ttf 0644 root bin
 f none openwin/lib/X11/fonts/TrueType/LucidaBrightDemiItalic.ttf 0644 root bin
 f none openwin/lib/X11/fonts/TrueType/LucidaBrightItalic.ttf 0644 root bin
upstream/oracle/xnv