summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconfigure8
-rw-r--r--configure.in6
-rw-r--r--ooo.lst2
-rw-r--r--scp2/source/ooo/file_font_ooo.scp102
-rw-r--r--scp2/source/ooo/file_library_ooo.scp4
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp4
-rw-r--r--solenv/config/sdev300.ini2
-rw-r--r--solenv/inc/minor.mk6
-rw-r--r--splitbuild/extern.lst2
9 files changed, 42 insertions, 94 deletions
diff --git a/configure b/configure
index ddeb15d834a2..3e9ae5ad6a60 100755
--- a/configure
+++ b/configure
@@ -27204,7 +27204,7 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_codec_jar" >&5
echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_codec_jar" >&6
if test $ac_cv_file__usr_share_java_commons_codec_jar = yes; then
- COMMONS_CODEC_JAR=/usr/share/java/commons-codecs.jar
+ COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar
else
{ { echo "$as_me:$LINENO: error: commons-codec.jar replacement not found." >&5
echo "$as_me: error: commons-codec.jar replacement not found." >&2;}
@@ -28054,13 +28054,13 @@ echo "${ECHO_T}no" >&6
SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
fi
-echo "$as_me:$LINENO: checking whether to include Bitstream Vera fonts" >&5
-echo $ECHO_N "checking whether to include Bitstream Vera fonts... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking whether to include third-party fonts" >&5
+echo $ECHO_N "checking whether to include third-party fonts... $ECHO_C" >&6
if test "$with_fonts" != "no" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
WITH_FONTS=YES
- BUILD_TYPE="$BUILD_TYPE BITSTREAM_VERA_FONTS"
+ BUILD_TYPE="$BUILD_TYPE MORE_FONTS"
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
diff --git a/configure.in b/configure.in
index 765b78dd6cf7..10f2fc4d73e9 100644
--- a/configure.in
+++ b/configure.in
@@ -6045,7 +6045,7 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
[ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar ],
[
AC_CHECK_FILE(/usr/share/java/commons-codec.jar,
- [ COMMONS_CODEC_JAR=/usr/share/java/commons-codecs.jar ],
+ [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar ],
[AC_MSG_ERROR(commons-codec.jar replacement not found.)]
)
]
@@ -6415,11 +6415,11 @@ fi
dnl ===================================================================
dnl Test whether to include fonts
dnl ===================================================================
-AC_MSG_CHECKING([whether to include Bitstream Vera fonts])
+AC_MSG_CHECKING([whether to include third-party fonts])
if test "$with_fonts" != "no" ; then
AC_MSG_RESULT([yes])
WITH_FONTS=YES
- BUILD_TYPE="$BUILD_TYPE BITSTREAM_VERA_FONTS"
+ BUILD_TYPE="$BUILD_TYPE MORE_FONTS"
else
AC_MSG_RESULT([no])
WITH_FONTS=NO
diff --git a/ooo.lst b/ooo.lst
index 866670f9de15..d2f92d6ef534 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -15,7 +15,7 @@ http://hg.services.openoffice.org/binaries
2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz
-30102daecfb3a6aa022d2691dc075180-liberation-fonts-1.05.zip
+ef9ab6c1740682fbd730606d5f6922e6-liberation-fonts-ttf-1.05.3.20100427.zip
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index f26339fe8b1d..8ad8526d9ef6 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -27,6 +27,8 @@
#include "macros.inc"
+// OpenSymbol
+
STD_FONT_FILE( gid_File_Fnt_Opensymb, opens___.ttf, OpenSymbol)
// DejaVu fonts
@@ -34,17 +36,8 @@ STD_FONT_FILE( gid_File_Fnt_Opensymb, opens___.ttf, OpenSymbol)
// DejaVuSans Proportional
#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSans, DejaVuSans.ttf, DejaVu Sans)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Bold, DejaVuSans-Bold.ttf, DejaVu Sans Bold)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Oblique, DejaVuSans-Oblique.ttf, DejaVu Sans Oblique)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSans_BoldOblique, DejaVuSans-BoldOblique.ttf, DejaVu Sans Bold Oblique)
#endif
@@ -56,51 +49,24 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSansExtraLight, DejaVuSans-ExtraLight.ttf, Dej
// DejaVuSans Condensed
#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed, DejaVuSansCondensed.ttf, DejaVu Sans Condensed)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Bold, DejaVuSansCondensed-Bold.ttf, DejaVu Sans Condensed Bold)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Oblique, DejaVuSansCondensed-Oblique.ttf, DejaVu Sans Condensed Oblique)
-#endif
-
-#ifndef WITHOUT_FONTS
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)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Bold, DejaVuSansMono-Bold.ttf, DejaVu Sans Mono Bold)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Oblique, DejaVuSansMono-Oblique.ttf, DejaVu Sans Mono Oblique)
-#endif
-
-#ifndef WITHOUT_FONTS
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)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Bold, DejaVuSerif-Bold.ttf, DejaVu Serif Bold)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Italic, DejaVuSerif-Italic.ttf, DejaVu Serif Italic)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_BoldItalic, DejaVuSerif-BoldItalic.ttf, DejaVu Serif Bold Italic)
#endif
@@ -115,27 +81,20 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondense
// Liberation fonts
-// Liberation Mono
+// Liberation Sans Narrow
#ifndef WITHOUT_FONTS
-#ifndef WNT
-STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono Regular)
-#endif
+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)
-#endif
-#endif
-
-#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono Italic)
-#endif
-#endif
-
-#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation Mono Bold Italic)
#endif
#endif
@@ -144,23 +103,8 @@ STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic
#ifndef WITHOUT_FONTS
#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans Regular)
-#endif
-#endif
-
-#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans Italic)
-#endif
-#endif
-
-#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Serif Bold)
-#endif
-#endif
-
-#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic)
#endif
#endif
@@ -169,23 +113,8 @@ STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic
#ifndef WITHOUT_FONTS
#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif Regular)
-#endif
-#endif
-
-#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif Bold)
-#endif
-#endif
-
-#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif Italic)
-#endif
-#endif
-
-#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic)
#endif
#endif
@@ -206,3 +135,16 @@ 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
+// 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
+
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 7d4e6c2a1954..5ce656d436eb 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1383,7 +1383,7 @@ STD_LIB_FILE( gid_File_Lib_Sts , sts)
STD_UNO_LIB_FILE( gid_File_Lib_Svl, svl )
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt )
-STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
+STD_UNO_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx)
STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
STD_LIB_FILE( gid_File_Lib_Editeng, editeng)
@@ -1485,6 +1485,8 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1)
SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1.uno)
+SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno)
+
SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
File gid_File_Lib_Lnth
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index a91114de03d7..38eeb0b47272 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -750,6 +750,10 @@ Module gid_Module_Root_Fonts_OOo_Hidden
gid_File_Fnt_DejaVuSerifCondensed_BoldItalic,
gid_File_Fnt_DejaVuSerifCondensed_Italic,
gid_File_Fnt_DejaVuSerifCondensed,
+ gid_File_Fnt_LibSansNarrow_Regular,
+ gid_File_Fnt_LibSansNarrow_Bold,
+ gid_File_Fnt_LibSansNarrow_BoldItalic,
+ gid_File_Fnt_LibSansNarrow_Italic,
gid_File_Fnt_LiberationMono_Bold,
gid_File_Fnt_LiberationMono_BoldItalic,
gid_File_Fnt_LiberationMono_Italic,
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 885a126a6845..59fb8c263d16 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -8,7 +8,7 @@ common
BIG_SVX TRUE
BMP_WRITES_FLAG TRUE
BUILD_SPECIAL TRUE
- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT
+ BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT
common_build TRUE
COMMON_OUTDIR common
CONFIG_PROJECT config_office
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 35f9f02ac2d6..15a331cd8600 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=300
-RSCREVISION=300m80(Build:9507)
-BUILD=9507
-LAST_MINOR=m80
+RSCREVISION=300m81(Build:9509)
+BUILD=9509
+LAST_MINOR=m81
SOURCEVERSION=DEV300
diff --git a/splitbuild/extern.lst b/splitbuild/extern.lst
index d0327f963e34..000db8095f5c 100644
--- a/splitbuild/extern.lst
+++ b/splitbuild/extern.lst
@@ -1 +1 @@
-afms agg apache-commons apple_remote beanshell berkeleydb bitstream_vera_fonts boost cairo cppunit curl epm expat external graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD moz neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib
+afms agg apache-commons apple_remote beanshell berkeleydb boost cairo cppunit curl epm expat external graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD more_fonts moz neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 17:52:44 +0000