download.lst | 4 ++--
external/libwpd/Library_wpd.mk | 2 ++
external/libwpd/include.patch | 4 ++--
external/libwpd/libwpd-bundled-soname.patch.0 | 3 +--
solenv/flatpak-manifest.in | 6 +++---
5 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit 4a565c374377d56f40c4f3c953b39bdd159efd8e
Author: David Tardon <dtar...@redhat.com>
AuthorDate: Sat Dec 29 14:14:13 2018 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Nov 12 10:30:25 2021 +0100
upload libwpd 0.10.3
Reviewed-on: https://gerrit.libreoffice.org/65714
Tested-by: Jenkins
Reviewed-by: David Tardon <dtar...@redhat.com>
(cherry picked from commit 87742f16e2d3f1c58534508b724268b9ce675c8e)
Change-Id: I68e3791f50b95956bfe6aae743978994a5f232b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125064
Tested-by: Michael Stahl <michael.st...@allotropia.de>
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/download.lst b/download.lst
index a377b09e3d4c..b7145a9822c5 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 :=
8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c
export VISIO_TARBALL := libvisio-0.1.7.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 :=
57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33
export WPG_VERSION_MICRO := 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/include.patch b/external/libwpd/include.patch
index ca68e8bdb22a..57f52b4b0aa5 100644
--- a/external/libwpd/include.patch
+++ b/external/libwpd/include.patch
@@ -1,10 +1,10 @@
--- src/lib/WPXTable.h
+++ src/lib/WPXTable.h
@@ -36,6 +36,7 @@
-
#ifndef _WPXTABLE_H
#define _WPXTABLE_H
+
+#include <stddef.h>
#include <vector>
- #include <stdio.h>
+ struct WPXTableCell
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)
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index bc911dbf91db..77765e353346 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -340,10 +340,10 @@
"dest-filename": "external/tarballs/libvisio-0.1.7.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.2.tar.xz";,
