configure.ac | 2
download.lst | 4 -
external/libmwaw/0001-ssize_t-is-not-std-type.patch.1 | 27
----------
external/libmwaw/Library_mwaw.mk | 1
external/libmwaw/UnpackedTarball_libmwaw.mk | 4 -
external/libmwaw/libmwaw-bundled-soname.patch.0 | 6 +-
solenv/flatpak-manifest.in | 6 +-
writerperfect/qa/unit/WpftDrawFilterTest.cxx | 2
writerperfect/qa/unit/data/draw/libmwaw/pass/CorelPainter_10 |binary
writerperfect/qa/unit/data/draw/libmwaw/pass/CorelPainter_3_win.rif |binary
10 files changed, 12 insertions(+), 40 deletions(-)
New commits:
commit d077b19a3f617f5ef3d65fc20a136a9107c47199
Author: David Tardon <dtar...@redhat.com>
AuthorDate: Thu Apr 18 20:04:51 2019 +0200
Commit: David Tardon <dtar...@redhat.com>
CommitDate: Sun Apr 21 09:44:57 2019 +0200
upload libmwaw 0.3.15
Change-Id: I496204ead6c495c4fee2cee18a5b9d0fd22eb8c0
Reviewed-on: https://gerrit.libreoffice.org/70951
Tested-by: Jenkins
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 04e7389eebd9..567746177490 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8231,7 +8231,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.14])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.15])
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 82a2413da94d..0d9f9b719aa5 100644
--- a/download.lst
+++ b/download.lst
@@ -174,8 +174,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 :=
aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9
-export MWAW_VERSION_MICRO := 14
+export MWAW_SHA256SUM :=
0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1
+export MWAW_VERSION_MICRO := 15
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-ssize_t-is-not-std-type.patch.1
b/external/libmwaw/0001-ssize_t-is-not-std-type.patch.1
deleted file mode 100644
index e33f2a19d560..000000000000
--- a/external/libmwaw/0001-ssize_t-is-not-std-type.patch.1
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4458a5e93736a324251a356362f0e80e7c42d5be Mon Sep 17 00:00:00 2001
-From: David Tardon <dtar...@redhat.com>
-Date: Wed, 25 Apr 2018 12:53:37 +0200
-Subject: [PATCH] ssize_t is not std type
-
----
- src/lib/WriterPlsParser.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/WriterPlsParser.cxx b/src/lib/WriterPlsParser.cxx
-index 00dc969b..33b1fa49 100644
---- a/src/lib/WriterPlsParser.cxx
-+++ b/src/lib/WriterPlsParser.cxx
-@@ -316,8 +316,8 @@ bool WindowsInfo::getColumnLimitsFor(int line,
std::vector<int> &listPos)
- if (m_columns[i].m_firstLine == line+2) {
- numCols=m_columns[i].m_numCol;
- firstColumn = i;
-- if (numCols > ssize_t(numColumns - firstColumn))
-- numCols = int(ssize_t(numColumns - firstColumn));
-+ if (numCols > int(unsigned(numColumns - firstColumn)))
-+ numCols = int(unsigned(numColumns - firstColumn));
- if (numCols <= 1 || m_columns[i].m_col != 1) return false;
- break;
- }
---
-2.14.3
-
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index fbdd9e1cf1da..f9615bf59f81 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -57,6 +57,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/ClarisWksStyleManager \
UnpackedTarball/libmwaw/src/lib/ClarisWksTable \
UnpackedTarball/libmwaw/src/lib/ClarisWksText \
+ UnpackedTarball/libmwaw/src/lib/CorelPainterParser \
UnpackedTarball/libmwaw/src/lib/CricketDrawParser \
UnpackedTarball/libmwaw/src/lib/DocMkrParser \
UnpackedTarball/libmwaw/src/lib/DocMkrText \
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index bb39a27382b9..cd1551a1fe97 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -37,8 +37,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
))
endif
-$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
- external/libmwaw/0001-ssize_t-is-not-std-type.patch.1 \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/external/libmwaw/libmwaw-bundled-soname.patch.0
b/external/libmwaw/libmwaw-bundled-soname.patch.0
index 2abf77c74892..31f5c75cba44 100644
--- a/external/libmwaw/libmwaw-bundled-soname.patch.0
+++ b/external/libmwaw/libmwaw-bundled-soname.patch.0
@@ -1,9 +1,9 @@
--- src/lib/Makefile.in.orig 2015-08-07 14:04:47.646611627 +0200
+++ src/lib/Makefile.in 2015-08-07 14:25:49.888589996 +0200
@@ -418,8 +418,8 @@
-
- AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS)
- libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS)
@LIBMWAW_WIN32_RESOURCE@
+ AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) \
+ $(ZLIB_CFLAGS) $(am__append_1)
+ libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS)
$(ZLIB_LIBS) @LIBMWAW_WIN32_RESOURCE@
-libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_DEPENDENCIES =
@LIBMWAW_WIN32_RESOURCE@
-libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LDFLAGS =
$(version_info) -export-dynamic -no-undefined
+libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_DEPENDENCIES =
@LIBMWAW_WIN32_RESOURCE@
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index ef5802713baf..a8a58c4827c2 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -263,10 +263,10 @@
"dest-filename": "external/tarballs/libmspub-0.1.4.tar.xz"
},
{
- "url":
"https://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz";,
- "sha256":
"aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9",
+ "url":
"https://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz";,
+ "sha256":
"0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1",
"type": "file",
- "dest-filename": "external/tarballs/libmwaw-0.3.14.tar.xz"
+ "dest-filename": "external/tarballs/libmwaw-0.3.15.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2";,
diff --git a/writerperfect/qa/unit/WpftDrawFilterTest.cxx
b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
index bdf2e33fb058..7d96e5a6557f 100644
--- a/writerperfect/qa/unit/WpftDrawFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
@@ -32,6 +32,8 @@ void WpftDrawFilterTest::test()
{
const writerperfect::test::WpftOptionalMap_t aMWAWOptional{
{ "ClarisDraw.hqx", REQUIRE_MWAW_VERSION(0, 3, 5) },
+ { "CorelPainter_3_win", REQUIRE_MWAW_VERSION(0, 3, 15) },
+ { "CorelPainter_10", REQUIRE_MWAW_VERSION(0, 3, 15) },
{ "CricketDraw_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 8) },
{ "CricketDraw_1.1.hqx", REQUIRE_MWAW_VERSION(0, 3, 8) },
{ "FreeHand_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 8) },
diff --git a/writerperfect/qa/unit/data/draw/libmwaw/pass/CorelPainter_10
b/writerperfect/qa/unit/data/draw/libmwaw/pass/CorelPainter_10
new file mode 100644
index 000000000000..b90bfbdc90d0
Binary files /dev/null and
b/writerperfect/qa/unit/data/draw/libmwaw/pass/CorelPainter_10 differ
diff --git
a/writerperfect/qa/unit/data/draw/libmwaw/pass/CorelPainter_3_win.rif
b/writerperfect/qa/unit/data/draw/libmwaw/pass/CorelPainter_3_win.rif
new file mode 100644
index 000000000000..be59998c04a6
Binary files /dev/null and
b/writerperfect/qa/unit/data/draw/libmwaw/pass/CorelPainter_3_win.rif differ
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
