[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - 2 commits - download.lst external/expat

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Sat Sep 21 01:15:58 UTC 2019 

 download.lst                              |    4 ++--
 external/expat/ExternalProject_expat.mk   |    2 +-
 external/expat/StaticLibrary_expat.mk     |    1 -
 external/expat/StaticLibrary_expat_x64.mk |    1 -
 external/expat/UnpackedTarball_expat.mk   |    1 -
 external/expat/expat-winapi.patch         |   18 +++++++++---------
 6 files changed, 12 insertions(+), 15 deletions(-)

New commits:
commit e2fd404e8fb5a807b100d663da37f400d791ad87
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 16 09:34:00 2019 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sat Sep 21 03:15:16 2019 +0200

    latest expat
    
    Reviewed-on: https://gerrit.libreoffice.org/78978
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit 4436a29401beffd0893ecae70cd09c7a49f49f22)
    
    Change-Id: Ia98c9718ccd8e18b5f56851027bde944164f05c4
    Reviewed-on: https://gerrit.libreoffice.org/79275
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/download.lst b/download.lst
index 7182d0302e78..993b5d105bcd 100644
--- a/download.lst
+++ b/download.lst
@@ -33,8 +33,8 @@ export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 export ETONYEK_MD5SUM := 77ff46936dcc83670557274e7dd2aa33
 export ETONYEK_VERSION_MICRO := 6
 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.bz2
-export EXPAT_MD5SUM := 789e297f547980fc9ecc036f9a070d49
-export EXPAT_TARBALL := expat-2.2.5.tar.bz2
+export EXPAT_MD5SUM := 00858041acfea5757af55e6ee6b86231
+export EXPAT_TARBALL := expat-2.2.8.tar.bz2
 export FIREBIRD_MD5SUM := b0b5293991fcf07347b38431c80be1d4
 export FIREBIRD_TARBALL := Firebird-2.5.5.26952-0.tar.bz2
 # FIREBIRD_MD5SUM := b259c2d1c60a03bd104108405ae990a7
