[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - download.lst external/libwpd solenv/flatpak-manifest.in

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sat Jan 5 20:24:14 UTC 2019 

 download.lst                                        |    4 +--
 external/libwpd/0001-fix-build-with-gcc-4.8.patch.1 |   25 ++++++++++++++++++++
 external/libwpd/Library_wpd.mk                      |    2 +
 external/libwpd/UnpackedTarball_libwpd.mk           |    1 
 external/libwpd/libwpd-bundled-soname.patch.0       |    3 --
 solenv/flatpak-manifest.in                          |    6 ++--
 6 files changed, 34 insertions(+), 7 deletions(-)

New commits:
commit d71930cf1b9597f5cdc2608a9bb316c31045fc62
Author:     David Tardon <dtardon at redhat.com>
AuthorDate: Sat Dec 29 14:14:13 2018 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sat Jan 5 21:23:53 2019 +0100

    upload libwpd 0.10.3
    
    Reviewed-on: https://gerrit.libreoffice.org/65714
    Tested-by: Jenkins
    Reviewed-by: David Tardon <dtardon at 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 at CIB.de>

diff --git a/download.lst b/download.lst
index a988ed389a21..f4fbcbcf5bc2 100644
--- a/download.lst
+++ b/download.lst
@@ -238,8 +238,8 @@ export UCPP_SHA256SUM := 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f
 export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 export VISIO_SHA256SUM := fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9
 export VISIO_TARBALL := libvisio-0.1.6.tar.xz
-export WPD_SHA256SUM := 323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610
-export WPD_VERSION_MICRO := 2
+export WPD_SHA256SUM := 2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09
+export WPD_VERSION_MICRO := 3
 export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
 export WPG_SHA256SUM := 99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c
 export WPG_VERSION_MICRO := 3
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 at 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_ at WPD_MAJOR_VERSION@_ at WPD_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) @LIBWPD_WIN32_RESOURCE@
  libwpd_ at WPD_MAJOR_VERSION@_ at WPD_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPD_WIN32_RESOURCE@
 -libwpd_ at WPD_MAJOR_VERSION@_ at WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined)
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 10855cc48ffc..634b03e08e24 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -290,10 +290,10 @@
                     "dest-filename": "external/tarballs/libvisio-0.1.6.tar.xz"
                 },
                 {
-                    "url": "https://dev-www.libreoffice.org/src/libwpd-0.10.2.tar.xz",
-                    "sha256": "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610",
+                    "url": "https://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz",
+                    "sha256": "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09",
                     "type": "file",
-                    "dest-filename": "external/tarballs/libwpd-0.10.2.tar.xz"
+                    "dest-filename": "external/tarballs/libwpd-0.10.3.tar.xz"
                 },
                 {
                     "url": "https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz",

More information about the Libreoffice-commits mailing list