configure.ac | 2 -
download.lst | 4 +--
external/libmwaw/0001-drop-unneeded-include.patch.1 | 25 --------------------
external/libmwaw/Library_mwaw.mk | 2 +
external/libmwaw/UnpackedTarball_libmwaw.mk | 4 ---
solenv/flatpak-manifest.in | 6 ++--
6 files changed, 8 insertions(+), 35 deletions(-)
New commits:
commit 158737c2aa29904b726829399f9f5b24345dd013
Author: David Tardon <dtar...@redhat.com>
AuthorDate: Mon May 10 19:16:20 2021 +0200
Commit: David Tardon <dtar...@redhat.com>
CommitDate: Mon May 10 20:19:45 2021 +0200
upload libmwaw 0.3.19
Change-Id: Ibb26390e6cc13c925f499bf95cfc6177d8c9b735
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115355
Tested-by: Jenkins
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/configure.ac b/configure.ac
index f40314d09853..34e8d0535d65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9235,7 +9235,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.18])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.19])
libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8])
diff --git a/download.lst b/download.lst
index 974b54cb67ed..df523338840d 100644
--- a/download.lst
+++ b/download.lst
@@ -184,8 +184,8 @@ export MDNSRESPONDER_SHA256SUM :=
e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e39
export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz
export MSPUB_SHA256SUM :=
ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
export MSPUB_TARBALL := libmspub-0.1.4.tar.xz
-export MWAW_SHA256SUM :=
fc5d051680f8000be64ffebc0b0c58716b1c9bf06003ec399387b109d1ed1e0f
-export MWAW_VERSION_MICRO := 18
+export MWAW_SHA256SUM :=
b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af
+export MWAW_VERSION_MICRO := 19
export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
export MYTHES_SHA256SUM :=
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f
export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
diff --git a/external/libmwaw/0001-drop-unneeded-include.patch.1
b/external/libmwaw/0001-drop-unneeded-include.patch.1
deleted file mode 100644
index 505f38daf80a..000000000000
--- a/external/libmwaw/0001-drop-unneeded-include.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-From db0450c5bacdf0f3970a8838ff989b7e5390ffff Mon Sep 17 00:00:00 2001
-From: David Tardon <dtar...@redhat.com>
-Date: Thu, 8 Apr 2021 23:07:13 +0200
-Subject: [PATCH] drop unneeded include
-
----
- src/lib/Canvas5StyleManager.cxx | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/lib/Canvas5StyleManager.cxx b/src/lib/Canvas5StyleManager.cxx
-index 7cb368f0..f6b3338a 100644
---- a/src/lib/Canvas5StyleManager.cxx
-+++ b/src/lib/Canvas5StyleManager.cxx
-@@ -31,8 +31,6 @@
- * instead of those above.
- */
-
--#include <strings.h>
--
- #include <cmath>
- #include <iomanip>
- #include <iostream>
---
-2.30.2
-
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index d92a1b729b81..6fdcded16190 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -41,7 +41,9 @@ $(eval $(call
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/BeagleWksSSParser \
UnpackedTarball/libmwaw/src/lib/BeagleWksStructManager \
UnpackedTarball/libmwaw/src/lib/BeagleWksText \
+ UnpackedTarball/libmwaw/src/lib/Canvas5BMParser \
UnpackedTarball/libmwaw/src/lib/Canvas5Graph \
+ UnpackedTarball/libmwaw/src/lib/Canvas5Image \
UnpackedTarball/libmwaw/src/lib/Canvas5Parser \
UnpackedTarball/libmwaw/src/lib/Canvas5Structure \
UnpackedTarball/libmwaw/src/lib/Canvas5StyleManager \
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index e15768e91623..935cbc1eb1c3 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -15,10 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,0))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libmwaw))
-$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
- external/libmwaw/0001-drop-unneeded-include.patch.1 \
-))
-
ifneq ($(OS),MACOSX)
ifneq ($(OS),WNT)
$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 734e72c5dfc6..032806239230 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -273,10 +273,10 @@
"dest-filename": "external/tarballs/libmspub-0.1.4.tar.xz"
},
{
- "url":
"https://dev-www.libreoffice.org/src/libmwaw-0.3.18.tar.xz";,
- "sha256":
"fc5d051680f8000be64ffebc0b0c58716b1c9bf06003ec399387b109d1ed1e0f",
+ "url":
"https://dev-www.libreoffice.org/src/libmwaw-0.3.19.tar.xz";,
+ "sha256":
"b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af",
"type": "file",
- "dest-filename": "external/tarballs/libmwaw-0.3.18.tar.xz"
+ "dest-filename": "external/tarballs/libmwaw-0.3.19.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/libodfgen-0.1.8.tar.xz";,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
