diff options
| author | David Tardon <dtardon@redhat.com> | 2018-12-29 14:14:13 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-01-05 21:23:53 +0100 |
| commit | d71930cf1b9597f5cdc2608a9bb316c31045fc62 (patch) | |
| tree | 317443d133d006c504ab98ded4b094ca64e0837b /external | |
| parent | 99f9191c113bdb7d05a3380faf7484d0f5d2835a (diff) | |
upload libwpd 0.10.3
Reviewed-on: https://gerrit.libreoffice.org/65714
Tested-by: Jenkins
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 87742f16e2d3f1c58534508b724268b9ce675c8e)
Change-Id: I68e3791f50b95956bfe6aae743978994a5f232b4
Reviewed-on: https://gerrit.libreoffice.org/65719
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libwpd/0001-fix-build-with-gcc-4.8.patch.1 | 25 | ||||
| -rw-r--r-- | external/libwpd/Library_wpd.mk | 2 | ||||
| -rw-r--r-- | external/libwpd/UnpackedTarball_libwpd.mk | 1 | ||||
| -rw-r--r-- | external/libwpd/libwpd-bundled-soname.patch.0 | 3 |
4 files changed, 29 insertions, 2 deletions
diff --git a/external/libwpd/0001-fix-build-with-gcc-4.8.patch.1 b/external/libwpd/0001-fix-build-with-gcc-4.8.patch.1 new file mode 100644 index 000000000000..9cf2abbfc931 --- /dev/null +++ b/external/libwpd/0001-fix-build-with-gcc-4.8.patch.1 @@ -0,0 +1,25 @@ +From 333c8a26f231bea26ec3d56245315041bbf5577f Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Sun, 30 Dec 2018 11:11:18 +0100 +Subject: [PATCH] fix build with gcc 4.8 + +--- + src/lib/WPXTable.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/WPXTable.h b/src/lib/WPXTable.h +index bdbaf795..9ffb7b6c 100644 +--- a/src/lib/WPXTable.h ++++ b/src/lib/WPXTable.h +@@ -53,7 +53,7 @@ public: + ~WPXTable(); + void insertRow(); + void insertCell(unsigned char colSpan, unsigned char rowSpan, unsigned char borderBits); +- const WPXTableCell *getCell(size_t i, size_t j) ++ const WPXTableCell *getCell(std::size_t i, std::size_t j) + { + return &(m_tableRows[i])[j]; + } +-- +2.19.2 + diff --git a/external/libwpd/Library_wpd.mk b/external/libwpd/Library_wpd.mk index 62285858468f..2c84a5b5bb24 100644 --- a/external/libwpd/Library_wpd.mk +++ b/external/libwpd/Library_wpd.mk @@ -192,6 +192,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,wpd,\ UnpackedTarball/libwpd/src/lib/WPXContentListener \ UnpackedTarball/libwpd/src/lib/WPXEncryption \ UnpackedTarball/libwpd/src/lib/WPXHeader \ + UnpackedTarball/libwpd/src/lib/WPXHeaderFooter \ UnpackedTarball/libwpd/src/lib/WPXListener \ UnpackedTarball/libwpd/src/lib/WPXMemoryStream \ UnpackedTarball/libwpd/src/lib/WPXPageSpan \ @@ -199,6 +200,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,wpd,\ UnpackedTarball/libwpd/src/lib/WPXStylesListener \ UnpackedTarball/libwpd/src/lib/WPXSubDocument \ UnpackedTarball/libwpd/src/lib/WPXTable \ + UnpackedTarball/libwpd/src/lib/WPXTableList \ UnpackedTarball/libwpd/src/lib/libwpd_internal \ UnpackedTarball/libwpd/src/lib/libwpd_math \ )) diff --git a/external/libwpd/UnpackedTarball_libwpd.mk b/external/libwpd/UnpackedTarball_libwpd.mk index 9baf6d9fce0d..ca2afe92b4ed 100644 --- a/external/libwpd/UnpackedTarball_libwpd.mk +++ b/external/libwpd/UnpackedTarball_libwpd.mk @@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libwpd)) $(eval $(call gb_UnpackedTarball_add_patches,libwpd,\ external/libwpd/libwpd-vs2013.patch.1 \ $(if $(SYSTEM_REVENGE),,external/libwpd/rpath.patch) \ + external/libwpd/0001-fix-build-with-gcc-4.8.patch.1 \ )) ifneq ($(OS),MACOSX) diff --git a/external/libwpd/libwpd-bundled-soname.patch.0 b/external/libwpd/libwpd-bundled-soname.patch.0 index 04661f2d464b..2a669748f21d 100644 --- a/external/libwpd/libwpd-bundled-soname.patch.0 +++ b/external/libwpd/libwpd-bundled-soname.patch.0 @@ -1,7 +1,6 @@ --- src/lib/Makefile.in.orig 2015-08-06 21:41:41.073622494 +0200 +++ src/lib/Makefile.in 2015-08-06 21:42:09.377622009 +0200 -@@ -429,7 +429,7 @@ - AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBWPD_BUILD=1 +@@ -429,6 +429,6 @@ libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) @LIBWPD_WIN32_RESOURCE@ libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPD_WIN32_RESOURCE@ -libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) |