[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst scp2/source

[Pedro Giffuni]

 external_deps.lst                    |    8 ++++----
 scp2/source/ooo/file_library_ooo.scp |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 8766bb149ae58a519e0f45fb84a5fb23df306448
Author: Pedro Giffuni <pfg at apache.org>
Date:   Tue May 24 21:41:06 2016 +0000

    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.

diff --git a/external_deps.lst b/external_deps.lst
index b8992aa..61bd7a5 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -163,14 +163,14 @@ if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
     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)
 
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index df8c8b3..4c6bca6 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -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