diff --git a/external/expat/ExternalProject_expat.mk b/external/expat/ExternalProject_expat.mk
index 1a638eed14d6..87886eab1f7e 100644
--- a/external/expat/ExternalProject_expat.mk
+++ b/external/expat/ExternalProject_expat.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_ExternalProject_register_targets,expat,\
 
 $(call gb_ExternalProject_get_state_target,expat,configure) :
 	$(call gb_ExternalProject_run,configure,\
-		./configure \
+		./configure --without-docbook \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 			$(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \
 	,,expat_configure.log)
diff --git a/external/expat/StaticLibrary_expat.mk b/external/expat/StaticLibrary_expat.mk
index 5a7d43d6c9bd..4d6957f9ef52 100644
--- a/external/expat/StaticLibrary_expat.mk
+++ b/external/expat/StaticLibrary_expat.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_StaticLibrary_add_cflags,expat,\
 ))
 
 $(eval $(call gb_StaticLibrary_add_generated_cobjects,expat,\
-	UnpackedTarball/expat/lib/loadlibrary \
 	UnpackedTarball/expat/lib/xmlparse \
 	UnpackedTarball/expat/lib/xmlrole \
 	UnpackedTarball/expat/lib/xmltok \
diff --git a/external/expat/StaticLibrary_expat_x64.mk b/external/expat/StaticLibrary_expat_x64.mk
index 4f92d0fb284e..a38ba28c80dd 100644
--- a/external/expat/StaticLibrary_expat_x64.mk
+++ b/external/expat/StaticLibrary_expat_x64.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_StaticLibrary_add_defs,expat_x64,\
 ))
 
 $(eval $(call gb_StaticLibrary_add_x64_generated_cobjects,expat_x64,\
-	UnpackedTarball/expat/lib/loadlibrary_x64 \
 	UnpackedTarball/expat/lib/xmlparse_x64 \
 	UnpackedTarball/expat/lib/xmltok_x64 \
 	UnpackedTarball/expat/lib/xmlrole_x64 \
diff --git a/external/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk
index f90fc8552568..60e933d76090 100644
--- a/external/expat/UnpackedTarball_expat.mk
+++ b/external/expat/UnpackedTarball_expat.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,expat,\
 
 $(eval $(call gb_UnpackedTarball_set_post_action,expat,\
 	$(if $(filter $(BUILD_X64),TRUE),         \
-	  cp lib/loadlibrary.c lib/loadlibrary_x64.c && \
 	  cp lib/xmlparse.c lib/xmlparse_x64.c && \
 	  cp lib/xmltok.c lib/xmltok_x64.c     && \
 	  cp lib/xmlrole.c lib/xmlrole_x64.c) \
diff --git a/external/expat/expat-winapi.patch b/external/expat/expat-winapi.patch
index 3fe8a8a63e5a..b33c12b83b4c 100644
--- a/external/expat/expat-winapi.patch
+++ b/external/expat/expat-winapi.patch
@@ -1,13 +1,13 @@
 --- misc/expat-2.1.0/lib/expat_external.h	2009-11-16 08:53:17.375000000 +0000
 +++ misc/build/expat-2.1.0/lib/expat_external.h	2009-11-16 08:53:34.703125000 +0000
-@@ -7,10 +7,6 @@
+@@ -81,10 +81,6 @@
+ #  ifndef XML_BUILDING_EXPAT
+ /* using Expat from an application */
  
- /* External API definitions */
- 
--#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
--# define XML_USE_MSC_EXTENSIONS 1
--#endif
+-#    if defined(_MSC_EXTENSIONS) && ! defined(__BEOS__) && ! defined(__CYGWIN__)
+-#      define XMLIMPORT __declspec(dllimport)
+-#    endif
 -
- /* Expat tries very hard to make the API boundary very specifically
-    defined.  There are two macros defined to control this boundary;
-    each of these can be defined before including this header to
+ #  endif
+ #endif /* not defined XML_STATIC */
+ 
commit 0efbf592931e2ecc0300aaf537cbe0793a90f422
Author:     David Tardon <dtardon at redhat.com>
AuthorDate: Wed Nov 8 19:01:59 2017 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sat Sep 21 03:15:04 2019 +0200

    upload expat 2.2.5
    
    Reviewed-on: https://gerrit.libreoffice.org/44552
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit 34a7a9fd7649655256a85b5701d461af5ccc2016)
    
    Change-Id: Ic92002ec4f5edc48ca1bb3ac84836c4e6d19833c
    Reviewed-on: https://gerrit.libreoffice.org/79274
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/download.lst b/download.lst
index 70d73e76f35a..7182d0302e78 100644
--- a/download.lst
+++ b/download.lst
@@ -33,8 +33,8 @@ export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 export ETONYEK_MD5SUM := 77ff46936dcc83670557274e7dd2aa33
 export ETONYEK_VERSION_MICRO := 6
 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.bz2
-export EXPAT_MD5SUM := f053af63ef5f39bd9b78d01fbc203334
-export EXPAT_TARBALL := expat-2.2.3.tar.bz2
+export EXPAT_MD5SUM := 789e297f547980fc9ecc036f9a070d49
+export EXPAT_TARBALL := expat-2.2.5.tar.bz2
 export FIREBIRD_MD5SUM := b0b5293991fcf07347b38431c80be1d4
 export FIREBIRD_TARBALL := Firebird-2.5.5.26952-0.tar.bz2
 # FIREBIRD_MD5SUM := b259c2d1c60a03bd104108405ae990a7
diff --git a/external/expat/expat-winapi.patch b/external/expat/expat-winapi.patch
index 070dafc0cb0c..3fe8a8a63e5a 100644
--- a/external/expat/expat-winapi.patch
+++ b/external/expat/expat-winapi.patch
@@ -5,7 +5,7 @@
  /* External API definitions */
  
 -#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
--#define XML_USE_MSC_EXTENSIONS 1
+-# define XML_USE_MSC_EXTENSIONS 1
 -#endif
 -
  /* Expat tries very hard to make the API boundary very specifically

More information about the Libreoffice-commits mailing list