[Libreoffice-commits] core.git: 2 commits - download.lst external/expat extras/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Mon Sep 16 09:22:50 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 ++++++++---------
extras/source/autotext/lang/zu/standard/FN/content.xml | 8 +++----
7 files changed, 16 insertions(+), 19 deletions(-)
New commits:
commit 6d15dcd1298d29c479b9bd8759ba91241d1c23b8
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 16 09:34:00 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 16 11:22:06 2019 +0200
latest expat
Change-Id: Ia98c9718ccd8e18b5f56851027bde944164f05c4
Reviewed-on: https://gerrit.libreoffice.org/78976
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/download.lst b/download.lst
index 846df448bacd..1516608ab7d7 100644
--- a/download.lst
+++ b/download.lst
@@ -42,8 +42,8 @@ export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz
export ETONYEK_SHA256SUM := e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a
export ETONYEK_VERSION_MICRO := 9
export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
-export EXPAT_SHA256SUM := d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6
-export EXPAT_TARBALL := expat-2.2.5.tar.bz2
+export EXPAT_SHA256SUM := 9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102
+export EXPAT_TARBALL := expat-2.2.8.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/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 65b1dcb5568a..025ab617ad15 100644
--- a/external/expat/StaticLibrary_expat.mk
+++ b/external/expat/StaticLibrary_expat.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_StaticLibrary_add_defs,expat,\
endif
$(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 e5b1e51ab994..68bb7f86a89b 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 7c83f65af284..5d4f41f6d147 100644
--- a/external/expat/UnpackedTarball_expat.mk
+++ b/external/expat/UnpackedTarball_expat.mk
@@ -26,7 +26,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 aca89b1c8a7caef40973c7e607bd816540a405e6
Author: Laurent BP <laurent.balland-poirier at laposte.net>
AuthorDate: Tue Sep 10 22:30:41 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Sep 16 11:21:58 2019 +0200
Improve FN AutoText for zu
Translate names which appear in Navigator
Change-Id: I6b2cc1083858f8446d23a23dfcd470a60bfc4b9b
Reviewed-on: https://gerrit.libreoffice.org/78804
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/extras/source/autotext/lang/zu/standard/FN/content.xml b/extras/source/autotext/lang/zu/standard/FN/content.xml
index b41b40baf853..ce13ed6d30ea 100644
--- a/extras/source/autotext/lang/zu/standard/FN/content.xml
+++ b/extras/source/autotext/lang/zu/standard/FN/content.xml
@@ -34,14 +34,14 @@
<text:sequence-decl text:display-outline-level="0" text:name="Text"/>
<text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
</text:sequence-decls>
- <table:table table:name="Tabel1" table:style-name="FormulaTable">
+ <table:table table:name="Ithebula1" table:style-name="FormulaTable">
<table:table-column table:style-name="FormulaTable.A"/>
<table:table-column table:style-name="FormulaTable.B"/>
<table:table-header-rows>
<table:table-row>
<table:table-cell table:style-name="FormulaTable.A1" office:value-type="string">
- <text:p text:style-name="P1"><draw:frame draw:style-name="fr1" draw:name="Objek1" text:anchor-type="as-char" draw:z-index="0"><draw:object xlink:href="./Object_1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
- <svg:desc>formula</svg:desc>
+ <text:p text:style-name="P1"><draw:frame draw:style-name="fr1" draw:name="Into1" text:anchor-type="as-char" draw:z-index="0"><draw:object xlink:href="./Object_1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
+ <svg:desc>Indlela yokwenza</svg:desc>
</draw:frame></text:p>
</table:table-cell>
<table:table-cell table:style-name="FormulaTable.A1" office:value-type="string">
@@ -52,4 +52,4 @@
</table:table>
</office:text>
</office:body>
-</office:document-content>
\ No newline at end of file
+</office:document-content>
More information about the Libreoffice-commits
mailing list