diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libwpg/Library_wpg.mk | 1 | ||||
| -rw-r--r-- | external/libwpg/libwpg-bundled-soname.patch.0 | 7 | ||||
| -rw-r--r-- | solenv/flatpak-manifest.in | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/download.lst b/download.lst index e7aa94b3ff77..d6d35ed7d422 100644 --- a/download.lst +++ b/download.lst @@ -241,8 +241,8 @@ export VISIO_TARBALL := libvisio-0.1.6.tar.xz 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 +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_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_LIBADD = $(WPD_LIBS) $(REVENGE_LIBS) @LIBWPG_WIN32_RESOURCE@ libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPG_WIN32_RESOURCE@ -libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined +libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo libwpg_@WPG_MAJOR_VERSION@_@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 bb9b9c993f7b..cbe530a82fd4 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -307,10 +307,10 @@ "dest-filename": "external/tarballs/libwpd-0.10.3.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", |