Attachment #77015 for issue #118600

View | Details | Raw Unified | Return to issue 118600
Collapse All | Expand All




#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# 
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org.  If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************

PRJ=..$/..

PRJNAME=more_fonts
TARGET=ttf_gentium

# --- Settings -----------------------------------------------------

.INCLUDE :	settings.mk

# --- Files --------------------------------------------------------

TARFILE_NAME=gentiumbasic-fonts-1.10
TARFILE_MD5=35efabc239af896dfb79be7ebdd6e6b9
TARFILE_ROOTDIR=gentiumbasic-fonts-1.10

PATCH_FILES=


CONFIGURE_DIR=
CONFIGURE_ACTION=

BUILD_DIR=
BUILD_ACTION=
BUILD_FLAGS=

# --- Targets ------------------------------------------------------

.INCLUDE : set_ext.mk
.INCLUDE : target.mk

.IF "$(WITH_FONTS)"!="NO"
.INCLUDE : tg_ext.mk
.ENDIF





#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# 
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org.  If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************

PRJ=..$/..

PRJNAME=more_fonts
TARGET=ttf_liberation

# --- Settings -----------------------------------------------------

.INCLUDE :	settings.mk

# --- Files --------------------------------------------------------

TARFILE_NAME=liberation-fonts-ttf-1.06.0.20100721
TARFILE_MD5=ca4870d899fd7e943ffc310a5421ad4d
TARFILE_ROOTDIR=.

PATCH_FILES=

CONFIGURE_DIR=
CONFIGURE_ACTION=

BUILD_DIR=
BUILD_ACTION=
BUILD_FLAGS=

# --- Targets ------------------------------------------------------

.INCLUDE : set_ext.mk
.INCLUDE : target.mk

.IF "$(WITH_FONTS)"!="NO"
.INCLUDE : tg_ext.mk
.ENDIF


Lines 1-5 Link Here

(-)a/main/more_fonts/prj/build.lst (-2 lines)
1	bs more_fonts : solenv NULL	1	bs more_fonts : solenv NULL
2	bs more_fonts\fonts\ttf_dejavu nmake - all deja_fonts NULL	2	bs more_fonts\fonts\ttf_dejavu nmake - all deja_fonts NULL
3	bs more_fonts\fonts\ttf_liberation nmake - all libe_fonts NULL
4	bs more_fonts\fonts\ttf_gentium nmake - all gent_fonts NULL
5		3

Lines 15-23 http://hg.services.openoffice.org/binaries Link Here

(-)a/main/ooo.lst (-2 lines)
15	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz	15	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
16	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz	16	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
17	2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz	17	2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz
18	ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz
19	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip	18	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
20	35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
21	377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt	19	377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
22	3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz	20	3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
23	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz	21	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz




#endif 


// Liberation fonts

// Liberation Sans Narrow
#ifndef WITHOUT_FONTS 
STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Regular, LiberationSansNarrow-Regular.ttf, Liberation Sans Narrow Regular) 
STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Bold, LiberationSansNarrow-Bold.ttf, Liberation Sans Narrow Bold) 
STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Italic, LiberationSansNarrow-Italic.ttf, Liberation Sans Narrow Italic) 
STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_BoldItalic, LiberationSansNarrow-BoldItalic.ttf, Liberation Sans Narrow Bold Italic) 
#endif

// Liberation Mono
#ifndef WITHOUT_FONTS 
#ifndef WNT 
STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono Regular) 
STD_FONT_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono Bold) 
STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono Italic) 
STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation Mono Bold Italic) 
#endif
#endif

// Liberation Sans
#ifndef WITHOUT_FONTS 
#ifndef WNT 
STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans Regular) 
STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans Italic) 
STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Serif Bold) 
STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic) 
#endif
#endif

// Liberation Serif
#ifndef WITHOUT_FONTS 
#ifndef WNT 
STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif Regular) 
STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif Bold) 
STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif Italic) 
STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic) 
#endif
#endif

// Gentium fonts

