Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ooo-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1388742 - in /incubator/ooo/trunk:
 ext_sources/c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz
 main/external_deps.lst main/zlib/makefile.mk main/zlib/zlib-1.2.5.patch
 main/zlib/zlib-1.2.7.patch
Date: Sat, 22 Sep 2012 07:11:25 -0000
To: ooo-commits@incubator.apache.org
From: zjchen@apache.org
Message-Id: <20120922071126.1927A23889E3@eris.apache.org>

Author: zjchen
Date: Sat Sep 22 07:11:25 2012
New Revision: 1388742

URL: http://svn.apache.org/viewvc?rev=1388742&view=rev
Log:
#i121069#  zlib: upgrade to 1.2.7
Patch by: zjchen
Review by: Pedro Giffuni


Added:
    incubator/ooo/trunk/main/zlib/zlib-1.2.7.patch   (with props)
Removed:
    incubator/ooo/trunk/ext_sources/c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz
    incubator/ooo/trunk/main/zlib/zlib-1.2.5.patch
Modified:
    incubator/ooo/trunk/main/external_deps.lst
    incubator/ooo/trunk/main/zlib/makefile.mk

Modified: incubator/ooo/trunk/main/external_deps.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/external_deps.lst?rev=1388742&r1=1388741&r2=1388742&view=diff
==============================================================================
--- incubator/ooo/trunk/main/external_deps.lst (original)
+++ incubator/ooo/trunk/main/external_deps.lst Sat Sep 22 07:11:25 2012
@@ -100,6 +100,12 @@ if (SYSTEM_REDLAND != YES)
     URL1 = http://download.librdf.org/source/rasqal-0.9.16.tar.gz
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
+if (GUI!=UNX || SYSTEM_ZLIB!=YES)
+    MD5 = 2ab442d169156f34c379c968f3f482dd
+    name = zlib-1.2.7.tar.bz2
+    URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
+    URL2 = http://zlib.net/zlib-1.2.7.tar.bz2
+
 if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
     MD5 = 2c9b0f83ed5890af02c0df1c1776f39b
     name = commons-httpclient-3.1-src.tar.gz
@@ -217,11 +223,6 @@ if (SYSTEM_PYTHON != YES)
     URL1 = http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
-if (GUI!=UNX || SYSTEM_ZLIB!=YES)
-    MD5 = c735eab2d659a96e5a594c9e8541ad63
-    name = zlib-1.2.5.tar.gz
-    URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
-
 if (SYSTEM_BOOST!=YES || (OS==SOLARIS && COM!=GCC))
     MD5 = d1e9a7a7f532bb031a3c175d86688d95
     name = boost_1_48_0.tar.bz2

Modified: incubator/ooo/trunk/main/zlib/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/zlib/makefile.mk?rev=1388742&r1=1388741&r2=1388742&view=diff
==============================================================================
--- incubator/ooo/trunk/main/zlib/makefile.mk (original)
+++ incubator/ooo/trunk/main/zlib/makefile.mk Sat Sep 22 07:11:25 2012
@@ -40,10 +40,10 @@ all:
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=zlib-1.2.5
-TARFILE_MD5=c735eab2d659a96e5a594c9e8541ad63
+TARFILE_NAME=zlib-1.2.7
+TARFILE_MD5=2ab442d169156f34c379c968f3f482dd
 
-PATCH_FILES=zlib-1.2.5.patch
+PATCH_FILES=zlib-1.2.7.patch
 ADDITIONAL_FILES=makefile.mk
 
 #relative to CONFIGURE_DIR

Added: incubator/ooo/trunk/main/zlib/zlib-1.2.7.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/zlib/zlib-1.2.7.patch?rev=1388742&view=auto
==============================================================================
--- incubator/ooo/trunk/main/zlib/zlib-1.2.7.patch (added)
+++ incubator/ooo/trunk/main/zlib/zlib-1.2.7.patch Sat Sep 22 07:11:25 2012
@@ -0,0 +1,86 @@
+--- misc/zlib-1.2.7/makefile.mk	Fri Mar 14 10:17:06 2008
++++ misc/build/zlib-1.2.7/makefile.mk	Fri Mar 14 10:16:56 2008
+@@ -1 +1,82 @@
+-dummy
++#*************************************************************************
++#
++#  Licensed to the Apache Software Foundation (ASF) under one
++#  or more contributor license agreements.  See the NOTICE file
++#  distributed with this work for additional information
++#  regarding copyright ownership.  The ASF licenses this file
++#  to you under the Apache License, Version 2.0 (the
++#  "License"); you may not use this file except in compliance
++#  with the License.  You may obtain a copy of the License at
++#  
++#    http://www.apache.org/licenses/LICENSE-2.0
++#  
++#  Unless required by applicable law or agreed to in writing,
++#  software distributed under the License is distributed on an
++#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++#  KIND, either express or implied.  See the License for the
++#  specific language governing permissions and limitations
++#  under the 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)$/trees.obj		\
++			$(SLO)$/zutil.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)$/trees.obj		\
++			$(SLO_X64)$/zutil.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
++

Propchange: incubator/ooo/trunk/main/zlib/zlib-1.2.7.patch
------------------------------------------------------------------------------
    svn:eol-style = native