You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2016/05/24 21:41:06 UTC
svn commit: r1745407 - in /openoffice/trunk: ext_libraries/apr-util/
ext_libraries/apr/ main/ main/scp2/source/ooo/
Author: pfg
Date: Tue May 24 21:41:06 2016
New Revision: 1745407
URL: http://svn.apache.org/viewvc?rev=1745407&view=rev
Log:
Update APR and APR-util.
Update APR to version 1.5.2.
Update APR-util to version 1.5.4
This brings many updates and fixes that have little effect over Apache
OpenOffice at this time.
Tested on FreeBSD.
Added:
openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.apu.hw.patch
openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.expat.patch
openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.makewin32.patch
openoffice/trunk/ext_libraries/apr/apr-1.5.2-windows.patch
Removed:
openoffice/trunk/ext_libraries/apr-util/apr-util-1.4.1.apu.hw.patch
openoffice/trunk/ext_libraries/apr-util/apr-util-1.4.1.expat.patch
openoffice/trunk/ext_libraries/apr-util/apr-util-1.4.1.makewin32.patch
openoffice/trunk/ext_libraries/apr/apr-1.4.5-windows.patch
openoffice/trunk/ext_libraries/apr/apr-1.4.5.patch
Modified:
openoffice/trunk/ext_libraries/apr-util/aprutil_version.mk
openoffice/trunk/ext_libraries/apr-util/makefile.mk
openoffice/trunk/ext_libraries/apr/apr_version.mk
openoffice/trunk/ext_libraries/apr/makefile.mk
openoffice/trunk/main/external_deps.lst
openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
Added: openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.apu.hw.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.apu.hw.patch?rev=1745407&view=auto
==============================================================================
--- openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.apu.hw.patch (added)
+++ openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.apu.hw.patch Tue May 24 21:41:06 2016
@@ -0,0 +1,13 @@
+--- misc/apr-util-1.5.4/include/apu.hw 2008-11-21 07:18:37.000000000 +0100
++++ misc/build/apr-util-1.5.4/include/apu.hw 2012-01-03 13:37:20.042007300 +0100
+@@ -132,8 +132,8 @@
+ #define APU_HAVE_NSS 0
+ #endif
+
+-#define APU_HAVE_APR_ICONV 1
+-#define APU_HAVE_ICONV 0
++#undef APU_HAVE_APR_ICONV
++#undef APU_HAVE_ICONV
+ #define APR_HAS_XLATE (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
+
+ #endif /* APU_H */
Added: openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.expat.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.expat.patch?rev=1745407&view=auto
==============================================================================
--- openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.expat.patch (added)
+++ openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.expat.patch Tue May 24 21:41:06 2016
@@ -0,0 +1,17 @@
+--- misc/apr-util-1.5.4/build/apu-conf.m4 2011-08-08 06:32:27.000000000 -0300
++++ misc/build/apr-util-1.5.4/build/apu-conf.m4 2013-06-12 20:09:05.877947541 -0300
+@@ -87,8 +87,14 @@ dnl be dropped later.
+ dnl
+ AC_DEFUN([APU_SYSTEM_EXPAT], [
+
++ APU_TRY_EXPAT_LINK([OpenOffice expat], apu_cv_expat_openoffice,
++ [expat.h], [-L"$SOLARLIBDIR" -lexpat_xmlparse -lexpat_xmltok],
++ [APR_ADDTO(APRUTIL_INCLUDES, [-I"$SOLARINCDIR"/external])] )
++
++ if test $apu_has_expat = 0; then
+ APU_TRY_EXPAT_LINK([Expat 1.95.x], apu_cv_expat_system,
+ [expat.h], [-lexpat])
++ fi
+
+ if test $apu_has_expat = 0; then
+ APU_TRY_EXPAT_LINK([old Debian-packaged expat], apu_cv_expat_debian,
Added: openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.makewin32.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.makewin32.patch?rev=1745407&view=auto
==============================================================================
--- openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.makewin32.patch (added)
+++ openoffice/trunk/ext_libraries/apr-util/apr-util-1.5.4.makewin32.patch Tue May 24 21:41:06 2016
@@ -0,0 +1,199 @@
+--- misc/apr-util-1.5.4/Library_apr-util.mk 2012-01-05 14:49:40.529219100 +0100
++++ misc/build/apr-util-1.5.4/Library_apr-util.mk 2012-01-05 14:47:18.621102400 +0100
+@@ -1 +1,90 @@
+-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.
++# *
++# *************************************************************/
++
++$(eval $(call gb_Library_Library,apr-util))
++
++$(eval $(call gb_Library_add_package_headers,apr-util,apr-util_inc))
++
++$(eval $(call gb_Library_set_include,apr-util,\
++ $$(INCLUDE) \
++ -I./include \
++ -I./include/private \
++ -I$(OUTDIR)/inc/apr \
++))
++
++$(eval $(call gb_Library_set_defs,apr-util,\
++ $$(DEFS) \
++ -DAPU_DECLARE_EXPORT -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS \
++))
++
++$(eval $(call gb_Library_add_linked_libs,apr-util,\
++ apr \
++ expat_xmltok \
++ expat_xmlparse \
++ $(gb_STDLIBS) \
++))
++
++$(eval $(call gb_Library_add_cobjects,apr-util,\
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_brigade \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_alloc \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_eos \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_file \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_flush \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_heap \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_mmap \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_pipe \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_pool \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_refcount \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_simple \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_socket \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/crypto/apr_crypto \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/crypto/apr_md4 \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/crypto/apr_md5 \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/crypto/apr_sha1 \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/crypto/getuuid \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/crypto/uuid \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbd/apr_dbd \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbm/apr_dbm \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbm/apr_dbm_sdbm \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbm/sdbm/sdbm \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbm/sdbm/sdbm_hash \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbm/sdbm/sdbm_lock \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbm/sdbm/sdbm_pair \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/encoding/apr_base64 \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/hooks/apr_hooks \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/ldap/apr_ldap_stub \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/ldap/apr_ldap_url \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/memcache/apr_memcache \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apr_date \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apr_queue \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apr_reslist \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apr_rmm \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apr_thread_pool \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apu_dso \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apu_version \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/strmatch/apr_strmatch \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/uri/apr_uri \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/xlate/xlate \
++ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/xml/apr_xml \
++))
++
++# vim: set noet sw=4 ts=4:
+--- misc/apr-util-1.5.4/Makefile 2012-01-05 14:49:40.420212900 +0100
++++ misc/build/apr-util-1.5.4/Makefile 2012-01-05 14:47:07.827485100 +0100
+@@ -1 +1,32 @@
+-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.
++# *
++# *************************************************************/
++
++ifeq ($(strip $(SOLARENV)),)
++$(error No environment set!)
++endif
++
++gb_PARTIALBUILD := T
++GBUILDDIR := $(SOLARENV)/gbuild
++include $(GBUILDDIR)/gbuild.mk
++
++$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
++
++# vim: set noet sw=4 ts=4:
+--- misc/apr-util-1.5.4/Module_apr-util.mk 2012-01-05 14:49:40.476216100 +0100
++++ misc/build/apr-util-1.5.4/Module_apr-util.mk 2012-01-05 14:47:42.567472100 +0100
+@@ -1 +1,29 @@
+-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.
++# *
++# *************************************************************/
++
++$(eval $(call gb_Module_Module,apr-util))
++
++$(eval $(call gb_Module_add_targets,apr-util,\
++ Library_apr-util \
++ Package_inc \
++))
++
++# vim: set noet ts=4 sw=4:
+--- misc/apr-util-1.5.4/Package_inc.mk 2012-01-05 14:49:40.585222300 +0100
++++ misc/build/apr-util-1.5.4/Package_inc.mk 2012-01-05 14:47:51.616989700 +0100
+@@ -1 +1,32 @@
+-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.
++# *
++# *************************************************************/
++
++$(eval $(call gb_Package_Package,apr-util_inc,$(EXT_LIBRARIES)/apr-util/$(INPATH)/misc/build/apr-util-1.5.4/include))
++$(eval $(call gb_Package_add_files, apr-util_inc, inc/apr-util, \
++ apu.h \
++ apr_uri.h \
++ apr_date.h \
++ apr_uuid.h \
++ apr_md5.h \
++ apr_xlate.h \
++ apr_base64.h \
++))
++
Modified: openoffice/trunk/ext_libraries/apr-util/aprutil_version.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr-util/aprutil_version.mk?rev=1745407&r1=1745406&r2=1745407&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/apr-util/aprutil_version.mk (original)
+++ openoffice/trunk/ext_libraries/apr-util/aprutil_version.mk Tue May 24 21:41:06 2016
@@ -20,5 +20,5 @@
#**************************************************************
APR_UTIL_MAJOR=1
-APR_UTIL_MINOR=4
-APR_UTIL_MICRO=1
+APR_UTIL_MINOR=5
+APR_UTIL_MICRO=4
Modified: openoffice/trunk/ext_libraries/apr-util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr-util/makefile.mk?rev=1745407&r1=1745406&r2=1745407&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/apr-util/makefile.mk (original)
+++ openoffice/trunk/ext_libraries/apr-util/makefile.mk Tue May 24 21:41:06 2016
@@ -43,7 +43,7 @@ APR_UTIL_VERSION=$(APR_UTIL_MAJOR).$(APR
TARFILE_NAME=$(PRJNAME)-$(APR_UTIL_VERSION)
-TARFILE_MD5=666a5d56098a9debf998510e304c8095
+TARFILE_MD5=866825c04da827c6e5f53daff5569f42
.IF "$(OS)"=="WNT"
Added: openoffice/trunk/ext_libraries/apr/apr-1.5.2-windows.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr/apr-1.5.2-windows.patch?rev=1745407&view=auto
==============================================================================
--- openoffice/trunk/ext_libraries/apr/apr-1.5.2-windows.patch (added)
+++ openoffice/trunk/ext_libraries/apr/apr-1.5.2-windows.patch Tue May 24 21:41:06 2016
@@ -0,0 +1,15 @@
+--- misc/apr-1.5.2/Makefile.win 2011-01-28 03:27:19.000000000 +0100
++++ misc/build/apr-1.5.2/Makefile.win 2013-05-27 11:35:37.224622100 +0200
+@@ -45,12 +45,7 @@
+
+ PREFIX=..\apr-dist
+
+-!IF [$(COMSPEC) /c cl /nologo /? \
+- | $(SystemRoot)\System32\find.exe "x64" >NUL ] == 0
+-ARCH=x64 Release
+-!ELSE
+ ARCH=Win32 Release
+-!ENDIF
+
+ !MESSAGE ARCH = $(ARCH)
+ !MESSAGE PREFIX = $(PREFIX) (install path)
Modified: openoffice/trunk/ext_libraries/apr/apr_version.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr/apr_version.mk?rev=1745407&r1=1745406&r2=1745407&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/apr/apr_version.mk (original)
+++ openoffice/trunk/ext_libraries/apr/apr_version.mk Tue May 24 21:41:06 2016
@@ -20,5 +20,5 @@
#**************************************************************
APR_MAJOR=1
-APR_MINOR=4
-APR_MICRO=5
+APR_MINOR=5
+APR_MICRO=2
Modified: openoffice/trunk/ext_libraries/apr/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr/makefile.mk?rev=1745407&r1=1745406&r2=1745407&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/apr/makefile.mk (original)
+++ openoffice/trunk/ext_libraries/apr/makefile.mk Tue May 24 21:41:06 2016
@@ -42,9 +42,7 @@ all:
APRVERSION=$(APR_MAJOR).$(APR_MINOR).$(APR_MICRO)
TARFILE_NAME=$(PRJNAME)-$(APRVERSION)
-TARFILE_MD5=97262fe54dddaf583eaaee3497a426e1
-
-PATCH_FILES= $(TARFILE_NAME).patch
+TARFILE_MD5=98492e965963f852ab29f9e61b2ad700
.IF "$(OS)"=="WNT"
Modified: openoffice/trunk/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1745407&r1=1745406&r2=1745407&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Tue May 24 21:41:06 2016
@@ -163,14 +163,14 @@ if (SYSTEM_OPENSSL!=YES && DISABLE_OPENS
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
- MD5 = 97262fe54dddaf583eaaee3497a426e1
- name = apr-1.4.5.tar.gz
+ MD5 = 98492e965963f852ab29f9e61b2ad700
+ name = apr-1.5.2.tar.gz
URL1 = http://archive.apache.org/dist/apr/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
- MD5 = 666a5d56098a9debf998510e304c8095
- name = apr-util-1.4.1.tar.gz
+ MD5 = 866825c04da827c6e5f53daff5569f42
+ name = apr-util-1.5.4.tar.gz
URL1 = http://archive.apache.org/dist/apr/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
Modified: openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1745407&r1=1745406&r2=1745407&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Tue May 24 21:41:06 2016
@@ -2034,7 +2034,7 @@ File gid_File_Lib_Apr
#ifdef MACOSX
Name = STRING(CONCAT6(libapr-1,.0.,APR_MINOR,.,APR_MICRO,UNXSUFFIX));
#elif FREEBSD
- Name = STRING(CONCAT3(libapr-1,UNXSUFFIX,.4));
+ Name = STRING(CONCAT3(libapr-1,UNXSUFFIX,.5));
#else
Name = STRING(CONCAT6(libapr-1,UNXSUFFIX,.0.,APR_MINOR,.,APR_MICRO));
#endif
@@ -2053,7 +2053,7 @@ File gid_File_Lib_AprUtil
#ifdef MACOSX
Name = STRING(CONCAT6(libaprutil-1,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO,UNXSUFFIX));
#elif FREEBSD
- Name = STRING(CONCAT3(libaprutil-1,UNXSUFFIX,.4));
+ Name = STRING(CONCAT3(libaprutil-1,UNXSUFFIX,.5));
#else
Name = STRING(CONCAT6(libaprutil-1,UNXSUFFIX,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO));
#endif