#ifndef WITHOUT_FONTS 
STD_FONT_FILE( gid_File_Fnt_GentiumBasicRegular, GenBasR.ttf, Gentium Basic)
STD_FONT_FILE( gid_File_Fnt_GentiumBasicBold, GenBasB.ttf, Gentium Basic Bold)
STD_FONT_FILE( gid_File_Fnt_GentiumBasicItalic, GenBasI.ttf, Gentium Basic Bold)
STD_FONT_FILE( gid_File_Fnt_GentiumBasicBoldItalic, GenBasBI.ttf, Gentium Basic Bold Italic)
#endif 

#ifndef WITHOUT_FONTS 
STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicRegular, GenBkBasR.ttf, Gentium Book Basic)
STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBold, GenBkBasB.ttf, Gentium Book Basic Bold)
STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicItalic, GenBkBasI.ttf, Gentium Book Basic Bold)
STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium Book Basic Bold Italic)
#endif 

// fontconfig updates to allow proper use of local fonts


Return to issue 118600

Lines 1-61 Link Here

(-)a/main/more_fonts/fonts/ttf_gentium/makefile.mk (-61 lines)
1	#*************************************************************************
2	#
3	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	#
5	# Copyright 2000, 2010 Oracle and/or its affiliates.
6	#
7	# OpenOffice.org - a multi-platform office productivity suite
8	#
9	# This file is part of OpenOffice.org.
10	#
11	# OpenOffice.org is free software: you can redistribute it and/or modify
12	# it under the terms of the GNU Lesser General Public License version 3
13	# only, as published by the Free Software Foundation.
14	#
15	# OpenOffice.org is distributed in the hope that it will be useful,
16	# but WITHOUT ANY WARRANTY; without even the implied warranty of
17	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18	# GNU Lesser General Public License version 3 for more details
19	# (a copy is included in the LICENSE file that accompanied this code).
20	#
21	# You should have received a copy of the GNU Lesser General Public License
22	# version 3 along with OpenOffice.org. If not, see
23	# <http://www.openoffice.org/license.html>
24	# for a copy of the LGPLv3 License.
25	#
26	#*************************************************************************
27
28	PRJ=..$/..
29
30	PRJNAME=more_fonts
31	TARGET=ttf_gentium
32
33	# --- Settings -----------------------------------------------------
34
35	.INCLUDE : settings.mk
36
37	# --- Files --------------------------------------------------------
38
39	TARFILE_NAME=gentiumbasic-fonts-1.10
40	TARFILE_MD5=35efabc239af896dfb79be7ebdd6e6b9
41	TARFILE_ROOTDIR=gentiumbasic-fonts-1.10
42
43	PATCH_FILES=
44
45
46	CONFIGURE_DIR=
47	CONFIGURE_ACTION=
48
49	BUILD_DIR=
50	BUILD_ACTION=
51	BUILD_FLAGS=
52
53	# --- Targets ------------------------------------------------------
54
55	.INCLUDE : set_ext.mk
56	.INCLUDE : target.mk
57
58	.IF "$(WITH_FONTS)"!="NO"
59	.INCLUDE : tg_ext.mk
60	.ENDIF
61

Lines 1-60 Link Here

