[Libreoffice-commits] .: 2 commits - distro-configs/LibreOfficeMinGW.conf sc/Library_scfilt.mk

[Libreoffice Gerrit user]

 distro-configs/LibreOfficeMinGW.conf |    1 +
 sc/Library_scfilt.mk                 |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 669c27ca0575e046b37db7ecc0a3d24ed2001a62
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Jan 3 00:39:02 2013 +0100

    system-zlib for mingw

diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf
index 039ce78..e14e993 100644
--- a/distro-configs/LibreOfficeMinGW.conf
+++ b/distro-configs/LibreOfficeMinGW.conf
@@ -18,6 +18,7 @@
 --with-system-openssl
 --with-system-poppler
 --with-system-redland
+--with-system-zlib
 --without-junit
 --without-myspell-dicts
 --disable-activex
commit ec51a95936499cdab17e5b892cc8abb648fc710d
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Jan 3 00:38:09 2013 +0100

    libs should be listed after the libs that require them

diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index bdb99ca..3901091 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -65,8 +65,8 @@ $(eval $(call gb_Library_use_libraries,scfilt,\
 ))
 
 $(eval $(call gb_Library_use_externals,scfilt,\
-	zlib \
 	orcus \
+	zlib \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,scfilt,\