diff options
| author | David Tardon <dtardon@redhat.com> | 2019-04-18 20:04:51 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2019-04-21 09:44:57 +0200 |
| commit | d077b19a3f617f5ef3d65fc20a136a9107c47199 (patch) | |
| tree | 73baec5d78d5d7c5fa0044c7837e9757c075fafc /external | |
| parent | c6542e7dd0dc1172d24f52bf6224a14fbeebbf87 (diff) | |
upload libmwaw 0.3.15
Change-Id: I496204ead6c495c4fee2cee18a5b9d0fd22eb8c0
Reviewed-on: https://gerrit.libreoffice.org/70951
Tested-by: Jenkins
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libmwaw/0001-ssize_t-is-not-std-type.patch.1 | 27 | ||||
| -rw-r--r-- | external/libmwaw/Library_mwaw.mk | 1 | ||||
| -rw-r--r-- | external/libmwaw/UnpackedTarball_libmwaw.mk | 4 | ||||
| -rw-r--r-- | external/libmwaw/libmwaw-bundled-soname.patch.0 | 6 |
4 files changed, 4 insertions, 34 deletions
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 <dtardon@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@ |