[ooo-build-commit] .: 3 commits - bin/unpack configure.in download.in patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Thu Jul 15 02:55:31 PDT 2010
bin/unpack | 7 -
configure.in | 12 ++-
download.in | 9 ++
patches/dev300/apply | 1
patches/dev300/upgrade-zlib-to-1.2.3.diff | 111 ++++++++++++++++++++++++++++++
5 files changed, 131 insertions(+), 9 deletions(-)
New commits:
commit 69d4d730e50a7587edefed403d6c3f89ec9390e6
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Jul 15 11:43:46 2010 +0200
Upgrade internal zlib to 1.2.3 (fixing some issues with ooxml reading)
* patches/dev300/apply:
* patches/dev300/upgrade-zlib-to-1.2.3.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9a3b3ee..471b3c1 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3643,3 +3643,4 @@ oox-build-fix-dev300-m77.diff, kohei
sd-pptx-export-build-fix.diff, rodo
sd-pptx-export-build-fix-2.diff, rodo
oox-import-fix-ole2-shapes.diff, n#593611, rodo
+upgrade-zlib-to-1.2.3.diff, fridrich
diff --git a/patches/dev300/upgrade-zlib-to-1.2.3.diff b/patches/dev300/upgrade-zlib-to-1.2.3.diff
new file mode 100644
index 0000000..f078737
--- /dev/null
+++ b/patches/dev300/upgrade-zlib-to-1.2.3.diff
@@ -0,0 +1,111 @@
+--- zlib/makefile.mk 2010-07-09 15:57:58.000000000 +0200
++++ zlib/makefile.mk 2010-07-09 16:03:04.000000000 +0200
+@@ -44,10 +44,10 @@
+
+ # --- Files --------------------------------------------------------
+
+-TARFILE_NAME=zlib-1.1.4
+-TARFILE_MD5=abc405d0bdd3ee22782d7aa20e440f08
++TARFILE_NAME=zlib-1.2.3
++TARFILE_MD5=debc62758716a169df9f62e6ab2bc634
+
+-PATCH_FILES=zlib-1.1.4.patch
++PATCH_FILES=zlib-1.2.3.patch
+ ADDITIONAL_FILES=makefile.mk
+
+ #relative to CONFIGURE_DIR
+--- zlib/zlib-1.2.3.patch 1970-01-01 01:00:00.000000000 +0100
++++ zlib/zlib-1.2.3.patch 2010-07-09 16:29:34.000000000 +0200
+@@ -0,0 +1,92 @@
++--- misc/zlib-1.2.3/makefile.mk Fri Mar 14 10:17:06 2008
+++++ misc/build/zlib-1.2.3/makefile.mk Fri Mar 14 10:16:56 2008
++@@ -1 +1,73 @@
++-dummy
+++#*************************************************************************
+++#
+++# Copyright according the GNU Public License.
+++#
+++#*************************************************************************
+++
+++PRJ=..$/..$/..$/..
+++
+++PRJNAME=zlib
+++TARGET=zlib
+++LIBTARGET=NO
+++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
+++
+++# --- Settings -----------------------------------------------------
+++
+++.INCLUDE : settings.mk
+++
+++# --- Files --------------------------------------------------------
+++
+++INCEXT=contrib$/minizip
+++
+++SLOFILES= $(SLO)$/adler32.obj \
+++ $(SLO)$/compress.obj \
+++ $(SLO)$/deflate.obj \
+++ $(SLO)$/crc32.obj \
+++ $(SLO)$/inffast.obj \
+++ $(SLO)$/inflate.obj \
+++ $(SLO)$/inftrees.obj \
+++ $(SLO)$/infback.obj \
+++ $(SLO)$/trees.obj \
+++ $(SLO)$/zutil.obj \
+++ $(SLO)$/uncompr.obj \
+++ $(SLO)$/gzio.obj \
+++ $(SLO)$/unzip.obj \
+++ $(SLO)$/ioapi.obj
+++
+++
+++LIB1TARGET=$(SLB)$/$(TARGET).lib
+++LIB1ARCHIV=$(LB)$/lib$(TARGET).a
+++LIB1OBJFILES=$(SLOFILES)
+++
+++.IF "$(BUILD_X64)"!=""
+++SLOFILES_X64= $(SLO_X64)$/adler32.obj \
+++ $(SLO_X64)$/compress.obj \
+++ $(SLO_X64)$/deflate.obj \
+++ $(SLO_X64)$/crc32.obj \
+++ $(SLO_X64)$/inffast.obj \
+++ $(SLO_X64)$/inflate.obj \
+++ $(SLO_X64)$/inftrees.obj \
+++ $(SLO_X64)$/infback.obj \
+++ $(SLO_X64)$/trees.obj \
+++ $(SLO_X64)$/zutil.obj \
+++ $(SLO_X64)$/uncompr.obj \
+++ $(SLO_X64)$/gzio.obj \
+++ $(SLO_X64)$/unzip.obj \
+++ $(SLO_X64)$/ioapi.obj
+++
+++LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib
+++LIB1OBJFILES_X64=$(SLOFILES_X64)
+++.ENDIF # "$(BUILD_X64)"!=""
+++
+++
+++# --- Targets ------------------------------------------------------
+++
+++$(MISC)$/%.c : contrib$/minizip$/%.c
+++ @echo ------------------------------
+++ @echo Making: $@
+++ @$(COPY) $< $@
+++
+++.INCLUDE : set_wntx64.mk
+++.INCLUDE : target.mk
+++.INCLUDE : tg_wntx64.mk
+++
++--- misc/zlib-1.2.3/zconf.h 2010-07-15 09:33:48.921875000 +0200
+++++ misc/build/zlib-1.2.3/zconf.h 2010-07-15 09:39:27.000000000 +0200
++@@ -12,6 +12,12 @@
++ * If you *really* need a unique prefix for all types and library functions,
++ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
++ */
+++/*
+++ * we need the prefix to get the same names as in 1.1.3
+++*/
+++
+++#define Z_PREFIX
+++
++ #ifdef Z_PREFIX
++ # define deflateInit_ z_deflateInit_
++ # define deflate z_deflate
commit eed65e06e2c04a6be0fb0ca3eb0780c66086eef9
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Jul 15 11:24:19 2010 +0200
Download upgraded zlib tarball
* configure.in:
* download.in:
diff --git a/configure.in b/configure.in
index 3f80d09..fc0280e 100644
--- a/configure.in
+++ b/configure.in
@@ -1349,6 +1349,16 @@ AC_SUBST(SYSTEM_LIBWPG)
AC_SUBST(LIBWPG_TARBALL)
+if test "$with_system_zlib" = "yes"; then
+ SYSTEM_ZLIB=YES
+else
+ SYSTEM_ZLIB=NO
+ ZLIB_TARBALL=debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
+fi
+AC_SUBST(SYSTEM_ZLIB)
+AC_SUBST(ZLIB_TARBALL)
+
+
AC_MSG_CHECKING([for Sun Professional Template Pack integration (only supported languages displayed)])
if test "z$with_sun_templates" = "z" -o "z$with_sun_templates" = "zno" ; then
SUNTEMPLATES_LANG=""
diff --git a/download.in b/download.in
index 27b4dcd..9ec856d 100755
--- a/download.in
+++ b/download.in
@@ -189,6 +189,9 @@ sub download_tests_dependencies() {
# Multi-dimensional data structure
'cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2' => 'http://hg.services.openoffice.org/binaries/',
+
+# Updated zlib
+ '*-zlib-*' => 'http://download.go-oo.org/src/',
);
@@ -493,6 +496,10 @@ if ('@SYSTEM_LIBWPG@' eq 'NO') {
source_file( '@LIBWPG_TARBALL@' );
}
+if ('@SYSTEM_ZLIB@' ne 'YES') {
+ source_file( '@ZLIB_TARBALL@' );
+}
+
if ('@OOOP_FONTS_PACK@' ne '') {
source_file( '@OOOP_FONTS_PACK@' );
}
commit 249eb313049460e0d577be7cdafca1e8bc770e4c
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Jul 15 10:52:37 2010 +0200
Leave the nlpsolver sources in TARFILE_LOCATION and unpack them from there
* bin/unpack:
* configure.in:
* download.in:
diff --git a/bin/unpack b/bin/unpack
index f681724..e661f98 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -923,13 +923,6 @@ if test "x$GOOGLE_DOCS_EXTENSION" != "x"; then
$GNUCP $SRCDIR/$GOOGLE_DOCS_EXTENSION -d $OOBUILDDIR/extras/source/extensions/gdocs.oxt || exit 1
fi
-if test "x$NLPSOLVER_EXTENSION" != "x"; then
- check_file $SRCDIR/$NLPSOLVER_EXTENSION
- echo "Linking NLPSolver extension sources to the expected name"
- md5=`md5sum $SRCDIR/$NLPSOLVER_EXTENSION | cut -d' ' -f1`
- ln -sf $SRCDIR/$NLPSOLVER_EXTENSION $SRCDIR/$md5-$NLPSOLVER_EXTENSION || exit 1
-fi
-
if test "x$LANGUAGETOOL_EXTENSION" != "x"; then
check_file $SRCDIR/$LANGUAGETOOL_EXTENSION
echo "Copying LanguageTool extension into the tree"
diff --git a/configure.in b/configure.in
index 0046ac3..3f80d09 100644
--- a/configure.in
+++ b/configure.in
@@ -1422,7 +1422,7 @@ AC_SUBST(GOOGLE_DOCS_EXTENSION)
AC_MSG_CHECKING([whether to include NLPSolver extension])
if test "$enable_extensions" != "no" ; then
if test "z$with_nlpsolver" = "zyes" ; then
- NLPSOLVER_EXTENSION="nlpsolver-0.9.tar.bz2"
+ NLPSOLVER_EXTENSION="90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2"
WITH_NLPSOLVER=YES
AC_MSG_RESULT([yes])
else
diff --git a/download.in b/download.in
index f07a1fd..27b4dcd 100755
--- a/download.in
+++ b/download.in
@@ -173,7 +173,7 @@ sub download_tests_dependencies() {
# NLPSolver Extension
'NLPSolver*' => 'http://download.go-oo.org/src/',
- 'nlpsolver*' => 'http://download.go-oo.org/src/',
+ '*nlpsolver*' => 'http://download.go-oo.org/src/',
# LanguageTool Extension
'JLanguageTool*' => 'http://download.go-oo.org/src/',
More information about the ooo-build-commit
mailing list