On Thu, Jan 19, 2012 at 07:11:41PM -0800, Pedro Giffuni wrote: > Hmm ... > > --- Gio 19/1/12, Ariel Constenla-Haile <[email protected]> ha scritto: > ... > > > > I don't get the "force people" as long as we already have > > configure switches that set ENABLE_GRAPHITE and WITH_FONTS > > > > Yes but people should be warned and taking out all the > fonts unless you enable graphite would be drastic. > > I guess we could condition the specific liberation > font by adding || graphite checks in > > main/scp2/source/ooo/file_font_ooo.scp > and > main/more_fonts/fonts/ttf_libertine/makefile.mk
I guess this should be down following the WITHOUT_FONTS define done in configure.in, see attached patch. Regards -- Ariel Constenla-Haile La Plata, Argentina
From a8bfb5c592bca4a07751cc32e3d0ad9b560798f3 Mon Sep 17 00:00:00 2001 From: Ariel Constenla-Haile <[email protected]> Date: Fri, 20 Jan 2012 00:49:03 -0300 Subject: [PATCH] Add Linux Libertine G and Linux Biolinum G fonts --- configure.in | 3 + more_fonts/fonts/ttf_linlibertineg/makefile.mk | 57 ++++++++++++++++++++++++ more_fonts/prj/build.lst | 5 +- more_fonts/prj/d.lst | 3 +- ooo.lst | 1 + scp2/source/ooo/file_font_ooo.scp | 19 ++++++++ 6 files changed, 85 insertions(+), 3 deletions(-) create mode 100644 more_fonts/fonts/ttf_linlibertineg/makefile.mk diff --git a/configure.in b/configure.in index 793a44e..55a9c53 100644 --- a/configure.in +++ b/configure.in @@ -6638,6 +6638,9 @@ if test "$with_fonts" != "no" ; then AC_MSG_RESULT([yes]) WITH_FONTS=YES BUILD_TYPE="$BUILD_TYPE MORE_FONTS" + if test "$ENABLE_GRAPHITE" = "FALSE"; then + SCPDEFS="$SCPDEFS -DWITHOUT_LIBERTINE_FONTS" + fi else AC_MSG_RESULT([no]) WITH_FONTS=NO diff --git a/more_fonts/fonts/ttf_linlibertineg/makefile.mk b/more_fonts/fonts/ttf_linlibertineg/makefile.mk new file mode 100644 index 0000000..be80f6c --- /dev/null +++ b/more_fonts/fonts/ttf_linlibertineg/makefile.mk @@ -0,0 +1,57 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +PRJ=..$/.. + +PRJNAME=more_fonts +TARGET=ttf_linlibertineg + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# --- Files -------------------------------------------------------- + +TARFILE_NAME=LinLibertineG-20110922 +TARFILE_MD5=30c468d0c27ae4784195b53f78bc6f64 +TARFILE_ROOTDIR=LinLibertineG + +PATCH_FILES= + + +CONFIGURE_DIR= +CONFIGURE_ACTION= + +BUILD_DIR= +BUILD_ACTION= +BUILD_FLAGS= + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk + +.IF ( "$(WITH_FONTS)"!="NO" && "$(ENABLE_GRAPHITE)" == "TRUE" ) +.INCLUDE : tg_ext.mk +.ENDIF + diff --git a/more_fonts/prj/build.lst b/more_fonts/prj/build.lst index bbfcde0..13b3035 100644 --- a/more_fonts/prj/build.lst +++ b/more_fonts/prj/build.lst @@ -1,3 +1,4 @@ bs more_fonts : solenv NULL -bs more_fonts\fonts\ttf_dejavu nmake - all deja_fonts NULL -bs more_fonts\fonts\ttf_gentium nmake - all gent_fonts NULL +bs more_fonts\fonts\ttf_dejavu nmake - all deja_fonts NULL +bs more_fonts\fonts\ttf_gentium nmake - all gent_fonts NULL +bs more_fonts\fonts\ttf_linlibertineg nmake - all libe_fonts NULL diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst index dc82030..e9c0162 100644 --- a/more_fonts/prj/d.lst +++ b/more_fonts/prj/d.lst @@ -5,4 +5,5 @@ mkdir: %COMMON_DEST%\pck%_EXT% ..\%__SRC%\misc\build\dejavu-fonts-ttf-2.33\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu ..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf ..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_gentium - +..\%__SRC%\misc\build\LinLibertineG\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf +..\%__SRC%\misc\build\LinLibertineG\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_LinLibertineG diff --git a/ooo.lst b/ooo.lst index 546b44a..4c1da8b 100644 --- a/ooo.lst +++ b/ooo.lst @@ -60,3 +60,4 @@ fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt 377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz +30c468d0c27ae4784195b53f78bc6f64-LinLibertineG-20110922.zip diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index 914b47e..a8ec87f 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -90,6 +90,25 @@ STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicItalic, GenBkBasI.ttf, Gentium Book STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium Book Basic Bold Italic) #endif +// Linux Libertine G and Linux Biolinum G fonts + +#ifndef WITHOUT_FONTS +#ifndef WITHOUT_LIBERTINE_FONTS +STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Bold, LinBiolinum_RB_G.ttf, Linux Biolinum G Bold) +STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Italic, LinBiolinum_RI_G.ttf, Linux Biolinum G Italic) +STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Regular, LinBiolinum_R_G.ttf, Linux Biolinum G Regular) + +STD_FONT_FILE( gid_File_Fnt_LinuxLibertineDisplayG_Regular, LinLibertine_DR_G.ttf, Linux Libertine Display G Regular) + +STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Bold, LinLibertine_RB_G.ttf, Linux Libertine G Bold) +STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_BoldItalic, LinLibertine_RBI_G.ttf, Linux Libertine G Bold Italic) +STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Italic, LinLibertine_RI_G.ttf, Linux Libertine G Italic) +STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Regular, LinLibertine_R_G.ttf, Linux Libertine G Regular) +STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Semibold, LinLibertine_RZ_G.ttf, Linux Libertine G Semibold) +STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_SemiboldItalic, LinLibertine_RZI_G.ttf, Linux Libertine G Semibold Italic) +#endif +#endif + // fontconfig updates to allow proper use of local fonts #ifdef UNX -- 1.7.7.5
pgpyt9O81SfC2.pgp
Description: PGP signature
