[Libreoffice-commits] .: Branch 'feature/orcus-update' - configure.ac liborcus/ExternalProject_liborcus.mk sc/Library_scfilt.mk zlib/StaticLibrary_zlib.mk

[Libreoffice Gerrit user]

 configure.ac                         |    2 +-
 liborcus/ExternalProject_liborcus.mk |    2 ++
 sc/Library_scfilt.mk                 |    7 +++++++
 zlib/StaticLibrary_zlib.mk           |    4 ++++
 4 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 7c0a46a4ba4264b98358e329784d6bbd41c3c58b
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Nov 27 00:57:11 2012 -0500

    Get it to build on Windows with liborcus gnumeric bits enabled.
    
    Now scfilt must statically link zlib because gnumeric uses gzip
    compression.
    
    Change-Id: I79c527d381d3c2f9bccdf091ff2b0799efee4700

diff --git a/configure.ac b/configure.ac
index 71ab6f9..4238f24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8843,7 +8843,7 @@ if test "$with_system_orcus" = "yes"; then
     PKG_CHECK_MODULES(ORCUS, liborcus-0.4 >= 0.3.0)
 else
     AC_MSG_RESULT([internal])
-    ORCUS_TARBALL=28638e85e1f4626536cecf7759eea219-liborcus_0.3.0.tar.bz2
+    ORCUS_TARBALL=e5d2f621153c75e87d9157859db276c1-liborcus_0.3.0.tar.bz2
     SYSTEM_LIBORCUS=NO
 
     if test "$SYSTEM_BOOST" = "YES"; then
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index 54ef44a..ef97170 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -23,6 +23,7 @@ ifeq ($(VCVER),90)
 $(call gb_ExternalProject_get_state_target,liborcus,build) :
 	cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \
 	&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
+	&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
 	&& export BOOST_LIB_DIR=$(OUTDIR)/lib \
 	&& $(COMPATH)/vcpackages/vcbuild.exe liborcus-static-nozip.vcproj "Release|Win32" \
 	&& touch $@
@@ -30,6 +31,7 @@ else
 $(call gb_ExternalProject_get_state_target,liborcus,build) :
 	cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \
 	&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
+	&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
 	&& export BOOST_LIB_DIR=$(OUTDIR)/lib \
 	&& $(COMPATH)/../Common7/Tools/vcupgrade.exe liborcus-static-nozip.vcproj \
 	&& MSBuild.exe liborcus-static-nozip.vcxproj /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 6403539..58e6d14 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_libraries,scfilt,\
 ))
 
 $(eval $(call gb_Library_use_externals,scfilt,\
+	zlib \
 	orcus \
 ))
 
@@ -222,4 +223,10 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\
 	sc/source/filter/orcus/orcusfiltersimpl \
 ))
 
+ifeq ($(SYSTEM_ZLIB),YES)
+$(eval $(call gb_Library_add_defs,scfilt,\
+	-DSYSTEM_ZLIB \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/zlib/StaticLibrary_zlib.mk b/zlib/StaticLibrary_zlib.mk
index 69e7017..3071e61 100644
--- a/zlib/StaticLibrary_zlib.mk
+++ b/zlib/StaticLibrary_zlib.mk
@@ -18,6 +18,10 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,zlib,\
 	UnpackedTarball/zlib/compress \
 	UnpackedTarball/zlib/crc32 \
 	UnpackedTarball/zlib/deflate \
+	UnpackedTarball/zlib/gzclose \
+	UnpackedTarball/zlib/gzlib \
+	UnpackedTarball/zlib/gzread \
+	UnpackedTarball/zlib/gzwrite \
 	UnpackedTarball/zlib/inffast \
 	UnpackedTarball/zlib/inflate \
 	UnpackedTarball/zlib/inftrees \