(-)a/main/more_fonts/fonts/ttf_liberation/makefile.mk (-60 lines)
1	#*************************************************************************
2	#
3	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	#
5	# Copyright 2000, 2010 Oracle and/or its affiliates.
6	#
7	# OpenOffice.org - a multi-platform office productivity suite
8	#
9	# This file is part of OpenOffice.org.
10	#
11	# OpenOffice.org is free software: you can redistribute it and/or modify
12	# it under the terms of the GNU Lesser General Public License version 3
13	# only, as published by the Free Software Foundation.
14	#
15	# OpenOffice.org is distributed in the hope that it will be useful,
16	# but WITHOUT ANY WARRANTY; without even the implied warranty of
17	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18	# GNU Lesser General Public License version 3 for more details
19	# (a copy is included in the LICENSE file that accompanied this code).
20	#
21	# You should have received a copy of the GNU Lesser General Public License
22	# version 3 along with OpenOffice.org. If not, see
23	# <http://www.openoffice.org/license.html>
24	# for a copy of the LGPLv3 License.
25	#
26	#*************************************************************************
27
28	PRJ=..$/..
29
30	PRJNAME=more_fonts
31	TARGET=ttf_liberation
32
33	# --- Settings -----------------------------------------------------
34
35	.INCLUDE : settings.mk
36
37	# --- Files --------------------------------------------------------
38
39	TARFILE_NAME=liberation-fonts-ttf-1.06.0.20100721
40	TARFILE_MD5=ca4870d899fd7e943ffc310a5421ad4d
41	TARFILE_ROOTDIR=.
42
43	PATCH_FILES=
44
45	CONFIGURE_DIR=
46	CONFIGURE_ACTION=
47
48	BUILD_DIR=
49	BUILD_ACTION=
50	BUILD_FLAGS=
51
52	# --- Targets ------------------------------------------------------
53
54	.INCLUDE : set_ext.mk
55	.INCLUDE : target.mk
56
57	.IF "$(WITH_FONTS)"!="NO"
58	.INCLUDE : tg_ext.mk
59	.ENDIF
60

Lines 79-139 STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondense Link Here

(-)a/main/scp2/source/ooo/file_font_ooo.scp (-55 lines)
79	#endif	79	#endif
80		80
81		81
82	// Liberation fonts
83
84	// Liberation Sans Narrow
85	#ifndef WITHOUT_FONTS
86	STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Regular, LiberationSansNarrow-Regular.ttf, Liberation Sans Narrow Regular)
87	STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Bold, LiberationSansNarrow-Bold.ttf, Liberation Sans Narrow Bold)
88	STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Italic, LiberationSansNarrow-Italic.ttf, Liberation Sans Narrow Italic)
89	STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_BoldItalic, LiberationSansNarrow-BoldItalic.ttf, Liberation Sans Narrow Bold Italic)
90	#endif
91
92	// Liberation Mono
93	#ifndef WITHOUT_FONTS
94	#ifndef WNT
95	STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono Regular)
96	STD_FONT_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono Bold)
97	STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono Italic)
98	STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation Mono Bold Italic)
99	#endif
100	#endif
101
102	// Liberation Sans
103	#ifndef WITHOUT_FONTS
104	#ifndef WNT
105	STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans Regular)
106	STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans Italic)
107	STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Serif Bold)
108	STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic)
109	#endif
110	#endif
111
112	// Liberation Serif
113	#ifndef WITHOUT_FONTS
114	#ifndef WNT
115	STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif Regular)
116	STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif Bold)
117	STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif Italic)
118	STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic)
119	#endif
120	#endif
121
122	// Gentium fonts
123
124	#ifndef WITHOUT_FONTS
125	STD_FONT_FILE( gid_File_Fnt_GentiumBasicRegular, GenBasR.ttf, Gentium Basic)
126	STD_FONT_FILE( gid_File_Fnt_GentiumBasicBold, GenBasB.ttf, Gentium Basic Bold)
127	STD_FONT_FILE( gid_File_Fnt_GentiumBasicItalic, GenBasI.ttf, Gentium Basic Bold)
128	STD_FONT_FILE( gid_File_Fnt_GentiumBasicBoldItalic, GenBasBI.ttf, Gentium Basic Bold Italic)
129	#endif
130
131	#ifndef WITHOUT_FONTS
132	STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicRegular, GenBkBasR.ttf, Gentium Book Basic)
133	STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBold, GenBkBasB.ttf, Gentium Book Basic Bold)
134	STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicItalic, GenBkBasI.ttf, Gentium Book Basic Bold)
135	STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium Book Basic Bold Italic)
136	#endif
137		82
138	// fontconfig updates to allow proper use of local fonts	83	// fontconfig updates to allow proper use of local fonts
139		84