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

[Libreoffice Gerrit user]

 download.lst                                  |    4 ++--
 external/libwpg/Library_wpg.mk                |    1 +
 external/libwpg/libwpg-bundled-soname.patch.0 |    7 +++----
 solenv/flatpak-manifest.in                    |    6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 99f9191c113bdb7d05a3380faf7484d0f5d2835a
Author:     David Tardon <dtardon at redhat.com>
AuthorDate: Tue Jan 1 20:33:13 2019 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sat Jan 5 21:23:20 2019 +0100

    upload libwpg 0.3.3
    
    Change-Id: Iac2c3f75eda07b7381e57dba389c9836ab26502f
    Reviewed-on: https://gerrit.libreoffice.org/65781
    Tested-by: Jenkins
    Reviewed-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit 927c42e080221c833fd418e9cfd6d18acc7d63c0)
    Reviewed-on: https://gerrit.libreoffice.org/65803
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/download.lst b/download.lst
index 4a761de85b06..a988ed389a21 100644
--- a/download.lst
+++ b/download.lst
@@ -241,8 +241,8 @@ export VISIO_TARBALL := libvisio-0.1.6.tar.xz
 export WPD_SHA256SUM := 323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610
 export WPD_VERSION_MICRO := 2
 export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
-export WPG_SHA256SUM := 57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33
-export WPG_VERSION_MICRO := 2
+export WPG_SHA256SUM := 99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c
+export WPG_VERSION_MICRO := 3
 export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
 export WPS_SHA256SUM := 1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca
 export WPS_VERSION_MICRO := 10
diff --git a/external/libwpg/Library_wpg.mk b/external/libwpg/Library_wpg.mk
index 896fab13a072..4eb5c5d8b8fe 100644
--- a/external/libwpg/Library_wpg.mk
+++ b/external/libwpg/Library_wpg.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,wpg,\
 	UnpackedTarball/libwpg/src/lib/WPGColor \
 	UnpackedTarball/libwpg/src/lib/WPGDashArray \
 	UnpackedTarball/libwpg/src/lib/WPGHeader \
+	UnpackedTarball/libwpg/src/lib/WPGTextDataHandler \
 	UnpackedTarball/libwpg/src/lib/WPGXParser \
 	UnpackedTarball/libwpg/src/lib/WPGraphics \
 	UnpackedTarball/libwpg/src/lib/libwpg_utils \
diff --git a/external/libwpg/libwpg-bundled-soname.patch.0 b/external/libwpg/libwpg-bundled-soname.patch.0
index 4fef3c27e4e7..282bbbb8ba04 100644
--- a/external/libwpg/libwpg-bundled-soname.patch.0
+++ b/external/libwpg/libwpg-bundled-soname.patch.0
@@ -1,11 +1,10 @@
 --- src/lib/Makefile.in.orig	2015-08-06 21:30:41.615633795 +0200
 +++ src/lib/Makefile.in	2015-08-06 21:31:03.764633415 +0200
-@@ -357,7 +357,7 @@
- AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(WPD_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBWPG_BUILD=1
+@@ -357,6 +357,6 @@
  libwpg_ at WPG_MAJOR_VERSION@_ at WPG_MINOR_VERSION@_la_LIBADD = $(WPD_LIBS) $(REVENGE_LIBS) @LIBWPG_WIN32_RESOURCE@
  libwpg_ at WPG_MAJOR_VERSION@_ at WPG_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPG_WIN32_RESOURCE@
 -libwpg_ at WPG_MAJOR_VERSION@_ at WPG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined
 +libwpg_ at WPG_MAJOR_VERSION@_ at WPG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo
  libwpg_ at WPG_MAJOR_VERSION@_ at WPG_MINOR_VERSION@_la_SOURCES = \
- 	WPGraphics.cpp \
- 	WPGDashArray.cpp \
+ 	WPG1Parser.cpp \
+ 	WPG1Parser.h \
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index b0785bf3e220..10855cc48ffc 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -296,10 +296,10 @@
                     "dest-filename": "external/tarballs/libwpd-0.10.2.tar.xz"
                 },
                 {
-                    "url": "https://dev-www.libreoffice.org/src/libwpg-0.3.2.tar.xz",
-                    "sha256": "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33",
+                    "url": "https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz",
+                    "sha256": "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c",
                     "type": "file",
-                    "dest-filename": "external/tarballs/libwpg-0.3.2.tar.xz"
+                    "dest-filename": "external/tarballs/libwpg-0.3.3.tar.xz"
                 },
                 {
                     "url": "https://dev-www.libreoffice.org/src/libwps-0.4.10.tar.xz",