summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2017-11-08 19:01:59 +0100
committerDavid Tardon <dtardon@redhat.com>2017-11-10 14:03:51 +0100
commit34a7a9fd7649655256a85b5701d461af5ccc2016 (patch)
tree0f1efbe830a66290bc8378f300ad3c222e02cd4e
parent2352a8e8e3fee49fbcea1118c5a41cbf4b3998ce (diff)
upload expat 2.2.5
Change-Id: Ic92002ec4f5edc48ca1bb3ac84836c4e6d19833c Reviewed-on: https://gerrit.libreoffice.org/44552 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
-rw-r--r--download.lst4
-rw-r--r--external/expat/expat-winapi.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/download.lst b/download.lst
index dba319fa7052..80f5c2cc5650 100644
--- a/download.lst
+++ b/download.lst
@@ -42,8 +42,8 @@ export EPUBGEN_TARBALL := libepubgen-0.0.1.tar.bz2
export ETONYEK_SHA256SUM := 69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac
export ETONYEK_VERSION_MICRO := 7
export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
-export EXPAT_SHA256SUM := b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f
-export EXPAT_TARBALL := expat-2.2.3.tar.bz2
+export EXPAT_SHA256SUM := d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6
+export EXPAT_TARBALL := expat-2.2.5.tar.bz2
export FIREBIRD_SHA256SUM := 6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860
export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2
export FONTCONFIG_SHA256SUM := cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
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