avmedia101: rebased to DEV300_m81
This commit is contained in:
ka
commit
438cdaab9f
9 changed files with 43 additions and 95 deletions
8
configure
vendored
8
configure
vendored
|
|
@ -21489,7 +21489,7 @@ fi
|
|||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_codec_jar" >&5
|
||||
$as_echo "$ac_cv_file__usr_share_java_commons_codec_jar" >&6; }
|
||||
if test "x$ac_cv_file__usr_share_java_commons_codec_jar" = x""yes; then :
|
||||
COMMONS_CODEC_JAR=/usr/share/java/commons-codecs.jar
|
||||
COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar
|
||||
else
|
||||
as_fn_error "commons-codec.jar replacement not found." "$LINENO" 5
|
||||
|
||||
|
|
@ -22266,13 +22266,13 @@ $as_echo "no" >&6; }
|
|||
SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include Bitstream Vera fonts" >&5
|
||||
$as_echo_n "checking whether to include Bitstream Vera fonts... " >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include third-party fonts" >&5
|
||||
$as_echo_n "checking whether to include third-party fonts... " >&6; }
|
||||
if test "$with_fonts" != "no" ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
WITH_FONTS=YES
|
||||
BUILD_TYPE="$BUILD_TYPE BITSTREAM_VERA_FONTS"
|
||||
BUILD_TYPE="$BUILD_TYPE MORE_FONTS"
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
|
|
|
|||
|
|
@ -6094,7 +6094,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.)]
|
||||
)
|
||||
]
|
||||
|
|
@ -6464,11 +6464,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
|
||||
|
|
|
|||
2
ooo.lst
2
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
|
||||
|
|
|
|||
|
|
@ -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 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)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef WITHOUT_FONTS
|
||||
#ifndef WNT
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -751,6 +751,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,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue