[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.ac hsqldb/UnpackedTarball_hsqldb.mk hsqldb/version.mk librsvg/Library_librsvg-2-2.mk ooo.lst.in ucpp/UnpackedTarball_ucpp.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Nov 2 16:25:30 PDT 2012
config_host.mk.in | 4 +++-
configure.ac | 4 ++++
hsqldb/UnpackedTarball_hsqldb.mk | 4 +---
hsqldb/version.mk | 6 ------
librsvg/Library_librsvg-2-2.mk | 9 +++++++--
ooo.lst.in | 6 +++---
ucpp/UnpackedTarball_ucpp.mk | 2 +-
7 files changed, 19 insertions(+), 16 deletions(-)
New commits:
commit 56e40f3c602f7c85f61e5a196e3d820935b0c139
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Nov 3 00:23:14 2012 +0100
librsvg: selectively export symbols we need
Change-Id: I892bea3b3a30ef84937e410b10f37a814213363b
diff --git a/librsvg/Library_librsvg-2-2.mk b/librsvg/Library_librsvg-2-2.mk
index 2dfb2bc..66e1d12 100644
--- a/librsvg/Library_librsvg-2-2.mk
+++ b/librsvg/Library_librsvg-2-2.mk
@@ -24,10 +24,15 @@ $(eval $(call gb_Library_use_externals,librsvg-2-2,\
pixbuf \
))
-# Generate a import library
+ifeq ($(COM),MSC)
$(eval $(call gb_Library_add_ldflags,librsvg-2-2,\
- -EXPORT:GetVersionInfo \
+ /EXPORT:rsvg_init \
+ /EXPORT:rsvg_handle_new_from_data \
+ /EXPORT:rsvg_handle_set_dpi_x_y \
+ /EXPORT:rsvg_handle_get_dimensions \
+ /EXPORT:rsvg_handle_render_cairo \
))
+endif
$(eval $(call gb_Library_add_defs,librsvg-2-2,\
-DHAVE_GSF \
commit d281a19e1d06856f863788f3344ad42ed1566669
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Nov 1 22:11:56 2012 +0100
these have been converted; use _tarball variables
Change-Id: I9215fbfaf5c2e5d40e7257cd52d8d9544599ea63
diff --git a/config_host.mk.in b/config_host.mk.in
index 0317bef..08d1bed 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -259,6 +259,7 @@ export HAVE_READDIR_R=@HAVE_READDIR_R@
export HAVE_THREADSAFE_STATICS=@HAVE_THREADSAFE_STATICS@
export HOST_PLATFORM=@host@
export HSQLDB_JAR=@HSQLDB_JAR@
+export HSQLDB_TARBALL=@HSQLDB_TARBALL@
export HSQLDB_USE_JDBC_4_1=@HSQLDB_USE_JDBC_4_1@
export HUNART_EXTENSION_PACK=@HUNART_EXTENSION_PACK@
export HUNSPELL_TARBALL=@HUNSPELL_TARBALL@
@@ -626,6 +627,7 @@ export SYSTEM_REDLAND=@SYSTEM_REDLAND@
export SYSTEM_RHINO=@SYSTEM_RHINO@
export SYSTEM_SERVLETAPI=@SYSTEM_SERVLETAPI@
export SYSTEM_STDLIBS=@SYSTEM_STDLIBS@
+export SYSTEM_UCPP=@SYSTEM_UCPP@
export SYSTEM_VIGRA=@SYSTEM_VIGRA@
export SYSTEM_ZLIB=@SYSTEM_ZLIB@
export TARFILE_LOCATION=@TARFILE_LOCATION@
@@ -636,7 +638,7 @@ export THES_SYSTEM_DIR=@THES_SYSTEM_DIR@
export TMPDIR=@TEMP_DIRECTORY@
export TOMCAT_TARBALL=@TOMCAT_TARBALL@
export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@
-export SYSTEM_UCPP=@SYSTEM_UCPP@
+export UCPP_TARBALL=@UCPP_TARBALL@
export UNIXWRAPPERNAME=@UNIXWRAPPERNAME@
export UNOWINREG_DLL=@UNOWINREG_DLL@
export UPD=@UPD@
diff --git a/configure.ac b/configure.ac
index 9a9689a..f6a7fec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6553,10 +6553,12 @@ else
AC_PATH_PROG(SYSTEM_UCPP, ucpp)
else
AC_MSG_RESULT([internal])
+ UCPP_TARBALL="0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"
BUILD_TYPE="$BUILD_TYPE UCPP"
fi
fi
AC_SUBST(SYSTEM_UCPP)
+AC_SUBST(UCPP_TARBALL)
dnl ===================================================================
dnl Check for epm (not needed for Windows)
@@ -7678,6 +7680,7 @@ if test "$with_system_hsqldb" = "yes"; then
else
AC_MSG_RESULT([internal])
SYSTEM_HSQLDB=NO
+ HSQLDB_TARBALL="17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
BUILD_TYPE="$BUILD_TYPE HSQLDB"
AC_MSG_CHECKING([whether hsqldb should be built with JDBC 4.1])
javanumver=`$JAVAINTERPRETER -version 2>&1 | $AWK -v num=true -f $SRC_ROOT/solenv/bin/getcompver.awk`
@@ -7690,6 +7693,7 @@ else
fi
AC_SUBST(SYSTEM_HSQLDB)
AC_SUBST(HSQLDB_JAR)
+AC_SUBST(HSQLDB_TARBALL)
AC_SUBST([HSQLDB_USE_JDBC_4_1])
fi
diff --git a/hsqldb/UnpackedTarball_hsqldb.mk b/hsqldb/UnpackedTarball_hsqldb.mk
index 186b491..af78834 100644
--- a/hsqldb/UnpackedTarball_hsqldb.mk
+++ b/hsqldb/UnpackedTarball_hsqldb.mk
@@ -7,11 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-include $(SRCDIR)/hsqldb/version.mk
-
$(eval $(call gb_UnpackedTarball_UnpackedTarball,hsqldb))
-$(eval $(call gb_UnpackedTarball_set_tarball,hsqldb,17410483b5b5f267aa18b7e00b65e6e0-hsqldb_$(HSQLDB_VERSION).zip))
+$(eval $(call gb_UnpackedTarball_set_tarball,hsqldb,$(HSQLDB_TARBALL)))
$(eval $(call gb_UnpackedTarball_fix_end_of_line,hsqldb,\
build/build.xml \
diff --git a/hsqldb/version.mk b/hsqldb/version.mk
deleted file mode 100644
index 36ab376..0000000
--- a/hsqldb/version.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# when you want to change the HSQLDB version, you must update the d.lst
-# in the HSQLDB_thon project accordingly !!!
-HSQLDB_MAJOR=1
-HSQLDB_MINOR=8
-HSQLDB_MICRO=0
-HSQLDB_VERSION=$(HSQLDB_MAJOR)_$(HSQLDB_MINOR)_$(HSQLDB_MICRO)
diff --git a/ooo.lst.in b/ooo.lst.in
index 8f50cd2..44caf08 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -3,7 +3,6 @@ a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz
c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
@@ -31,8 +30,6 @@ a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz
3a84ac2da37cae5bf7ce616228c6fbde-libgsf-1.14.19.tar.gz
22ad1c8d3fda7e73b0798035f3dd96bc-pango-1.28.3.tar.gz
0611e099e807210cf738dcb41425d104-libcroco-0.6.2.tar.gz
-2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2
-0168229624cfac409e766913506961a8-ucpp-1.3.2.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
@@ -61,6 +58,7 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
@FREETYPE_TARBALL@
@GOOGLE_DOCS_EXTENSION_PACK@
@GRAPHITE_TARBALL@
+ at HSQLDB_TARBALL@
@HUNSPELL_TARBALL@
@JFREEREPORT_FLOW_ENGINE_TARBALL@
@JFREEREPORT_FLUTE_TARBALL@
@@ -87,12 +85,14 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
@POSTGRESQL_TARBALL@
@RHINO_TARBALL@
@TOMCAT_TARBALL@
+ at UCPP_TARBALL@
@VIGRA_TARBALL@
@VISIO_TARBALL@
@WPD_TARBALL@
@WPG_TARBALL@
@WPS_TARBALL@
@XSLTML_TARBALL@
+ at ZLIB_TARBALL@
http://dev-www.libreoffice.org/extern
@DBGHELP_DLL@
@UNOWINREG_DLL@
diff --git a/ucpp/UnpackedTarball_ucpp.mk b/ucpp/UnpackedTarball_ucpp.mk
index d5e39d7..ee0543f 100644
--- a/ucpp/UnpackedTarball_ucpp.mk
+++ b/ucpp/UnpackedTarball_ucpp.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_UnpackedTarball_UnpackedTarball,ucpp))
-$(eval $(call gb_UnpackedTarball_set_tarball,ucpp,0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz))
+$(eval $(call gb_UnpackedTarball_set_tarball,ucpp,$(UCPP_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,ucpp,0))
More information about the Libreoffice-commits
mailing list