You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2012/04/03 18:25:33 UTC
svn commit: r1309017 - in /incubator/ooo/trunk/main: ./
more_fonts/fonts/ttf_croscore/ more_fonts/fonts/ttf_dejavu/
more_fonts/fonts/ttf_gentium/ scp2/source/ooo/
Author: af
Date: Tue Apr 3 16:25:32 2012
New Revision: 1309017
URL: http://svn.apache.org/viewvc?rev=1309017&view=rev
Log:
119170: Do not include category B fonts by default.
Modified:
incubator/ooo/trunk/main/configure.in
incubator/ooo/trunk/main/fetch_tarballs.sh
incubator/ooo/trunk/main/more_fonts/fonts/ttf_croscore/makefile.mk
incubator/ooo/trunk/main/more_fonts/fonts/ttf_dejavu/makefile.mk
incubator/ooo/trunk/main/more_fonts/fonts/ttf_gentium/makefile.mk
incubator/ooo/trunk/main/ooo.lst
incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp
incubator/ooo/trunk/main/set_soenv.in
Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1309017&r1=1309016&r2=1309017&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Tue Apr 3 16:25:32 2012
@@ -889,7 +889,8 @@ AC_ARG_ENABLE(category-b,
[ --enable-category-b Activate components under a category B license
(see http://www.apache.org/legal/3party.html#category-b):
MPL (seamonkey, hunspell, hyphen, nss, saxon, rhino),
- CPL (silgraphite), CPL/EPL (CoinMP), SPL (beanshell).
+ CPL (silgraphite), CPL/EPL (CoinMP), SPL (beanshell),
+ OFL (fonts).
Flags for individual libraries override this one.
],,)
AC_ARG_WITH(arm-target,
@@ -1350,6 +1351,7 @@ if test "$enable_category_b" = "yes"; th
enable_beanshell="yes"
enable_graphite="yes"
enable_coinmp="yes"
+ enable_category_b_fonts="yes"
AC_MSG_RESULT([yes: allow modules moz, nss, hunspell, hyphen, saxon, rhino, beanshell, graphite, coinmp to be built])
else
@@ -1363,6 +1365,7 @@ else
enable_beanshell="no"
enable_graphite="no"
enable_coinmp="no"
+ enable_category_b_fonts="no"
AC_MSG_RESULT([no: disabled modules moz, nss, hunspell, hyphen, saxon, rhino, beanshell, graphite, coinmp])
fi
@@ -6776,18 +6779,47 @@ else
fi
dnl ===================================================================
-dnl Test whether to include fonts
+dnl Test whether to include category-B fonts
dnl ===================================================================
-AC_MSG_CHECKING([whether to include third-party fonts])
-if test "$with_fonts" != "no" ; then
+WITH_CATB_FONTS=
+AC_MSG_CHECKING([whether to include category B fonts])
+if test "x$enable_category_b_fonts" = "xyes"; then
+ AC_MSG_RESULT([yes])
+ BUILD_TYPE="$BUILD_TYPE CATB_FONTS"
+ WITH_CATB_FONTS=YES
+ SCPDEFS="$SCPDEFS -DWITH_CATB_FONTS"
+else
+ AC_MSG_RESULT([no])
+ WITH_CATB_FONTS=NO
+fi
+
+dnl ===================================================================
+dnl Test whether to include category-A fonts
+dnl ===================================================================
+WITH_CATA_FONTS=
+AC_MSG_CHECKING([whether to include category A fonts])
+if test "x$with_fonts" != "xno" ; then
AC_MSG_RESULT([yes])
- WITH_FONTS=YES
+ WITH_CATA_FONTS=YES
+ SCPDEFS="$SCPDEFS -DWITH_CATA_FONTS"
+else
+ AC_MSG_RESULT([no])
+ WITH_CATA_FONTS=NO
+ WITH_CATB_FONTS=NO
+fi
+
+WITH_FONTS=NO
+AC_MSG_CHECKING([whether any fonts are included])
+if test "x$WITH_CATA_FONTS" = "xYES" -o "x$WITH_CATB_FONTS" = "xYES"; then
BUILD_TYPE="$BUILD_TYPE MORE_FONTS"
+ WITH_FONTS=YES
+ AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
- WITH_FONTS=NO
- SCPDEFS="$SCPDEFS -DWITHOUT_FONTS"
fi
+
+AC_SUBST(WITH_CATA_FONTS)
+AC_SUBST(WITH_CATB_FONTS)
AC_SUBST(WITH_FONTS)
dnl ===================================================================
Modified: incubator/ooo/trunk/main/fetch_tarballs.sh
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/fetch_tarballs.sh?rev=1309017&r1=1309016&r2=1309017&view=diff
==============================================================================
--- incubator/ooo/trunk/main/fetch_tarballs.sh (original)
+++ incubator/ooo/trunk/main/fetch_tarballs.sh Tue Apr 3 16:25:32 2012
@@ -207,6 +207,19 @@ while read line ; do
download $line
;;
+ # If the line starts with the name of an environment variable than the file is
+ # downloaded only when the variable evaluates to YES.
+ [A-Z0-9_]*:*)
+ prefix=`echo $line | sed 's/:.*$//'`
+ if [ -n "$prefix" ]; then
+ eval value=\$$prefix
+ if [ "x$value" = "xYES" ]; then
+ line=`echo $line | sed 's/^.*://'`
+ download_and_check $UrlHead$line
+ fi
+ fi
+ ;;
+
# Any other line is interpreted as the second part of a partial URL.
# It is appended to UrlHead and then downloaded.
*)
Modified: incubator/ooo/trunk/main/more_fonts/fonts/ttf_croscore/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/more_fonts/fonts/ttf_croscore/makefile.mk?rev=1309017&r1=1309016&r2=1309017&view=diff
==============================================================================
--- incubator/ooo/trunk/main/more_fonts/fonts/ttf_croscore/makefile.mk (original)
+++ incubator/ooo/trunk/main/more_fonts/fonts/ttf_croscore/makefile.mk Tue Apr 3 16:25:32 2012
@@ -28,6 +28,13 @@ TARGET=ttf_croscore
.INCLUDE : settings.mk
+.IF "$(WITH_CATB_FONTS)" != "YES"
+
+@all:
+ @echo "category B licensed CrossCore font is disabled."
+
+.ELSE
+
# --- Files --------------------------------------------------------
TARFILE_NAME=croscorefonts-1.21.0
@@ -52,3 +59,4 @@ BUILD_FLAGS=
.INCLUDE : tg_ext.mk
.ENDIF
+.ENDIF
Modified: incubator/ooo/trunk/main/more_fonts/fonts/ttf_dejavu/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/more_fonts/fonts/ttf_dejavu/makefile.mk?rev=1309017&r1=1309016&r2=1309017&view=diff
==============================================================================
--- incubator/ooo/trunk/main/more_fonts/fonts/ttf_dejavu/makefile.mk (original)
+++ incubator/ooo/trunk/main/more_fonts/fonts/ttf_dejavu/makefile.mk Tue Apr 3 16:25:32 2012
@@ -30,6 +30,13 @@ TARGET=ttf_dejavu
.INCLUDE : settings.mk
+.IF "$(WITH_CATA_FONTS)" != "YES"
+
+@all:
+ @echo "category A licensed DejaVu font is disabled."
+
+.ELSE
+
# --- Files --------------------------------------------------------
TARFILE_NAME=dejavu-fonts-ttf-2.33
@@ -55,3 +62,4 @@ BUILD_FLAGS=
.INCLUDE : tg_ext.mk
.ENDIF
+.ENDIF
Modified: incubator/ooo/trunk/main/more_fonts/fonts/ttf_gentium/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/more_fonts/fonts/ttf_gentium/makefile.mk?rev=1309017&r1=1309016&r2=1309017&view=diff
==============================================================================
--- incubator/ooo/trunk/main/more_fonts/fonts/ttf_gentium/makefile.mk (original)
+++ incubator/ooo/trunk/main/more_fonts/fonts/ttf_gentium/makefile.mk Tue Apr 3 16:25:32 2012
@@ -30,6 +30,13 @@ TARGET=ttf_gentium
.INCLUDE : settings.mk
+.IF "$(WITH_CATB_FONTS)" != "YES"
+
+@all:
+ @echo "category B licensed Gentium font is disabled."
+
+.ELSE
+
# --- Files --------------------------------------------------------
TARFILE_NAME=gentiumbasic-fonts-1.10
@@ -55,3 +62,4 @@ BUILD_FLAGS=
.INCLUDE : tg_ext.mk
.ENDIF
+.ENDIF
\ No newline at end of file
Modified: incubator/ooo/trunk/main/ooo.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ooo.lst?rev=1309017&r1=1309016&r2=1309017&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ooo.lst (original)
+++ incubator/ooo/trunk/main/ooo.lst Tue Apr 3 16:25:32 2012
@@ -43,7 +43,7 @@ e81c2f0953aa60f8062c05a4673f2be0-Python-
ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz
ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz
-f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip
+WITH_CATA_FONTS:f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip
fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
fcc6df1160753d0b8c835d17fdeeb0a7-boost_1_39_0.tar.gz
fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
@@ -52,10 +52,10 @@ fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleI
24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html
2b5f1ca58d6ef30f18f1415b65bed81c-CoinMP-1.6.0.tgz
377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
-35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
+WITH_CATB_FONTS:35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz
-61f59e4110781cbe66b46449eadac231-croscorefonts-1.21.0.tar.gz
+WITH_CATB_FONTS:61f59e4110781cbe66b46449eadac231-croscorefonts-1.21.0.tar.gz
68dd2e8253d9a7930e9fd50e2d7220d0-hunspell-1.2.9.tar.gz
99d94103662a8d0b571e247a77432ac5-rhino1_7R3.zip
a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp?rev=1309017&r1=1309016&r2=1309017&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp Tue Apr 3 16:25:32 2012
@@ -28,116 +28,101 @@
STD_FONT_FILE( gid_File_Fnt_Opensymb, opens___.ttf, OpenSymbol)
// DejaVu fonts
+#ifdef WITH_CATA_FONTS
// DejaVuSans Proportional
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSans, DejaVuSans.ttf, DejaVu Sans)
STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Bold, DejaVuSans-Bold.ttf, DejaVu Sans Bold)
STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Oblique, DejaVuSans-Oblique.ttf, DejaVu Sans Oblique)
STD_FONT_FILE( gid_File_Fnt_DejaVuSans_BoldOblique, DejaVuSans-BoldOblique.ttf, DejaVu Sans Bold Oblique)
-#endif
// DejaVuSans ExtraLight
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSansExtraLight, DejaVuSans-ExtraLight.ttf, DejaVu Sans ExtraLight)
-#endif
// DejaVuSans Condensed
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed, DejaVuSansCondensed.ttf, DejaVu Sans Condensed)
STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Bold, DejaVuSansCondensed-Bold.ttf, DejaVu Sans Condensed Bold)
STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Oblique, DejaVuSansCondensed-Oblique.ttf, DejaVu Sans Condensed Oblique)
STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_BoldOblique, DejaVuSansCondensed-BoldOblique.ttf, DejaVu Sans Condensed Bold Oblique)
-#endif
// DejaVuSans Mono
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono, DejaVuSansMono.ttf, DejaVu Sans Mono)
STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Bold, DejaVuSansMono-Bold.ttf, DejaVu Sans Mono Bold)
STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Oblique, DejaVuSansMono-Oblique.ttf, DejaVu Sans Mono Oblique)
STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_BoldOblique, DejaVuSansMono-BoldOblique.ttf, DejaVu Sans Mono Bold Oblique)
-#endif
// DejaVuSerif Proportional
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSerif, DejaVuSerif.ttf, DejaVu Serif)
STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Bold, DejaVuSerif-Bold.ttf, DejaVu Serif Bold)
STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Italic, DejaVuSerif-Italic.ttf, DejaVu Serif Italic)
STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_BoldItalic, DejaVuSerif-BoldItalic.ttf, DejaVu Serif Bold Italic)
-#endif
// DejaVuSerif Condensed
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed, DejaVuSerifCondensed.ttf, DejaVu Serif Condensed)
STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Bold, DejaVuSerifCondensed-Bold.ttf, DejaVu Serif Condensed Bold)
STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Italic, DejaVuSerifCondensed-Italic.ttf, DejaVu Serif Condensed Italic)
STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondensed-BoldItalic.ttf, DejaVu Serif Condensed Bold Italic)
-#endif
+#endif // WITH_CATA_FONTS
+
// Google ChromeOS fonts
// Arimo
-#ifndef WITHOUT_FONTS
+#ifdef WITH_CATB_FONTS
+
STD_FONT_FILE( gid_File_Fnt_Arimo_Regular, Arimo-Regular.ttf, Arimo Regular)
STD_FONT_FILE( gid_File_Fnt_Arimo_Bold, Arimo-Bold.ttf, Arimo Bold)
STD_FONT_FILE( gid_File_Fnt_Arimo_Italic, Arimo-Italic.ttf, Arimo Italic)
STD_FONT_FILE( gid_File_Fnt_Arimo_BoldItalic, Arimo-BoldItalic.ttf, Arimo Bold Italic)
+
+#ifdef UNX
+File gid_File_FcLocal_Conf
+ Dir = gid_Dir_Fonts_Truetype;
+ USER_FILE_BODY;
+// Styles = ();
+ Name = "fc_local.conf";
+End
#endif
-// Cousine
-#ifndef WITHOUT_FONTS
+
#ifndef WNT
+
+// Cousine
STD_FONT_FILE( gid_File_Fnt_Cousine_Regular, Cousine-Regular.ttf, Cousine Regular)
STD_FONT_FILE( gid_File_Fnt_Cousine_Bold, Cousine-Bold.ttf, Cousine Bold)
STD_FONT_FILE( gid_File_Fnt_Cousine_Italic, Cousine-Italic.ttf, Cousine Italic)
STD_FONT_FILE( gid_File_Fnt_Cousine_BoldItalic, Cousine-BoldItalic.ttf, Cousine Bold Italic)
-#endif
-#endif
// Tinos
-#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_Tinos_Regular, Tinos-Regular.ttf, Tinos Regular)
STD_FONT_FILE( gid_File_Fnt_Tinos_Bold, Tinos-Bold.ttf, Tinos Bold)
STD_FONT_FILE( gid_File_Fnt_Tinos_Italic, Tinos-Italic.ttf, Tinos Italic)
STD_FONT_FILE( gid_File_Fnt_Tinos_BoldItalic, Tinos-BoldItalic.ttf, Tinos Bold Italic)
-#endif
-#endif
// Symbol Neu
-#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_SymbolNeu, SymbolNeu.ttf, Symbol Neu)
-#endif
-#endif
+
+#endif // WNT
+
+#endif // WITH_CATB_FONTS
+
// Gentium fonts
-#ifndef WITHOUT_FONTS
+#ifdef WITH_CATB_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
-#ifdef UNX
-#ifndef WITHOUT_FONTS
-File gid_File_FcLocal_Conf
- Dir = gid_Dir_Fonts_Truetype;
- USER_FILE_BODY;
-// Styles = ();
- Name = "fc_local.conf";
-End
-#endif
-#endif
-
Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1309017&r1=1309016&r2=1309017&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Tue Apr 3 16:25:32 2012
@@ -1905,6 +1905,8 @@ ToFile( "MOZ_LIB_XPCOM", "@MOZ_LIB_X
ToFile( "MOZ_NSPR_CFLAGS", "@MOZ_NSPR_CFLAGS@", "e" );
ToFile( "MOZ_NSS_CFLAGS", "@MOZ_NSS_CFLAGS@", "e" );
ToFile( "MOZ_LDAP_CFLAGS", "@MOZ_LDAP_CFLAGS@", "e" );
+ToFile( "WITH_CATA_FONTS", "@WITH_CATA_FONTS@", "e" );
+ToFile( "WITH_CATB_FONTS", "@WITH_CATB_FONTS@", "e" );
ToFile( "WITH_FONTS", "@WITH_FONTS@", "e" );
ToFile( "WITHOUT_AFMS", "@WITHOUT_AFMS@", "e" );
ToFile( "WITHOUT_PPDS", "@WITHOUT_PPDS@", "e" );