[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.ac ooo.lst.in
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Nov 8 05:04:13 PST 2012
config_host.mk.in | 20 ++++++++++++++++++++
configure.ac | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
ooo.lst.in | 46 +++++++++++++++++++++-------------------------
3 files changed, 90 insertions(+), 26 deletions(-)
New commits:
commit bc5cff54c3965e526657a4a4b4637e68a36f5e52
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Nov 8 12:17:17 2012 +0100
ooo.lst: these appear to be unused
Change-Id: I8f237a4ff438d8b57a458c17f3d13934fd4b5407
diff --git a/ooo.lst.in b/ooo.lst.in
index 44f71db..5f7420f 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -3,10 +3,6 @@ http://dev-www.libreoffice.org/src
7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
-bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
-d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip
-e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
-0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
@AFMS_TARBALL@
@APACHE_COMMONS_CODEC_TARBALL@
@APACHE_COMMONS_HTTPCLIENT_TARBALL@
commit f6abeab070c861689b10961a6134a0c550d5d568
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Nov 8 12:16:19 2012 +0100
move more tarball names to configure
Change-Id: I10e3a1f9d375ded2087b7bbd9c3d98b35e7868be
diff --git a/config_host.mk.in b/config_host.mk.in
index 9f44d80..59e6f47 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -31,6 +31,7 @@ export ATL_INCLUDE=@ATL_INCLUDE@
export ATL_LIB=@ATL_LIB@
export AWTLIB=@AWTLIB@
export BARCODE_EXTENSION_PACK=@BARCODE_EXTENSION_PACK@
+export BERKELEYDB_TARBALL=@BERKELEYDB_TARBALL@
export BOOST_CPPFLAGS=@BOOST_CPPFLAGS@
export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@
export BOOST_LDFLAGS=@BOOST_LDFLAGS@
@@ -47,6 +48,7 @@ export BUILD_VER_STRING=@BUILD_VER_STRING@
export BUILD_X64=@BUILD_X64@
export CAIRO_CFLAGS=@CAIRO_CFLAGS@
export CAIRO_LIBS=@CAIRO_LIBS@
+export CAIRO_TARBALL=@CAIRO_TARBALL@
export CC=@CC@
export CC_FOR_BUILD=@CC_FOR_BUILD@
export CDR_CFLAGS=@CDR_CFLAGS@
@@ -76,6 +78,7 @@ export COMP_ENV=@OUTPATH@
export COM_FOR_BUILD=@COM_FOR_BUILD@
export CPPUNIT_CFLAGS=@CPPUNIT_CFLAGS@
export CPPUNIT_LIBS=@CPPUNIT_LIBS@
+export CPPUNIT_TARBALL=@CPPUNIT_TARBALL@
export CPU=@CPU@
export CPUNAME=@CPUNAME@
export CPUNAME_FOR_BUILD=@CPUNAME_FOR_BUILD@
@@ -273,6 +276,7 @@ export ICU_RECLASSIFIED_CLOSE_PARENTHESIS=@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@
export ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER=@ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER@
export ICU_RECLASSIFIED_HEBREW_LETTER=@ICU_RECLASSIFIED_HEBREW_LETTER@
export ICU_RECLASSIFIED_PREPEND_SET_EMPTY=@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@
+export ICU_TARBALL=@ICU_TARBALL@
export ILIB=@ILIB@
export INPATH=@INPATH@
export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
@@ -308,6 +312,7 @@ export LANGUAGETOOL_TARBALL=@LANGUAGETOOL_TARBALL@
export L10N_MODULE=@L10N_MODULE@
export LCMS2_CFLAGS=@LCMS2_CFLAGS@
export LCMS2_LIBS=@LCMS2_LIBS@
+export LCMS2_TARBALL==@LCMS2_TARBALL@
ifneq ($(strip @LDFLAGS@),)
export LDFLAGS=@LDFLAGS@
endif
@@ -318,11 +323,13 @@ export LIBEXSLT_CFLAGS=@LIBEXSLT_CFLAGS@
export LIBEXSLT_LIBS=@LIBEXSLT_LIBS@
export LIBEXTTEXTCAT_CFLAGS=@LIBEXTTEXTCAT_CFLAGS@
export LIBEXTTEXTCAT_LIBS=@LIBEXTTEXTCAT_LIBS@
+export LIBEXTTEXTCAT_TARBALL=@LIBEXTTEXTCAT_TARBALL@
export LIBFONTS_JAR=@LIBFONTS_JAR@
export LIBFORMULA_JAR=@LIBFORMULA_JAR@
export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
export LIBLANGTAG_CFLAGS=@LIBLANGTAG_CFLAGS@
export LIBLANGTAG_LIBS=@LIBLANGTAG_LIBS@
+export LIBLANGTAG_TARBALL=@LIBLANGTAG_TARBALL@
export LIBLOADER_JAR=@LIBLOADER_JAR@
export LIBMGR_X64_BINARY=@LIBMGR_X64_BINARY@
export LIBMYSQL_PATH=@LIBMYSQL_PATH@
@@ -333,8 +340,11 @@ export LIBSERIALIZER_JAR=@LIBSERIALIZER_JAR@
export LIBXML_CFLAGS=@LIBXML_CFLAGS@
export LIBXML_JAR=@LIBXML_JAR@
export LIBXML_LIBS=@LIBXML_LIBS@
+export LIBXML_TARBALL=@LIBXML_TARBALL@
+export LIBXMLSEC_TARBALL=@LIBXMLSEC_TARBALL@
export LIBXSLT_CFLAGS=@LIBXSLT_CFLAGS@
export LIBXSLT_LIBS=@LIBXSLT_LIBS@
+export LIBXSLT_TARBALL=@LIBXSLT_TARBALL@
export LINK_X64_BINARY=@LINK_X64_BINARY@
export LPSOLVE_TARBALL=@LPSOLVE_TARBALL@
@x_Cygwin@ export LS=@WIN_LS@
@@ -427,6 +437,7 @@ export MSPUB_TARBALL=@MSPUB_TARBALL@
export MYSQL_DEFINES=@MYSQL_DEFINES@
export MYSQL_INC=@MYSQL_INC@
export MYSQL_LIB=@MYSQL_LIB@
+export MYSQLCPPCONN_TARBALL=@MYSQLCPPCONN_TARBALL@
export MYTHES_CFLAGS=@MYTHES_CFLAGS@
export MYTHES_LIBS=@MYTHES_LIBS@
export MYTHES_TARBALL=@MYTHES_TARBALL@
@@ -438,6 +449,7 @@ export NM=@NM@
export nodep=@nodep@
export NSS_CFLAGS=@NSS_CFLAGS@
export NSS_LIBS=@NSS_LIBS@
+export NSS_TARBALL=@NSS_TARBALL@
export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@
ifneq ($(strip @OBJCFLAGS@),)
export OBJCFLAGS=@OBJCFLAGS@
@@ -458,6 +470,7 @@ export OOO_VENDOR=@OOO_VENDOR@
export OPENLDAP_TARBALL=@OPENLDAP_TARBALL@
export OPENSSL_CFLAGS=@OPENSSL_CFLAGS@
export OPENSSL_LIBS=@OPENSSL_LIBS@
+export OPENSSL_TARBALL=@OPENSSL_TARBALL@
export ORCUS_CFLAGS=@ORCUS_CFLAGS@
export ORCUS_LIBS=@ORCUS_LIBS@
export ORCUS_TARBALL=@ORCUS_TARBALL@
@@ -472,6 +485,7 @@ export OXYGENOFFICE_PACK=@OXYGENOFFICE_PACK@
export PATH=@LO_PATH@
export PATH_SEPERATOR=@P_SEP@
export PERL=@PERL@
+export PIXMAN_TARBALL=@PIXMAN_TARBALL@
export PKGFORMAT=@PKGFORMAT@
export PKGMK=@PKGMK@
export PKG_CONFIG=@PKG_CONFIG@
@@ -501,9 +515,13 @@ export PYTHON=@PYTHON@
export PYTHON_CFLAGS=@PYTHON_CFLAGS@
export PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
export PYTHON_LIBS=@PYTHON_LIBS@
+export PYTHON_TARBALL=@PYTHON_TARBALL@
export RANLIB=@RANLIB@
+export RAPTOR_TARBALL=@RAPTOR_TARBALL@
+export RASQAL_TARBALL=@RASQAL_TARBALL@
export REDLAND_CFLAGS=@REDLAND_CFLAGS@
export REDLAND_LIBS=@REDLAND_LIBS@
+export REDLAND_TARBALL=@REDLAND_TARBALL@
export RHINO_JAR=@RHINO_JAR@
export RHINO_TARBALL=@RHINO_TARBALL@
export RPM=@RPM@
@@ -556,6 +574,7 @@ export SUNTEMPLATES_ES_PACK=@SUNTEMPLATES_ES_PACK@
export SUNTEMPLATES_FR_PACK=@SUNTEMPLATES_FR_PACK@
export SUNTEMPLATES_HU_PACK=@SUNTEMPLATES_HU_PACK@
export SUNTEMPLATES_IT_PACK=@SUNTEMPLATES_IT_PACK@
+export SWING_TARBALL=@SWING_TARBALL@
export SYSBASE=@SYSBASE@
export SYSTEM_APACHE_COMMONS=@SYSTEM_APACHE_COMMONS@
export SYSTEM_BOOST=@SYSTEM_BOOST@
@@ -685,6 +704,7 @@ export WPS_LIBS=@WPS_LIBS@
export WPS_TARBALL=@WPS_TARBALL@
export XINERAMA_LINK=@XINERAMA_LINK@
export XMLLINT=@XMLLINT@
+export XPDF_TARBALL=@XPDF_TARBALL@
export XRANDR_CFLAGS=@XRANDR_CFLAGS@
export XRANDR_DLOPEN=@XRANDR_DLOPEN@
export XRANDR_LIBS=@XRANDR_LIBS@
diff --git a/configure.ac b/configure.ac
index 09d4722..ef6a3d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7034,6 +7034,7 @@ if test "$with_system_lcms2" = "yes"; then
else
AC_MSG_RESULT([internal])
SYSTEM_LCMS2=NO
+ LCMS2_TARBALL="861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz"
BUILD_TYPE="$BUILD_TYPE LCMS2"
LCMS2_CFLAGS="-I${OUTDIR}/inc/lcms2"
if test $_os = Darwin; then
@@ -7044,6 +7045,7 @@ fi
AC_SUBST(SYSTEM_LCMS2)
AC_SUBST(LCMS2_CFLAGS)
AC_SUBST(LCMS2_LIBS)
+AC_SUBST(LCMS2_TARBALL)
AC_SUBST([MINGW_LCMS2_DLL])
dnl ===================================================================
@@ -7058,11 +7060,13 @@ if test "$with_system_cppunit" = "yes"; then
else
AC_MSG_RESULT([internal])
SYSTEM_CPPUNIT=NO
+ CPPUNIT_TARBALL="fa9aa839145cdf860bf596532bb8af97-cppunit-1.13.1.tar.gz"
BUILD_TYPE="$BUILD_TYPE CPPUNIT"
fi
AC_SUBST(SYSTEM_CPPUNIT)
AC_SUBST(CPPUNIT_CFLAGS)
AC_SUBST(CPPUNIT_LIBS)
+AC_SUBST(CPPUNIT_TARBALL)
dnl ===================================================================
dnl Check whether freetype is available
@@ -7185,6 +7189,7 @@ if test "$with_system_libxml" = "yes"; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBXSLT=NO
+ LIBXSLT_TARBALL="e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz"
BUILD_TYPE="$BUILD_TYPE LIBXSLT"
if test "$cross_compiling" = "yes"; then
@@ -7204,6 +7209,7 @@ AC_SUBST(LIBEXSLT_CFLAGS)
AC_SUBST(LIBEXSLT_LIBS)
AC_SUBST(LIBXSLT_CFLAGS)
AC_SUBST(LIBXSLT_LIBS)
+AC_SUBST(LIBXSLT_TARBALL)
AC_SUBST(XSLTPROC)
AC_SUBST([MINGW_LIBEXSLT_DLL])
AC_SUBST([MINGW_LIBXSLT_DLL])
@@ -7241,11 +7247,13 @@ if test "$with_system_libxml" = "yes"; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBXML=NO
+ LIBXML_TARBALL="7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz"
BUILD_TYPE="$BUILD_TYPE LIBXML2"
fi
AC_SUBST(SYSTEM_LIBXML)
AC_SUBST(LIBXML_CFLAGS)
AC_SUBST(LIBXML_LIBS)
+AC_SUBST(LIBXML_TARBALL)
AC_SUBST(XMLLINT)
AC_SUBST([MINGW_LIBXML_DLL])
AC_SUBST([MINGW_ZLIB_DLL])
@@ -7412,6 +7420,7 @@ system)
internal)
SYSTEM_PYTHON=NO
+ PYTHON_TARBALL="e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2"
BUILD_TYPE="$BUILD_TYPE PYTHON"
# Embedded Python dies without Home set
if test "$HOME" = ""; then
@@ -7444,6 +7453,7 @@ fi
AC_SUBST(SYSTEM_PYTHON)
AC_SUBST(PYTHON_CFLAGS)
AC_SUBST(PYTHON_LIBS)
+AC_SUBST(PYTHON_TARBALL)
AC_SUBST([MINGW_PYTHON_EXE])
AC_SUBST([MINGW_PYTHON_DLL])
AC_SUBST([MINGW_READLINE_DLL])
@@ -7506,6 +7516,7 @@ or install the Berkeley db development package.])
elif test $_os != iOS -a $_os != Android; then
AC_MSG_RESULT([internal])
SYSTEM_DB=NO
+ BERKELEYDB_TARBALL="d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz"
BUILD_TYPE="$BUILD_TYPE BERKELEYDB"
else
AC_MSG_RESULT([none])
@@ -7514,6 +7525,7 @@ AC_SUBST(SYSTEM_DB)
AC_SUBST(SYSTEM_DB_CFLAGS)
AC_SUBST(DB_LIB)
AC_SUBST(DB_CPPLIB)
+AC_SUBST(BERKELEYDB_TARBALL)
AC_SUBST([MINGW_DB_DLL])
AC_MSG_CHECKING([whether to build the MySQL Connector extension])
@@ -7622,12 +7634,14 @@ int main(int argc, char **argv) {
else
AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
fi
+ MYSQLCPPCONN_TARBALL="0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz"
BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN"
SYSTEM_MYSQL_CPPCONN=NO
fi
AC_LANG_POP([C++])
- AC_SUBST(SYSTEM_MYSQL_CPPCONN)
fi
+AC_SUBST(SYSTEM_MYSQL_CPPCONN)
+AC_SUBST(MYSQLCPPCONN_TARBALL)
dnl ===================================================================
dnl Check for system hsqldb
@@ -8279,6 +8293,12 @@ AC_SUBST(MOZ_LIB)
AC_SUBST(MOZ_LIB_XPCOM)
AC_SUBST(MOZ_TARBALL)
+# libxmlsec is mandatory
+if test $_os != Android -a $_os != iOS ; then
+ LIBXMLSEC_TARBALL="1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
+fi
+AC_SUBST(LIBXMLSEC_TARBALL)
+
dnl ===================================================================
dnl Check for system NSS
dnl ===================================================================
@@ -8296,6 +8316,7 @@ if test "$with_system_nss" = "yes"; then
libo_MINGW_CHECK_DLL([SSL3], [ssl3])
else
SYSTEM_NSS="NO"
+ NSS_TARBALL="a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz"
BUILD_TYPE="$BUILD_TYPE NSS"
AC_MSG_RESULT([internal])
if test "$build_os" = "cygwin"; then
@@ -8325,6 +8346,7 @@ fi # system nss
AC_SUBST(SYSTEM_NSS)
AC_SUBST(NSS_CFLAGS)
AC_SUBST(NSS_LIBS)
+AC_SUBST(NSS_TARBALL)
AC_SUBST([MINGW_SMIME3_DLL])
dnl ===================================================================
@@ -8487,6 +8509,7 @@ You can use --with-system-icu-for-build=force to use it anyway.])
else
AC_MSG_RESULT([internal])
SYSTEM_ICU="NO"
+ ICU_TARBALL="7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz"
BUILD_TYPE="$BUILD_TYPE ICU"
fi
@@ -8501,6 +8524,7 @@ AC_SUBST(ICU_RECLASSIFIED_CLOSE_PARENTHESIS)
AC_SUBST([ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER])
AC_SUBST([ICU_RECLASSIFIED_HEBREW_LETTER])
AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY)
+AC_SUBST(ICU_TARBALL)
AC_SUBST([MINGW_ICUDATA_DLL])
AC_SUBST([MINGW_ICUI18N_DLL])
AC_SUBST([MINGW_ICUUC_DLL])
@@ -8770,11 +8794,13 @@ if test "$with_system_openssl" = "yes"; then
else
AC_MSG_RESULT([internal])
SYSTEM_OPENSSL=NO
+ OPENSSL_TARBALL="51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz"
BUILD_TYPE="$BUILD_TYPE OPENSSL"
fi
AC_SUBST(SYSTEM_OPENSSL)
AC_SUBST(OPENSSL_CFLAGS)
AC_SUBST(OPENSSL_LIBS)
+AC_SUBST(OPENSSL_TARBALL)
AC_SUBST([MINGW_SSL_DLL])
AC_SUBST([MINGW_CRYPTO_DLL])
@@ -8793,12 +8819,18 @@ if test "$with_system_redland" = "yes"; then
libo_MINGW_TRY_DLL([SQLITE3], [libsqlite3])
else
AC_MSG_RESULT([internal])
+ RAPTOR_TARBALL="284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz"
+ RASQAL_TARBALL="fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz"
+ REDLAND_TARBALL="ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz"
BUILD_TYPE="$BUILD_TYPE REDLAND"
SYSTEM_REDLAND=NO
fi
AC_SUBST(SYSTEM_REDLAND)
+AC_SUBST(RAPTOR_TARBALL)
+AC_SUBST(RASQAL_TARBALL)
AC_SUBST(REDLAND_CFLAGS)
AC_SUBST(REDLAND_LIBS)
+AC_SUBST(REDLAND_TARBALL)
AC_SUBST([MINGW_RAPTOR_DLL])
AC_SUBST([MINGW_RASQAL_DLL])
AC_SUBST([MINGW_REDLAND_DLL])
@@ -8966,12 +8998,14 @@ if test "$with_system_libexttextcat" = "yes"; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBEXTTEXTCAT=NO
+ LIBEXTTEXTCAT_TARBALL="6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2"
BUILD_TYPE="$BUILD_TYPE LIBEXTTEXTCAT"
fi
AC_SUBST(SYSTEM_LIBEXTTEXTCAT)
AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA)
AC_SUBST(LIBEXTTEXTCAT_CFLAGS)
AC_SUBST(LIBEXTTEXTCAT_LIBS)
+AC_SUBST(LIBEXTTEXTCAT_TARBALL)
dnl ***************************************
dnl testing libc version for Linux...
@@ -9808,6 +9842,7 @@ if test "x$enable_ext_pdfimport" != "xno" -a "x$enable_extension_integration" !=
else
AC_MSG_RESULT([internal])
SYSTEM_POPPLER=NO
+ XPDF_TARBALL="599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz"
BUILD_TYPE="$BUILD_TYPE XPDF"
fi
else
@@ -9819,6 +9854,7 @@ AC_SUBST(ENABLE_PDFIMPORT)
AC_SUBST(SYSTEM_POPPLER)
AC_SUBST(POPPLER_CFLAGS)
AC_SUBST(POPPLER_LIBS)
+AC_SUBST(XPDF_TARBALL)
if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
@@ -10219,6 +10255,7 @@ if test "${enable_scripting_javascript}" != "no" -a "x$with_java" != "xno"; then
AC_MSG_RESULT([internal])
SYSTEM_RHINO=NO
RHINO_TARBALL="798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
+ SWING_TARBALL="35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
BUILD_TYPE="$BUILD_TYPE RHINO"
fi
else
@@ -10230,6 +10267,7 @@ AC_SUBST(ENABLE_SCRIPTING_JAVASCRIPT)
AC_SUBST(SYSTEM_RHINO)
AC_SUBST(RHINO_JAR)
AC_SUBST(RHINO_TARBALL)
+AC_SUBST(SWING_TARBALL)
dnl Scripting provider for Python extension?
dnl We always provide this unless we have disabled Python completely
@@ -11415,13 +11453,19 @@ if test "$test_cairo" = "yes" ; then
dnl We only need cairo for Windows if we
dnl build librsvg or directx disabled
if test -z "$ENABLE_DIRECTX"; then
+ CAIRO_TARBALL="f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz"
+ PIXMAN_TARBALL="c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"
BUILD_TYPE="$BUILD_TYPE CAIRO"
fi
else
if test "$enable_cairo_canvas" = "yes"; then
+ CAIRO_TARBALL="f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz"
+ PIXMAN_TARBALL="c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"
BUILD_TYPE="$BUILD_TYPE CAIRO"
else
if test "$with_system_cairo" != "yes"; then
+ CAIRO_TARBALL="f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz"
+ PIXMAN_TARBALL="c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"
BUILD_TYPE="$BUILD_TYPE CAIRO"
fi
fi
@@ -11432,6 +11476,8 @@ fi
AC_SUBST(SYSTEM_CAIRO)
AC_SUBST(CAIRO_CFLAGS)
AC_SUBST(CAIRO_LIBS)
+AC_SUBST(CAIRO_TARBALL)
+AC_SUBST(PIXMAN_TARBALL)
AC_SUBST([MINGW_CAIRO_DLL])
AC_SUBST([MINGW_FONTCONFIG_DLL])
AC_SUBST([MINGW_FREETYPE_DLL])
@@ -11456,6 +11502,7 @@ if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os !=
else
SYSTEM_LIBLANGTAG=NO
AC_MSG_RESULT([no])
+ LIBLANGTAG_TARBALL="54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2"
BUILD_TYPE="$BUILD_TYPE LIBLANGTAG"
fi
else
@@ -11466,6 +11513,7 @@ AC_SUBST(ENABLE_LIBLANGTAG)
AC_SUBST(SYSTEM_LIBLANGTAG)
AC_SUBST(LIBLANGTAG_CFLAGS)
AC_SUBST(LIBLANGTAG_LIBS)
+AC_SUBST(LIBLANGTAG_TARBALL)
AC_SUBST([MINGW_LIBLANGTAG_DLL])
dnl ===================================================================
diff --git a/ooo.lst.in b/ooo.lst.in
index 99e2cbb..44f71db 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -1,42 +1,25 @@
http://dev-www.libreoffice.org/src
-51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz
-c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
-6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
-35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
-f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
-599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
-7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
-fa9aa839145cdf860bf596532bb8af97-cppunit-1.13.1.tar.gz
-bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
-ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
+4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
+bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip
-d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
-e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
-e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
-fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
-0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
-7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz
0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
-a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
-861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz
-54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2
@AFMS_TARBALL@
@APACHE_COMMONS_CODEC_TARBALL@
@APACHE_COMMONS_HTTPCLIENT_TARBALL@
@APACHE_COMMONS_LANG_TARBALL@
@APACHE_COMMONS_LOGGING_TARBALL@
+ at BERKELEYDB_TARBALL@
@BOOST_TARBALL@
@BSH_TARBALL@
+ at CAIRO_TARBALL@
@CDR_TARBALL@
@CLUCENE_TARBALL@
@CMIS_TARBALL@
+ at CPPUNIT_TARBALL@
@CT2N_TARBALL@
@CURL_TARBALL@
@EPM_TARBALL@
@@ -53,6 +36,7 @@ a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
@HSQLDB_TARBALL@
@HUNSPELL_TARBALL@
@HYPHEN_TARBALL@
+ at ICU_TARBALL@
@JFREEREPORT_FLOW_ENGINE_TARBALL@
@JFREEREPORT_FLUTE_TARBALL@
@JFREEREPORT_LIBBASE_TARBALL@
@@ -66,17 +50,32 @@ a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
@JFREEREPORT_SAC_TARBALL@
@JPEG_TARBALL@
@LANGUAGETOOL_TARBALL@
+ at LCMS2_TARBALL@
+ at LIBEXTTEXTCAT_TARBALL@
+ at LIBLANGTAG_TARBALL@
+ at LIBXML_TARBALL@
+ at LIBXMLSEC_TARBALL@
+ at LIBXSLT_TARBALL@
@LPSOLVE_TARBALL@
@MDDS_TARBALL@
@MOZ_TARBALL@
@MSPUB_TARBALL@
+ at MYSQLCPPCONN_TARBALL@
@MYTHES_TARBALL@
@NEON_TARBALL@
+ at NSS_TARBALL@
@OPENLDAP_TARBALL@
+ at OPENSSL_TARBALL@
@ORCUS_TARBALL@
+ at PIXMAN_TARBALL@
@PNG_TARBALL@
@POSTGRESQL_TARBALL@
+ at PYTHON_TARBALL@
+ at RAPTOR_TARBALL@
+ at RASQAL_TARBALL@
+ at REDLAND_TARBALL@
@RHINO_TARBALL@
+ at SWING_TARBALL@
@TOMCAT_TARBALL@
@UCPP_TARBALL@
@VIGRA_TARBALL@
@@ -84,6 +83,7 @@ a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
@WPD_TARBALL@
@WPG_TARBALL@
@WPS_TARBALL@
+ at XPDF_TARBALL@
@XSLTML_TARBALL@
@ZLIB_TARBALL@
http://dev-www.libreoffice.org/extern
More information about the Libreoffice-commits
mailing list