[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac download.lst external/libmwaw writerperfect/qa
configure.ac |2 +-
download.lst |4 ++--
external/libmwaw/Library_mwaw.mk |3 +++
writerperfect/qa/unit/WpftDrawFilterTest.cxx |2 ++
writerperfect/qa/unit/WpftWriterFilterTest.cxx|1 +
writerperfect/qa/unit/data/draw/libmwaw/pass/ReadySetGo_1 |binary
writerperfect/qa/unit/data/draw/libmwaw/pass/Scoop_1 |binary
writerperfect/qa/unit/data/writer/libmwaw/pass/ScriptWriter_1 |binary
8 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 85ef4efeb27546b252ed59c80efe8352adcc2cc3
Author: David Tardon
AuthorDate: Mon Dec 13 21:39:46 2021 +0100
Commit: Xisco Fauli
CommitDate: Tue Dec 14 15:45:50 2021 +0100
upload libmwaw 0.3.21
Change-Id: Id28cd361237ce67b76a865ad4291ccece521af85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126768
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit c74d59a8b47bb8228c297a60e6b5b0cc5e08aa53)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126809
Reviewed-by: Xisco Fauli
diff --git a/configure.ac b/configure.ac
index bbd326b84321..96cb249fb7d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9361,7 +9361,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.20])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.21])
libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10])
diff --git a/download.lst b/download.lst
index 1a70e6a44ba0..8ec9ac8c3082 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 :=
14c38b06214f277ccd1450e22e6e32648955018d7695896bc560165748c8cd21
-export MWAW_VERSION_MICRO := 20
+export MWAW_SHA256SUM :=
e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c
+export MWAW_VERSION_MICRO := 21
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/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 2f27a6113485..58d433f9d093 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -201,6 +201,9 @@ $(eval $(call
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/RagTimeSpreadsheet \
UnpackedTarball/libmwaw/src/lib/RagTimeStruct \
UnpackedTarball/libmwaw/src/lib/RagTimeText \
+ UnpackedTarball/libmwaw/src/lib/ReadySetGoParser \
+ UnpackedTarball/libmwaw/src/lib/ScoopParser \
+ UnpackedTarball/libmwaw/src/lib/ScriptWriterParser \
UnpackedTarball/libmwaw/src/lib/StudentWritingCParser \
UnpackedTarball/libmwaw/src/lib/StyleParser \
UnpackedTarball/libmwaw/src/lib/SuperPaintParser \
diff --git a/writerperfect/qa/unit/WpftDrawFilterTest.cxx
b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
index 3786315c4620..78168cdb9ce0 100644
--- a/writerperfect/qa/unit/WpftDrawFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
@@ -46,6 +46,8 @@ void WpftDrawFilterTest::test()
{ "MacDraw_1.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) },
{ "MacDraw_II.hqx", REQUIRE_MWAW_VERSION(0, 3, 3) },
{ "MacDraw_Pro_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 4) },
+{ "ReadySetGo_1", REQUIRE_MWAW_VERSION(0, 3, 21) },
+{ "Scoop_1", REQUIRE_MWAW_VERSION(0, 3, 21) },
};
const writerperfect::test::WpftOptionalMap_t aStarOfficeOptional{
{ "Draw_3.1.sda", REQUIRE_STAROFFICE_VERSION(0, 0, 1) },
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 543146169253..78d24dc99b17 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -44,6 +44,7 @@ void WpftWriterFilterTest::test()
{ "RagTime_2.1.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) },
{ "RagTime_3.2.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) },
{ "RagTime_5.5.rag", REQUIRE_MWAW_VERSION(0, 3, 6) },
+{ "ScriptWriter", REQUIRE_MWAW_VERSION(0, 3, 21) },
{ "StudentWritingCenter", REQUIRE_MWAW_VERSION(0, 3, 20) },
{ "WordMaker
[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw writerperfect/qa
configure.ac |2 +-
download.lst |4 ++--
external/libmwaw/Library_mwaw.mk |3 +++
writerperfect/qa/unit/WpftDrawFilterTest.cxx |2 ++
writerperfect/qa/unit/WpftWriterFilterTest.cxx|1 +
writerperfect/qa/unit/data/draw/libmwaw/pass/ReadySetGo_1 |binary
writerperfect/qa/unit/data/draw/libmwaw/pass/Scoop_1 |binary
writerperfect/qa/unit/data/writer/libmwaw/pass/ScriptWriter_1 |binary
8 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit c74d59a8b47bb8228c297a60e6b5b0cc5e08aa53
Author: David Tardon
AuthorDate: Mon Dec 13 21:39:46 2021 +0100
Commit: David Tardon
CommitDate: Tue Dec 14 08:08:46 2021 +0100
upload libmwaw 0.3.21
Change-Id: Id28cd361237ce67b76a865ad4291ccece521af85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126768
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/configure.ac b/configure.ac
index c213ebfb6693..099817d7a1ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9397,7 +9397,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.20])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.21])
libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10])
diff --git a/download.lst b/download.lst
index 0e93fecf0e9d..8dd656fd5de9 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 :=
14c38b06214f277ccd1450e22e6e32648955018d7695896bc560165748c8cd21
-export MWAW_VERSION_MICRO := 20
+export MWAW_SHA256SUM :=
e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c
+export MWAW_VERSION_MICRO := 21
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/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 2f27a6113485..58d433f9d093 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -201,6 +201,9 @@ $(eval $(call
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/RagTimeSpreadsheet \
UnpackedTarball/libmwaw/src/lib/RagTimeStruct \
UnpackedTarball/libmwaw/src/lib/RagTimeText \
+ UnpackedTarball/libmwaw/src/lib/ReadySetGoParser \
+ UnpackedTarball/libmwaw/src/lib/ScoopParser \
+ UnpackedTarball/libmwaw/src/lib/ScriptWriterParser \
UnpackedTarball/libmwaw/src/lib/StudentWritingCParser \
UnpackedTarball/libmwaw/src/lib/StyleParser \
UnpackedTarball/libmwaw/src/lib/SuperPaintParser \
diff --git a/writerperfect/qa/unit/WpftDrawFilterTest.cxx
b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
index 3786315c4620..78168cdb9ce0 100644
--- a/writerperfect/qa/unit/WpftDrawFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
@@ -46,6 +46,8 @@ void WpftDrawFilterTest::test()
{ "MacDraw_1.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) },
{ "MacDraw_II.hqx", REQUIRE_MWAW_VERSION(0, 3, 3) },
{ "MacDraw_Pro_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 4) },
+{ "ReadySetGo_1", REQUIRE_MWAW_VERSION(0, 3, 21) },
+{ "Scoop_1", REQUIRE_MWAW_VERSION(0, 3, 21) },
};
const writerperfect::test::WpftOptionalMap_t aStarOfficeOptional{
{ "Draw_3.1.sda", REQUIRE_STAROFFICE_VERSION(0, 0, 1) },
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 543146169253..78d24dc99b17 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -44,6 +44,7 @@ void WpftWriterFilterTest::test()
{ "RagTime_2.1.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) },
{ "RagTime_3.2.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) },
{ "RagTime_5.5.rag", REQUIRE_MWAW_VERSION(0, 3, 6) },
+{ "ScriptWriter", REQUIRE_MWAW_VERSION(0, 3, 21) },
{ "StudentWritingCenter", REQUIRE_MWAW_VERSION(0, 3, 20) },
{ "WordMaker", REQUIRE_MWAW_VERSION(0, 3, 20) },
};
diff --git a/writerperfect/qa/unit/data/draw/libmwaw/pass/ReadySetGo_1
b/writerperfect/qa/unit/data/draw/libmwaw/pass/
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - download.lst external/libwpd solenv/flatpak-manifest.in
download.lst |4 ++--
external/libwpd/Library_wpd.mk|2 ++
external/libwpd/include.patch |4 ++--
external/libwpd/libwpd-bundled-soname.patch.0 |3 +--
solenv/flatpak-manifest.in|6 +++---
5 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit 4a565c374377d56f40c4f3c953b39bdd159efd8e
Author: David Tardon
AuthorDate: Sat Dec 29 14:14:13 2018 +0100
Commit: Michael Stahl
CommitDate: Fri Nov 12 10:30:25 2021 +0100
upload libwpd 0.10.3
Reviewed-on: https://gerrit.libreoffice.org/65714
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit 87742f16e2d3f1c58534508b724268b9ce675c8e)
Change-Id: I68e3791f50b95956bfe6aae743978994a5f232b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125064
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/download.lst b/download.lst
index a377b09e3d4c..b7145a9822c5 100644
--- a/download.lst
+++ b/download.lst
@@ -238,8 +238,8 @@ export UCPP_SHA256SUM :=
983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f
export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
export VISIO_SHA256SUM :=
8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c
export VISIO_TARBALL := libvisio-0.1.7.tar.xz
-export WPD_SHA256SUM :=
323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610
-export WPD_VERSION_MICRO := 2
+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
diff --git a/external/libwpd/Library_wpd.mk b/external/libwpd/Library_wpd.mk
index 62285858468f..2c84a5b5bb24 100644
--- a/external/libwpd/Library_wpd.mk
+++ b/external/libwpd/Library_wpd.mk
@@ -192,6 +192,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,wpd,\
UnpackedTarball/libwpd/src/lib/WPXContentListener \
UnpackedTarball/libwpd/src/lib/WPXEncryption \
UnpackedTarball/libwpd/src/lib/WPXHeader \
+ UnpackedTarball/libwpd/src/lib/WPXHeaderFooter \
UnpackedTarball/libwpd/src/lib/WPXListener \
UnpackedTarball/libwpd/src/lib/WPXMemoryStream \
UnpackedTarball/libwpd/src/lib/WPXPageSpan \
@@ -199,6 +200,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,wpd,\
UnpackedTarball/libwpd/src/lib/WPXStylesListener \
UnpackedTarball/libwpd/src/lib/WPXSubDocument \
UnpackedTarball/libwpd/src/lib/WPXTable \
+ UnpackedTarball/libwpd/src/lib/WPXTableList \
UnpackedTarball/libwpd/src/lib/libwpd_internal \
UnpackedTarball/libwpd/src/lib/libwpd_math \
))
diff --git a/external/libwpd/include.patch b/external/libwpd/include.patch
index ca68e8bdb22a..57f52b4b0aa5 100644
--- a/external/libwpd/include.patch
+++ b/external/libwpd/include.patch
@@ -1,10 +1,10 @@
--- src/lib/WPXTable.h
+++ src/lib/WPXTable.h
@@ -36,6 +36,7 @@
-
#ifndef _WPXTABLE_H
#define _WPXTABLE_H
+
+#include
#include
- #include
+ struct WPXTableCell
diff --git a/external/libwpd/libwpd-bundled-soname.patch.0
b/external/libwpd/libwpd-bundled-soname.patch.0
index 04661f2d464b..2a669748f21d 100644
--- a/external/libwpd/libwpd-bundled-soname.patch.0
+++ b/external/libwpd/libwpd-bundled-soname.patch.0
@@ -1,7 +1,6 @@
--- src/lib/Makefile.in.orig 2015-08-06 21:41:41.073622494 +0200
+++ src/lib/Makefile.in2015-08-06 21:42:09.377622009 +0200
-@@ -429,7 +429,7 @@
- AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS)
-DLIBWPD_BUILD=1
+@@ -429,6 +429,6 @@
libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS)
@LIBWPD_WIN32_RESOURCE@
libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_DEPENDENCIES =
@LIBWPD_WIN32_RESOURCE@
-libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info)
-export-dynamic $(no_undefined)
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index bc911dbf91db..77765e353346 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -340,10 +340,10 @@
"dest-filename": "external/tarballs/libvisio-0.1.7.tar.xz"
},
{
-"url":
"https://dev-www.libreoffice.org/src/libwpd-0.10.2.tar.xz;,
-"sha256":
"323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610",
+"url":
"https://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz;,
+"sha256":
"2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09",
"type": "file",
-"dest-filenam
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - download.lst external/libvisio solenv/flatpak-manifest.in
download.lst |4 +-
external/libvisio/0001-fix-debug-build.patch.1 | 40 -
external/libvisio/UnpackedTarball_libvisio.mk |1
external/libvisio/ubsan.patch |4 +-
solenv/flatpak-manifest.in |6 +--
5 files changed, 7 insertions(+), 48 deletions(-)
New commits:
commit a3858ab58111a2b489f122652755e034ca427822
Author: David Tardon
AuthorDate: Sat Aug 17 17:06:07 2019 +0200
Commit: Michael Stahl
CommitDate: Fri Nov 12 10:30:07 2021 +0100
upload libvisio 0.1.7
Reviewed-on: https://gerrit.libreoffice.org/77640
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit d83472ab6fde650772307f7f93a0a4b96e7ea6a8)
Change-Id: I4eb115c7c085b325370e9cd8f80e1b03f16f5033
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125063
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/download.lst b/download.lst
index 9303f0b830de..a377b09e3d4c 100644
--- a/download.lst
+++ b/download.lst
@@ -236,8 +236,8 @@ export TWAIN_DSM_SHA256SUM :=
82c818be771f242388457aa8c807e4b52aa84dc22b21c6c561
export TWAIN_DSM_TARBALL := twaindsm_2.4.1.orig.tar.gz
export UCPP_SHA256SUM :=
983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-export VISIO_SHA256SUM :=
fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9
-export VISIO_TARBALL := libvisio-0.1.6.tar.xz
+export VISIO_SHA256SUM :=
8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c
+export VISIO_TARBALL := libvisio-0.1.7.tar.xz
export WPD_SHA256SUM :=
323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610
export WPD_VERSION_MICRO := 2
export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
diff --git a/external/libvisio/0001-fix-debug-build.patch.1
b/external/libvisio/0001-fix-debug-build.patch.1
deleted file mode 100644
index 4146e6e8bfe7..
--- a/external/libvisio/0001-fix-debug-build.patch.1
+++ /dev/null
@@ -1,40 +0,0 @@
-From 15f3774513d0181ad90da382297c175cc3424462 Mon Sep 17 00:00:00 2001
-From: David Tardon
-Date: Sun, 22 Oct 2017 21:24:43 +0200
-Subject: [PATCH] fix debug build
-
-Change-Id: I860b6034e5d833900652aec8c3647eeae185e538
- src/lib/VDXParser.cpp | 2 +-
- src/lib/VSDXParser.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp
-index f2f3154..0f07efd 100644
a/src/lib/VDXParser.cpp
-+++ b/src/lib/VDXParser.cpp
-@@ -916,7 +916,7 @@ xmlChar
*libvisio::VDXParser::readStringData(xmlTextReaderPtr reader)
- ret = xmlTextReaderRead(reader);
- if (1 == ret && stringValue)
- {
-- VSD_DEBUG_MSG(("VDXParser::readStringData stringValue %s\n", (const
char *)stringValue));
-+ VSD_DEBUG_MSG(("VDXParser::readStringData stringValue %s\n", (const
char *)stringValue.get()));
- return stringValue.release();
- }
- }
-diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp
-index 488be3a..efd46b9 100644
a/src/lib/VSDXParser.cpp
-+++ b/src/lib/VSDXParser.cpp
-@@ -555,7 +555,7 @@ xmlChar
*libvisio::VSDXParser::readStringData(xmlTextReaderPtr reader)
- std::unique_ptr
stringValue(xmlTextReaderGetAttribute(reader, BAD_CAST("V")), xmlFree);
- if (stringValue)
- {
--VSD_DEBUG_MSG(("VSDXParser::readStringData stringValue %s\n", (const char
*)stringValue));
-+VSD_DEBUG_MSG(("VSDXParser::readStringData stringValue %s\n", (const char
*)stringValue.get()));
- return stringValue.release();
- }
- return nullptr;
---
-2.14.1
-
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk
b/external/libvisio/UnpackedTarball_libvisio.mk
index 1ab8b392c4e8..eba43f3b7a6e 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -17,7 +17,6 @@ $(eval $(call
gb_UnpackedTarball_update_autoconf_configs,libvisio))
$(eval $(call gb_UnpackedTarball_add_patches,libvisio, \
external/libvisio/ubsan.patch \
-external/libvisio/0001-fix-debug-build.patch.1 \
))
ifeq ($(COM_IS_CLANG),TRUE)
diff --git a/external/libvisio/ubsan.patch b/external/libvisio/ubsan.patch
index 7bba63fda7a1..c9ffbd98f4b6 100644
--- a/external/libvisio/ubsan.patch
+++ b/external/libvisio/ubsan.patch
@@ -4,8 +4,8 @@
}
if (U_SUCCESS(status) && conv)
{
-- const char *src = (const char *)[0];
-+ const char *src = (const char *)characters.data();
+- const auto *src = (const char *)[0];
++ const auto *src = (const char *)characters.data();
const char *srcLimit = (const char *)src + characters.size();
while (src < srcLimit)
{
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 847f28d3d2fd..bc911dbf91db 100644
--- a/solenv/fl
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - download.lst solenv/flatpak-manifest.in
download.lst |4 ++--
solenv/flatpak-manifest.in |6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 5f29aea808517e24056fedcebb344d32941f2d16
Author: David Tardon
AuthorDate: Sat Dec 29 20:23:26 2018 +0100
Commit: Michael Stahl
CommitDate: Thu Nov 11 17:56:32 2021 +0100
upload libqxp 0.0.2
Reviewed-on: https://gerrit.libreoffice.org/65725
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit 6aaed7c5165ea87c3a263fd9582c97892345120f)
Change-Id: Idda6c0ce0c087a3be2e7fe31999a7d5a6fde4835
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125062
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/download.lst b/download.lst
index de0c5e16ee16..9303f0b830de 100644
--- a/download.lst
+++ b/download.lst
@@ -212,8 +212,8 @@ export POSTGRESQL_SHA256SUM :=
12345c83b89aa29808568977f5200d6da00f88a035517f925
export POSTGRESQL_TARBALL := postgresql-13.1.tar.bz2
export PYTHON_SHA256SUM :=
c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049
export PYTHON_TARBALL := Python-3.5.9.tar.xz
-export QXP_SHA256SUM :=
8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73
-export QXP_TARBALL := libqxp-0.0.1.tar.xz
+export QXP_SHA256SUM :=
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
+export QXP_TARBALL := libqxp-0.0.2.tar.xz
export RAPTOR_SHA256SUM :=
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
export RAPTOR_TARBALL := a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
export RASQAL_SHA256SUM :=
6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 1d41d12523e2..847f28d3d2fd 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -449,10 +449,10 @@
"dest-filename":
"external/tarballs/libepubgen-0.1.1.tar.xz"
},
{
-"url":
"https://dev-www.libreoffice.org/src/libqxp-0.0.1.tar.xz;,
-"sha256":
"8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73",
+"url":
"https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz;,
+"sha256":
"e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c",
"type": "file",
-"dest-filename": "external/tarballs/libqxp-0.0.1.tar.xz"
+"dest-filename": "external/tarballs/libqxp-0.0.2.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/alef-1.001.tar.gz;,
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - download.lst external/libodfgen solenv/flatpak-manifest.in
download.lst
|6 -
external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
| 58 --
external/libodfgen/ExternalProject_libodfgen.mk
|4
external/libodfgen/Library_odfgen.mk
|3
external/libodfgen/UnpackedTarball_libodfgen.mk
|4
external/libodfgen/libodfgen-bundled-soname.patch.0
|5
solenv/flatpak-manifest.in
|6 -
7 files changed, 13 insertions(+), 73 deletions(-)
New commits:
commit 6db70032300c58ce510342852eb9b8013ace4565
Author: David Tardon
AuthorDate: Sun Jan 17 16:27:55 2021 +0100
Commit: Michael Stahl
CommitDate: Tue Nov 9 11:34:26 2021 +0100
upload libodfgen 0.1.8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109840
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit f341a9da2eb63ea40ccc5a17d7c9dc557682469f)
Change-Id: Ibc59469b74d54a2b307ea708ea5c4a752532f0b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124882
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/download.lst b/download.lst
index 0dcb91c97f77..70e9db0f6772 100644
--- a/download.lst
+++ b/download.lst
@@ -183,9 +183,9 @@ export NEON_SHA256SUM :=
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d
export NEON_TARBALL := neon-0.30.2.tar.gz
export NSS_SHA256SUM :=
ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45
export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz
-export ODFGEN_SHA256SUM :=
2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
-export ODFGEN_VERSION_MICRO := 6
-export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
+export ODFGEN_SHA256SUM :=
55200027fd46623b9b38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625
+export ODFGEN_VERSION_MICRO := 8
+export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.xz
export ODFVALIDATOR_SHA256SUM :=
702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769
export ODFVALIDATOR_JAR :=
odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar
export OFFICEOTRON_SHA256SUM :=
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
diff --git
a/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
b/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
deleted file mode 100644
index 1fc4e6b9d261..
---
a/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
+++ /dev/null
@@ -1,58 +0,0 @@
-From 68e0c8e4c834df57bc9a0e8da72151f69ff5e7a6 Mon Sep 17 00:00:00 2001
-From: David Tardon
-Date: Fri, 12 Aug 2016 12:50:39 +0200
-Subject: [PATCH] tdf#101077 make double->string conversion locale-agnostic
-
- src/OdsGenerator.cxx | 19 +--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/src/OdsGenerator.cxx b/src/OdsGenerator.cxx
-index 52e135e..8cb7203 100644
a/src/OdsGenerator.cxx
-+++ b/src/OdsGenerator.cxx
-@@ -26,6 +26,8 @@
-
- #include
-
-+#include
-+#include
- #include
- #include
- #include
-@@ -46,6 +48,19 @@
- #include "OdcGenerator.hxx"
- #include "OdfGenerator.hxx"
-
-+namespace
-+{
-+
-+librevenge::RVNGString makePreciseStr(const double value)
-+{
-+ std::ostringstream os;
-+ os.imbue(std::locale::classic());
-+ os << std::fixed << std::setprecision(8) << value;
-+ return os.str().c_str();
-+}
-+
-+}
-+
- class OdsGeneratorPrivate : public OdfGenerator
- {
- public:
-@@ -968,10 +983,10 @@ void OdsGenerator::openSheetCell(const
librevenge::RVNGPropertyList )
- // we need the maximum precision here,
so we must avoid getStr() when possible
- librevenge::RVNGString value;
- if
(propList["librevenge:value"]->getUnit()==librevenge::RVNG_GENERIC)
-- value.sprintf("%.8f",
propList["librevenge:value"]->getDouble());
-+ value =
makePreciseStr(propList["librevenge:value"]->getDouble());
- else if
(propList["librevenge:value"]->getUnit()==librevenge::RVNG_PERCENT)
- {
-- value.sprintf("%.8f",
propList["librevenge:value"]->getDouble()*100.);
-+ value =
makePreciseStr(propList["librevenge:value"]->getDouble()*100.);
-
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - download.lst external/libodfgen solenv/flatpak-manifest.in
download.lst
|6 -
external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
| 58 --
external/libodfgen/ExternalProject_libodfgen.mk
|4
external/libodfgen/Library_odfgen.mk
|3
external/libodfgen/UnpackedTarball_libodfgen.mk
|8 -
external/libodfgen/c++11.patch
| 44 ---
external/libodfgen/libodfgen-bundled-soname.patch.0
|5
solenv/flatpak-manifest.in
|6 -
8 files changed, 13 insertions(+), 121 deletions(-)
New commits:
commit 928d07ce11d58706ca4d3bd9d1311506b12faaf3
Author: David Tardon
AuthorDate: Sun Jan 17 16:27:55 2021 +0100
Commit: Michael Stahl
CommitDate: Mon Nov 8 21:35:28 2021 +0100
upload libodfgen 0.1.8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109840
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit f341a9da2eb63ea40ccc5a17d7c9dc557682469f)
Change-Id: Ibc59469b74d54a2b307ea708ea5c4a752532f0b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124879
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/download.lst b/download.lst
index f85f8089e958..481559e229a3 100644
--- a/download.lst
+++ b/download.lst
@@ -185,9 +185,9 @@ export NEON_SHA256SUM :=
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d
export NEON_TARBALL := neon-0.30.2.tar.gz
export NSS_SHA256SUM :=
ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45
export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz
-export ODFGEN_SHA256SUM :=
2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
-export ODFGEN_VERSION_MICRO := 6
-export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
+export ODFGEN_SHA256SUM :=
55200027fd46623b9b38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625
+export ODFGEN_VERSION_MICRO := 8
+export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.xz
export ODFVALIDATOR_SHA256SUM :=
984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504
export ODFVALIDATOR_JAR :=
odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
export OFFICEOTRON_SHA256SUM :=
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
diff --git
a/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
b/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
deleted file mode 100644
index 1fc4e6b9d261..
---
a/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
+++ /dev/null
@@ -1,58 +0,0 @@
-From 68e0c8e4c834df57bc9a0e8da72151f69ff5e7a6 Mon Sep 17 00:00:00 2001
-From: David Tardon
-Date: Fri, 12 Aug 2016 12:50:39 +0200
-Subject: [PATCH] tdf#101077 make double->string conversion locale-agnostic
-
- src/OdsGenerator.cxx | 19 +--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/src/OdsGenerator.cxx b/src/OdsGenerator.cxx
-index 52e135e..8cb7203 100644
a/src/OdsGenerator.cxx
-+++ b/src/OdsGenerator.cxx
-@@ -26,6 +26,8 @@
-
- #include
-
-+#include
-+#include
- #include
- #include
- #include
-@@ -46,6 +48,19 @@
- #include "OdcGenerator.hxx"
- #include "OdfGenerator.hxx"
-
-+namespace
-+{
-+
-+librevenge::RVNGString makePreciseStr(const double value)
-+{
-+ std::ostringstream os;
-+ os.imbue(std::locale::classic());
-+ os << std::fixed << std::setprecision(8) << value;
-+ return os.str().c_str();
-+}
-+
-+}
-+
- class OdsGeneratorPrivate : public OdfGenerator
- {
- public:
-@@ -968,10 +983,10 @@ void OdsGenerator::openSheetCell(const
librevenge::RVNGPropertyList )
- // we need the maximum precision here,
so we must avoid getStr() when possible
- librevenge::RVNGString value;
- if
(propList["librevenge:value"]->getUnit()==librevenge::RVNG_GENERIC)
-- value.sprintf("%.8f",
propList["librevenge:value"]->getDouble());
-+ value =
makePreciseStr(propList["librevenge:value"]->getDouble());
- else if
(propList["librevenge:value"]->getUnit()==librevenge::RVNG_PERCENT)
- {
-- value.sprintf("%.8f",
propList["librevenge:value"]->getDouble(
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - configure.ac download.lst external/libmwaw solenv/flatpak-manifest.in
configure.ac |2 +-
download.lst |4 ++--
external/libmwaw/Library_mwaw.mk |4
solenv/flatpak-manifest.in |6 +++---
4 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 71c36bcb7fb64c4b0d542444f63ef174884a075b
Author: David Tardon
AuthorDate: Sat Apr 18 13:54:18 2020 +0200
Commit: Michael Stahl
CommitDate: Mon Nov 8 20:18:48 2021 +0100
upload libmwaw 0.3.16
Change-Id: Idc7ed6bbcd3298138fb92c81ddf7dd6278d201dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92472
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit 56c638c0ebb21711b02d1ff235a3ffd3f232)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124875
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/configure.ac b/configure.ac
index 31f1868e47d9..a5ff058240e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7908,7 +7908,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.15])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.16])
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 c0cf41682685..0dcb91c97f77 100644
--- a/download.lst
+++ b/download.lst
@@ -172,8 +172,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 :=
0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1
-export MWAW_VERSION_MICRO := 15
+export MWAW_SHA256SUM :=
0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868
+export MWAW_VERSION_MICRO := 16
export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
export MYSQL_CONNECTOR_CPP_SHA256SUM :=
a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
export MYSQL_CONNECTOR_CPP_TARBALL :=
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 4c9a8b43c56f..2e7d1e2246fa 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -119,6 +119,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetDecoder \
UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetEncoder \
UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetListener \
+ UnpackedTarball/libmwaw/src/lib/MWAWStream \
UnpackedTarball/libmwaw/src/lib/MWAWStringStream \
UnpackedTarball/libmwaw/src/lib/MWAWSubDocument \
UnpackedTarball/libmwaw/src/lib/MWAWTable \
@@ -172,10 +173,13 @@ $(eval $(call
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/PowerPoint7Text \
UnpackedTarball/libmwaw/src/lib/RagTime5Chart \
UnpackedTarball/libmwaw/src/lib/RagTime5ClusterManager \
+ UnpackedTarball/libmwaw/src/lib/RagTime5Document \
+ UnpackedTarball/libmwaw/src/lib/RagTime5Formula \
UnpackedTarball/libmwaw/src/lib/RagTime5Graph \
UnpackedTarball/libmwaw/src/lib/RagTime5Layout \
UnpackedTarball/libmwaw/src/lib/RagTime5Parser \
UnpackedTarball/libmwaw/src/lib/RagTime5Pipeline \
+ UnpackedTarball/libmwaw/src/lib/RagTime5SSParser \
UnpackedTarball/libmwaw/src/lib/RagTime5Spreadsheet \
UnpackedTarball/libmwaw/src/lib/RagTime5StructManager \
UnpackedTarball/libmwaw/src/lib/RagTime5StyleManager \
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index e0bc79e80a38..fca238659291 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -297,10 +297,10 @@
"dest-filename": "external/tarballs/libmspub-0.1.4.tar.xz"
},
{
-"url":
"https://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz;,
-"sha256":
"0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1",
+"url":
"https://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz;,
+"sha256":
"0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868",
"type": "file",
-"dest-filename": "external/tarballs/libmwaw-0.3.15.tar.xz"
+"dest-filename": "external/tarballs/libmwaw-0.3.16.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2;,
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - configure.ac download.lst external/libmwaw solenv/flatpak-manifest.in writerperfect/qa
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 4a9013dacf084b6f6cc147956de7bd620840e4d8
Author: David Tardon
AuthorDate: Thu Apr 18 20:04:51 2019 +0200
Commit: Michael Stahl
CommitDate: Mon Nov 8 19:13:13 2021 +0100
upload libmwaw 0.3.15
Change-Id: I496204ead6c495c4fee2cee18a5b9d0fd22eb8c0
Reviewed-on: https://gerrit.libreoffice.org/70951
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit d077b19a3f617f5ef3d65fc20a136a9107c47199)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124874
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/configure.ac b/configure.ac
index da7e24c30b47..31f1868e47d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7908,7 +7908,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 64c45aaadbd0..c0cf41682685 100644
--- a/download.lst
+++ b/download.lst
@@ -172,8 +172,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 MYSQL_CONNECTOR_CPP_SHA256SUM :=
a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
export MYSQL_CONNECTOR_CPP_TARBALL :=
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.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..
--- 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
-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 )
- 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 0b28836cdb80..4c9a8b43c56f 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -58,6 +58,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/UnpackedTarbal
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - configure.ac download.lst external/libmwaw solenv/flatpak-manifest.in
configure.ac |2 +-
download.lst |4 ++--
external/libmwaw/Library_mwaw.mk |4
solenv/flatpak-manifest.in |6 +++---
4 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit fde5f09c1eb4b69d7756c2ebfa65a4dbb9610996
Author: David Tardon
AuthorDate: Sat Apr 18 13:54:18 2020 +0200
Commit: Michael Stahl
CommitDate: Mon Nov 8 19:12:01 2021 +0100
upload libmwaw 0.3.16
Change-Id: Idc7ed6bbcd3298138fb92c81ddf7dd6278d201dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92472
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit 56c638c0ebb21711b02d1ff235a3ffd3f232)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124873
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/configure.ac b/configure.ac
index a8056fdeaa6f..91f129ef76a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8390,7 +8390,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.15])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.16])
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 25c5083ec2f1..f85f8089e958 100644
--- a/download.lst
+++ b/download.lst
@@ -176,8 +176,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 :=
0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1
-export MWAW_VERSION_MICRO := 15
+export MWAW_SHA256SUM :=
0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868
+export MWAW_VERSION_MICRO := 16
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/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index fc874fcb5e45..880a70861e24 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -120,6 +120,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetDecoder \
UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetEncoder \
UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetListener \
+ UnpackedTarball/libmwaw/src/lib/MWAWStream \
UnpackedTarball/libmwaw/src/lib/MWAWStringStream \
UnpackedTarball/libmwaw/src/lib/MWAWSubDocument \
UnpackedTarball/libmwaw/src/lib/MWAWTable \
@@ -173,10 +174,13 @@ $(eval $(call
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/PowerPoint7Text \
UnpackedTarball/libmwaw/src/lib/RagTime5Chart \
UnpackedTarball/libmwaw/src/lib/RagTime5ClusterManager \
+ UnpackedTarball/libmwaw/src/lib/RagTime5Document \
+ UnpackedTarball/libmwaw/src/lib/RagTime5Formula \
UnpackedTarball/libmwaw/src/lib/RagTime5Graph \
UnpackedTarball/libmwaw/src/lib/RagTime5Layout \
UnpackedTarball/libmwaw/src/lib/RagTime5Parser \
UnpackedTarball/libmwaw/src/lib/RagTime5Pipeline \
+ UnpackedTarball/libmwaw/src/lib/RagTime5SSParser \
UnpackedTarball/libmwaw/src/lib/RagTime5Spreadsheet \
UnpackedTarball/libmwaw/src/lib/RagTime5StructManager \
UnpackedTarball/libmwaw/src/lib/RagTime5StyleManager \
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index c5f7d8f4ae16..547d680a7a42 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -267,10 +267,10 @@
"dest-filename": "external/tarballs/libmspub-0.1.4.tar.xz"
},
{
-"url":
"https://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz;,
-"sha256":
"0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1",
+"url":
"https://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz;,
+"sha256":
"0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868",
"type": "file",
-"dest-filename": "external/tarballs/libmwaw-0.3.15.tar.xz"
+"dest-filename": "external/tarballs/libmwaw-0.3.16.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2;,
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - 2 commits - download.lst external/libabw external/libcdr solenv/flatpak-manifest.in
download.lst|8 ++--
external/libabw/UnpackedTarball_libabw.mk |4 --
external/libabw/libabw-msvc.patch.1 | 46
external/libcdr/UnpackedTarball_libcdr.mk |4 ++
external/libcdr/libcdr-visibility-win.patch | 11 ++
solenv/flatpak-manifest.in | 12 +++
6 files changed, 25 insertions(+), 60 deletions(-)
New commits:
commit 8268439d9ad9d167e4cc4cdbe74e39644a32b7c4
Author: David Tardon
AuthorDate: Sat Dec 29 14:53:07 2018 +0100
Commit: Thorsten Behrens
CommitDate: Sat Nov 6 00:38:58 2021 +0100
upload libcdr 0.1.5
Reviewed-on: https://gerrit.libreoffice.org/65715
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit a8965ebc1b29ba578fc3e9cd6915e85e807d9fd6)
Change-Id: I01454cc35baf96743bd19e64dd3a7269c58621bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124772
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/download.lst b/download.lst
index fcf9c059a7d2..712ea9d0ba52 100644
--- a/download.lst
+++ b/download.lst
@@ -17,8 +17,8 @@ export BZIP2_TARBALL :=
00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz
export CAIRO_SHA256SUM :=
5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
export CAIRO_VERSION_MICRO := 0
export CAIRO_TARBALL := cairo-1.16.$(CAIRO_VERSION_MICRO).tar.xz
-export CDR_SHA256SUM :=
e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d
-export CDR_TARBALL := libcdr-0.1.4.tar.xz
+export CDR_SHA256SUM :=
6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48
+export CDR_TARBALL := libcdr-0.1.5.tar.xz
export CLUCENE_SHA256SUM :=
ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
export CLUCENE_TARBALL :=
48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
export LIBCMIS_SHA256SUM :=
6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e
diff --git a/external/libcdr/UnpackedTarball_libcdr.mk
b/external/libcdr/UnpackedTarball_libcdr.mk
index 4ca54804e6aa..23874f7d01b5 100644
--- a/external/libcdr/UnpackedTarball_libcdr.mk
+++ b/external/libcdr/UnpackedTarball_libcdr.mk
@@ -15,6 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,0))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libcdr))
+$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
+external/libcdr/libcdr-visibility-win.patch \
+))
+
ifeq ($(COM_IS_CLANG),TRUE)
ifneq ($(filter -fsanitize=%,$(CC)),)
$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
diff --git a/external/libcdr/libcdr-visibility-win.patch
b/external/libcdr/libcdr-visibility-win.patch
new file mode 100644
index ..7700cfd32f2f
--- /dev/null
+++ b/external/libcdr/libcdr-visibility-win.patch
@@ -0,0 +1,11 @@
+--- configure.dt 2018-12-29 16:23:02.355271146 +0100
configure 2018-12-29 16:23:21.644060142 +0100
+@@ -19116,6 +19116,8 @@
+
+
+ if test $platform_win32 = yes; then :
++ HAVE_VISIBILITY_TRUE='#'
++ HAVE_VISIBILITY_FALSE=
+
+ else
+
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 7233a24bdaa8..7db6021ece3c 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -243,10 +243,10 @@
"dest-filename": "external/tarballs/libabw-0.1.3.tar.xz"
},
{
-"url":
"https://dev-www.libreoffice.org/src/libcdr-0.1.4.tar.xz;,
-"sha256":
"e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d",
+"url":
"https://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz;,
+"sha256":
"6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48",
"type": "file",
-"dest-filename": "external/tarballs/libcdr-0.1.4.tar.xz"
+"dest-filename": "external/tarballs/libcdr-0.1.5.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz;,
commit 6cf9a05b42fb59fa5ebb06d792d7e733790bdb5d
Author: David Tardon
AuthorDate: Sat Aug 17 16:46:47 2019 +0200
Commit: Thorsten Behrens
CommitDate: Sat Nov 6 00:38:49 2021 +0100
upload libabw 0.1.3
Reviewed-on: https://gerrit.libreoffice.org/77639
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit 2a733f30cc994ead8cc3d1e64947bba6e8fe3924)
Change-Id: Ibb45a473f49a9ba8f9cf53593dead375ac8a1951
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124771
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/download.lst b/download.lst
index b4f7df8d263c..fcf9c059a7d2 100644
--- a/download.lst
+++ b/download.lst
@@ -1,
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-0' - 12 commits - download.lst external/lcms2 external/libxml2 external/mdnsresponder external/poppler external/python3 postprocess/CustomTar
download.lst | 20 - external/lcms2/0001-Added-an-extra-check-to-MLU-bounds.patch.1 | 25 - external/lcms2/0017-Upgrade-Visual-studio-2017-15.8.patch.1 | 172 ++ external/lcms2/UnpackedTarball_lcms2.mk |2 external/libxml2/libxml2-android.patch | 12 external/libxml2/libxml2-global-symbols.patch |4 external/mdnsresponder/UnpackedTarball_mDNSResponder.mk |5 external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1 | 85 external/mdnsresponder/mDNSResponder_Win32_buildfix.patch.1 | 16 external/poppler/StaticLibrary_poppler.mk |6 external/poppler/UnpackedTarball_poppler.mk | 11 external/poppler/poppler-c++11.patch.1 | 31 + external/poppler/poppler-config.patch.1 | 12 external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1 | 59 +++ external/python3/UnpackedTarball_python3.mk |1 postprocess/CustomTarget_signing.mk |2 postprocess/signing/signing.pl |3 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 38 +- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 49 +- sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx |6 sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx |4 solenv/bin/modules/installer.pm |2 solenv/bin/modules/installer/windows/msp.pm |2 23 files changed, 362 insertions(+), 205 deletions(-) New commits: commit 47e55ccd60c6701571dd71891fb092e1c537f89a Author: David Tardon AuthorDate: Thu Mar 29 09:20:19 2018 +0200 Commit: Andras Timar CommitDate: Sat Oct 9 23:40:56 2021 +0200 upload openssl 1.0.2o Change-Id: Ib44570ff53d754d1d568378ef0dac4d4789f2042 Reviewed-on: https://gerrit.libreoffice.org/52051 Tested-by: Jenkins Reviewed-by: David Tardon diff --git a/download.lst b/download.lst index e826a49d6647..2a6a43bac53f 100644 --- a/download.lst +++ b/download.lst @@ -188,8 +188,8 @@ export OFFICEOTRON_SHA256SUM := f2443f27561af52324eee03a1892d9f569adc8db9e7bca55 export OFFICEOTRON_JAR := 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar export OPENLDAP_SHA256SUM := cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824 export OPENLDAP_TARBALL := openldap-2.4.45.tgz -export OPENSSL_SHA256SUM := 8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f -export OPENSSL_TARBALL := openssl-1.0.2m.tar.gz +export OPENSSL_SHA256SUM := ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d +export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz export ORCUS_SHA256SUM := 62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9 export ORCUS_TARBALL := liborcus-0.13.3.tar.gz export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb commit a3a6de809afb4ea2c58b0d8f05819612f421032a Author: Michael Stahl AuthorDate: Wed Feb 20 15:23:11 2019 +0100 Commit: Andras Timar CommitDate: Sat Oct 9 23:39:33 2021 +0200 mDNSResponder: upgrade to release 878.200.35 Apple can't afford the costly GPG licenses to sign releases apparently, but the sha256 matches some OpenWRT and FreshPorts repos... Fixes CVE-2015-7988. Removing windows build patches, fixed upstream (except for the last hunk of the SOCKET patch, but that is in code that is only used on MacOSX). Reviewed-on: https://gerrit.libreoffice.org/68092 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 3a85c2db176db708c0ff9401c40858eb60e80f1e) Reviewed-on: https://gerrit.libreoffice.org/68139 Reviewed-by: Thorsten Behrens Change-Id: I9fdba5929badb75f995c66da0850d188780e7beb diff --git a/download.lst b/download.lst index d8c899a69cc5..e826a49d6647 100644 --- a/download.lst +++ b/download.lst @@ -164,8 +164,8 @@ export MARIADB_CONNECTOR_C_SHA256SUM := fd2f751dea049c1907735eb236aeace1d811d6a8 export MARIADB_CONNECTOR_C_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz export MDDS_SHA256SUM := dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1 export MDDS_TARBALL := mdds-1.3.1.tar.bz2 -export
[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw solenv/flatpak-manifest.in writerperfect/qa
configure.ac|2 +-
download.lst|4 ++--
external/libmwaw/Library_mwaw.mk|2 ++
solenv/flatpak-manifest.in |6
+++---
writerperfect/qa/unit/WpftWriterFilterTest.cxx |2 ++
writerperfect/qa/unit/data/writer/libmwaw/pass/StudentWritingCenter |binary
writerperfect/qa/unit/data/writer/libmwaw/pass/WordMaker|binary
7 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 65d717368cb3ada843421700aadc00a1b71598c5
Author: David Tardon
AuthorDate: Tue Aug 17 20:13:50 2021 +0200
Commit: David Tardon
CommitDate: Tue Aug 24 07:10:00 2021 +0200
upload libmwaw 0.3.20
Change-Id: Ia73117e06f843bcdd228da018fe3f34af6405653
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120621
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/configure.ac b/configure.ac
index ac226fd46ace..6be3e031c348 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9335,7 +9335,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.19])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.20])
libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10])
diff --git a/download.lst b/download.lst
index cfeb4bd27fed..8c3f9a41fd1f 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 :=
b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af
-export MWAW_VERSION_MICRO := 19
+export MWAW_SHA256SUM :=
14c38b06214f277ccd1450e22e6e32648955018d7695896bc560165748c8cd21
+export MWAW_VERSION_MICRO := 20
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/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 6fdcded16190..2f27a6113485 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -201,11 +201,13 @@ $(eval $(call
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/RagTimeSpreadsheet \
UnpackedTarball/libmwaw/src/lib/RagTimeStruct \
UnpackedTarball/libmwaw/src/lib/RagTimeText \
+ UnpackedTarball/libmwaw/src/lib/StudentWritingCParser \
UnpackedTarball/libmwaw/src/lib/StyleParser \
UnpackedTarball/libmwaw/src/lib/SuperPaintParser \
UnpackedTarball/libmwaw/src/lib/TeachTxtParser \
UnpackedTarball/libmwaw/src/lib/WingzGraph \
UnpackedTarball/libmwaw/src/lib/WingzParser \
+ UnpackedTarball/libmwaw/src/lib/WordMakerParser \
UnpackedTarball/libmwaw/src/lib/WriteNowEntry \
UnpackedTarball/libmwaw/src/lib/WriteNowParser \
UnpackedTarball/libmwaw/src/lib/WriteNowText \
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index dd2fe0e7c0f6..6f623a7ce3c5 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -306,11 +306,11 @@
"dest-filename": "libmspub-0.1.4.tar.xz"
},
{
-"url":
"https://dev-www.libreoffice.org/src/libmwaw-0.3.19.tar.xz;,
-"sha256":
"b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af",
+"url":
"https://dev-www.libreoffice.org/src/libmwaw-0.3.20.tar.xz;,
+"sha256":
"14c38b06214f277ccd1450e22e6e32648955018d7695896bc560165748c8cd21",
"type": "file",
"dest": "external/tarballs",
-"dest-filename": "libmwaw-0.3.19.tar.xz"
+"dest-filename": "libmwaw-0.3.20.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/libodfgen-0.1.8.tar.xz;,
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index d0a4ae68cdcf..543146169253 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -44,6 +44,8 @@
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac download.lst external/libetonyek solenv/flatpak-manifest.in
configure.ac |2 download.lst |4 external/libetonyek/0001-add-missing-include-for-std-for_each.patch | 33 - external/libetonyek/0001-fix-build-with-MSVC.patch.1 | 28 external/libetonyek/0002-fix-build-with-MSVC.patch.1 | 55 external/libetonyek/Library_etonyek.mk |1 external/libetonyek/UnpackedTarball_libetonyek.mk |4 external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1 | 62 -- solenv/flatpak-manifest.in |6 9 files changed, 92 insertions(+), 103 deletions(-) New commits: commit eaa73b86648e2c6017ef66868c6ce2fe5302390d Author: David Tardon AuthorDate: Tue May 18 20:18:42 2021 +0200 Commit: Aron Budea CommitDate: Fri Aug 20 00:43:36 2021 +0200 upload libetonyek 0.1.10 Change-Id: Iad586802e89b19701a20bebff06b238b617af2a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115769 Tested-by: Jenkins Reviewed-by: David Tardon (cherry picked from commit 5471dc3238e8005fa146cfa0a81c5784ea018e95) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120734 Tested-by: Jenkins CollaboraOffice Reviewed-by: Aron Budea diff --git a/configure.ac b/configure.ac index 5d991218cef4..6b0e72a5d573 100644 --- a/configure.ac +++ b/configure.ac @@ -9115,7 +9115,7 @@ libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1]) libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.17]) libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1]) -libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8]) +libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10]) libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1]) diff --git a/download.lst b/download.lst index 043112285902..a2a08016976e 100644 --- a/download.lst +++ b/download.lst @@ -49,8 +49,8 @@ export EPM_SHA256SUM := b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz export EPUBGEN_SHA256SUM := 03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz -export ETONYEK_SHA256SUM := e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a -export ETONYEK_VERSION_MICRO := 9 +export ETONYEK_SHA256SUM := b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a +export ETONYEK_VERSION_MICRO := 10 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz export EXPAT_SHA256SUM := 2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40 export EXPAT_TARBALL := expat-2.4.1.tar.bz2 diff --git a/external/libetonyek/0001-add-missing-include-for-std-for_each.patch b/external/libetonyek/0001-add-missing-include-for-std-for_each.patch deleted file mode 100644 index 09aaba58b7e3.. --- a/external/libetonyek/0001-add-missing-include-for-std-for_each.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4b4d879a6db69ea05b89fdf99df8cb5d902d16b6 Mon Sep 17 00:00:00 2001 -From: Roland Illig -Date: Tue, 19 May 2020 08:43:39 +0200 -Subject: [PATCH] add missing include for std::for_each - -On NetBSD 8.0 x86_64, gcc complains: - NUM3Parser.cpp: In member function 'virtual bool libetonyek::NUM3Parser::parseDocument()': - NUM3Parser.cpp:46:3: error: 'for_each' is not a member of 'std' - std::for_each(sheetListRefs.begin(), sheetListRefs.end(), std::bind(::parseSheet, this, std::placeholders::_1)); - -Change-Id: I723ba1bcbd10ed9215ceea8c5b224fdc5242be65 -Reviewed-on: https://gerrit.libreoffice.org/c/libetonyek/+/94450 -Tested-by: Thorsten Behrens -Reviewed-by: Thorsten Behrens - src/lib/NUM3Parser.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git src/lib/NUM3Parser.cpp src/lib/NUM3Parser.cpp -index 66fb195..c19b611 100644 src/lib/NUM3Parser.cpp -+++ src/lib/NUM3Parser.cpp -@@ -7,6 +7,7 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -+#include - #include - - #include "NUM3Parser.h" --- -2.28.0 - diff --git a/external/libetonyek/0001-fix-build-with-MSVC.patch.1 b/external/libetonyek/0001-fix-build-with-MSVC.patch.1 new file mode 100644 index ..2a72844dc79a --- /dev/null +++ b/external/libetonyek/0001-fix-build-with-MSVC.patch.1 @@ -0,0 +1,28 @@ +From 1aa22c746b41a688296f4daf4fc35710d2045a33 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Wed, 19 May 2021 19:43:43 +0200 +Subject: [PATCH] fix build with MSVC + +error C2664: 'libetonyek::IWORKFormula::IWORKFormula(const boost::optional &)': cannot convert argument 1 from 'int' to 'const boost::optional &' + +Change-Id: Iaa3de2d0ef8f960495e5d5afebb75c5063955177 +--- + src/lib/IWAParse
[Libreoffice-commits] core.git: configure.ac download.lst external/libetonyek solenv/flatpak-manifest.in
configure.ac |2 download.lst |4 external/libetonyek/0001-add-missing-include-for-std-for_each.patch | 33 - external/libetonyek/0001-fix-build-with-MSVC.patch.1 | 28 external/libetonyek/0002-fix-build-with-MSVC.patch.1 | 55 external/libetonyek/Library_etonyek.mk |1 external/libetonyek/UnpackedTarball_libetonyek.mk |4 external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1 | 62 -- solenv/flatpak-manifest.in |6 9 files changed, 92 insertions(+), 103 deletions(-) New commits: commit 5471dc3238e8005fa146cfa0a81c5784ea018e95 Author: David Tardon AuthorDate: Tue May 18 20:18:42 2021 +0200 Commit: David Tardon CommitDate: Thu May 20 08:46:37 2021 +0200 upload libetonyek 0.1.10 Change-Id: Iad586802e89b19701a20bebff06b238b617af2a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115769 Tested-by: Jenkins Reviewed-by: David Tardon diff --git a/configure.ac b/configure.ac index 3d14c5e4258c..faa4d810e8da 100644 --- a/configure.ac +++ b/configure.ac @@ -9237,7 +9237,7 @@ libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1]) 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]) +libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10]) libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1]) diff --git a/download.lst b/download.lst index e43c9cfe86e8..0da12b5b88cf 100644 --- a/download.lst +++ b/download.lst @@ -47,8 +47,8 @@ export EPM_SHA256SUM := b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz export EPUBGEN_SHA256SUM := 03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz -export ETONYEK_SHA256SUM := e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a -export ETONYEK_VERSION_MICRO := 9 +export ETONYEK_SHA256SUM := b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a +export ETONYEK_VERSION_MICRO := 10 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz export EXPAT_SHA256SUM := 9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102 export EXPAT_TARBALL := expat-2.2.8.tar.bz2 diff --git a/external/libetonyek/0001-add-missing-include-for-std-for_each.patch b/external/libetonyek/0001-add-missing-include-for-std-for_each.patch deleted file mode 100644 index 09aaba58b7e3.. --- a/external/libetonyek/0001-add-missing-include-for-std-for_each.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4b4d879a6db69ea05b89fdf99df8cb5d902d16b6 Mon Sep 17 00:00:00 2001 -From: Roland Illig -Date: Tue, 19 May 2020 08:43:39 +0200 -Subject: [PATCH] add missing include for std::for_each - -On NetBSD 8.0 x86_64, gcc complains: - NUM3Parser.cpp: In member function 'virtual bool libetonyek::NUM3Parser::parseDocument()': - NUM3Parser.cpp:46:3: error: 'for_each' is not a member of 'std' - std::for_each(sheetListRefs.begin(), sheetListRefs.end(), std::bind(::parseSheet, this, std::placeholders::_1)); - -Change-Id: I723ba1bcbd10ed9215ceea8c5b224fdc5242be65 -Reviewed-on: https://gerrit.libreoffice.org/c/libetonyek/+/94450 -Tested-by: Thorsten Behrens -Reviewed-by: Thorsten Behrens - src/lib/NUM3Parser.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git src/lib/NUM3Parser.cpp src/lib/NUM3Parser.cpp -index 66fb195..c19b611 100644 src/lib/NUM3Parser.cpp -+++ src/lib/NUM3Parser.cpp -@@ -7,6 +7,7 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -+#include - #include - - #include "NUM3Parser.h" --- -2.28.0 - diff --git a/external/libetonyek/0001-fix-build-with-MSVC.patch.1 b/external/libetonyek/0001-fix-build-with-MSVC.patch.1 new file mode 100644 index ..2a72844dc79a --- /dev/null +++ b/external/libetonyek/0001-fix-build-with-MSVC.patch.1 @@ -0,0 +1,28 @@ +From 1aa22c746b41a688296f4daf4fc35710d2045a33 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Wed, 19 May 2021 19:43:43 +0200 +Subject: [PATCH] fix build with MSVC + +error C2664: 'libetonyek::IWORKFormula::IWORKFormula(const boost::optional &)': cannot convert argument 1 from 'int' to 'const boost::optional &' + +Change-Id: Iaa3de2d0ef8f960495e5d5afebb75c5063955177 +--- + src/lib/IWAParser.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/IWAParser.cpp b/src/lib/IWAParser.cpp +index 7fd95c3..a2bd292 100644 +--- a/src/lib/IWAParser.cpp b/src/lib/IWAP
[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw solenv/flatpak-manifest.in
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
AuthorDate: Mon May 10 19:16:20 2021 +0200
Commit: David Tardon
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
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..
--- a/external/libmwaw/0001-drop-unneeded-include.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-From db0450c5bacdf0f3970a8838ff989b7e5390 Mon Sep 17 00:00:00 2001
-From: David Tardon
-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
--
- #include
- #include
- #include
---
-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.lib
[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw solenv/flatpak-manifest.in
configure.ac|2 -
download.lst|4 +--
external/libmwaw/0001-drop-unneeded-include.patch.1 | 25
external/libmwaw/Library_mwaw.mk|4 +++
external/libmwaw/UnpackedTarball_libmwaw.mk |4 +++
solenv/flatpak-manifest.in |6 ++--
6 files changed, 39 insertions(+), 6 deletions(-)
New commits:
commit 5e27230f45c7ecf32a98076302179d96f4f65219
Author: David Tardon
AuthorDate: Thu Apr 8 20:32:19 2021 +0200
Commit: David Tardon
CommitDate: Fri Apr 9 07:58:09 2021 +0200
upload libmwaw 0.3.18
Change-Id: I6ffa01f092455f79bb3690875e1b286ae2298832
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113819
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/configure.ac b/configure.ac
index 3df488a662c2..3a03dd38290f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9116,7 +9116,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.17])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.18])
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 3c3462552d74..45fdc3a0e5ff 100644
--- a/download.lst
+++ b/download.lst
@@ -186,8 +186,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 :=
8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c
-export MWAW_VERSION_MICRO := 17
+export MWAW_SHA256SUM :=
fc5d051680f8000be64ffebc0b0c58716b1c9bf06003ec399387b109d1ed1e0f
+export MWAW_VERSION_MICRO := 18
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
new file mode 100644
index ..505f38daf80a
--- /dev/null
+++ b/external/libmwaw/0001-drop-unneeded-include.patch.1
@@ -0,0 +1,25 @@
+From db0450c5bacdf0f3970a8838ff989b7e5390 Mon Sep 17 00:00:00 2001
+From: David Tardon
+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
+-
+ #include
+ #include
+ #include
+--
+2.30.2
+
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index bb1a880fd9ce..d92a1b729b81 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -41,6 +41,10 @@ $(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/Canvas5Graph \
+ UnpackedTarball/libmwaw/src/lib/Canvas5Parser \
+ UnpackedTarball/libmwaw/src/lib/Canvas5Structure \
+ UnpackedTarball/libmwaw/src/lib/Canvas5StyleManager \
UnpackedTarball/libmwaw/src/lib/CanvasGraph \
UnpackedTarball/libmwaw/src/lib/CanvasParser \
UnpackedTarball/libmwaw/src/lib/CanvasStyleManager \
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 935cbc1eb1c3..e15768e91623 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -15,6 +15,10 @@ $(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 152c3775828f..7904d7fe15ad 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"
},
{
-
[Libreoffice-commits] core.git: download.lst external/libcdr solenv/flatpak-manifest.in
download.lst |4 ++--
external/libcdr/UnpackedTarball_libcdr.mk |1 -
external/libcdr/libcdr-no-icu-boolean.patch.1 | 12
solenv/flatpak-manifest.in|6 +++---
4 files changed, 5 insertions(+), 18 deletions(-)
New commits:
commit 64788738db595cb642b7efd49340cae33d92698e
Author: David Tardon
AuthorDate: Tue Mar 30 17:36:05 2021 +0200
Commit: David Tardon
CommitDate: Tue Mar 30 19:46:50 2021 +0200
upload libcdr 0.1.7
Change-Id: Ie01fdee7379c398fe7df7c140e2f0059bea71abe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113380
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/download.lst b/download.lst
index fcb5e165473c..adf73ca23d30 100644
--- a/download.lst
+++ b/download.lst
@@ -25,8 +25,8 @@ export BZIP2_TARBALL :=
00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz
export CAIRO_SHA256SUM :=
5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
export CAIRO_VERSION_MICRO := 0
export CAIRO_TARBALL := cairo-1.16.$(CAIRO_VERSION_MICRO).tar.xz
-export CDR_SHA256SUM :=
01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861
-export CDR_TARBALL := libcdr-0.1.6.tar.xz
+export CDR_SHA256SUM :=
5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4
+export CDR_TARBALL := libcdr-0.1.7.tar.xz
export CLUCENE_SHA256SUM :=
ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
export CLUCENE_TARBALL :=
48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
export DTOA_SHA256SUM :=
0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
diff --git a/external/libcdr/UnpackedTarball_libcdr.mk
b/external/libcdr/UnpackedTarball_libcdr.mk
index d8742f3c5f5a..f0e80f06f05f 100644
--- a/external/libcdr/UnpackedTarball_libcdr.mk
+++ b/external/libcdr/UnpackedTarball_libcdr.mk
@@ -17,7 +17,6 @@ $(eval $(call
gb_UnpackedTarball_update_autoconf_configs,libcdr))
$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
external/libcdr/libcdr-visibility-win.patch \
-external/libcdr/libcdr-no-icu-boolean.patch.1 \
external/libcdr/ax_gcc_func_attribute.m4.patch \
))
diff --git a/external/libcdr/libcdr-no-icu-boolean.patch.1
b/external/libcdr/libcdr-no-icu-boolean.patch.1
deleted file mode 100644
index 65884fbbf873..
--- a/external/libcdr/libcdr-no-icu-boolean.patch.1
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur libcdr.org/src/lib/libcdr_utils.cpp libcdr/src/lib/libcdr_utils.cpp
libcdr.org/src/lib/libcdr_utils.cpp2020-02-02 16:30:44.0
+0100
-+++ libcdr/src/lib/libcdr_utils.cpp2020-11-16 21:08:04.092927628 +0100
-@@ -108,7 +108,7 @@
- csd = ucsdet_open();
- if (U_FAILURE(status) || !csd)
- return 0;
--ucsdet_enableInputFilter(csd, TRUE);
-+ucsdet_enableInputFilter(csd, true);
- ucsdet_setText(csd, (const char *)buffer, bufferLength, );
- if (U_FAILURE(status))
- throw libcdr::EncodingException();
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 369184ce7f0a..c86fc663388f 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -219,10 +219,10 @@
"dest-filename": "external/tarballs/libabw-0.1.3.tar.xz"
},
{
-"url":
"https://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz;,
-"sha256":
"01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861",
+"url":
"https://dev-www.libreoffice.org/src/libcdr-0.1.7.tar.xz;,
+"sha256":
"5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4",
"type": "file",
-"dest-filename": "external/tarballs/libcdr-0.1.6.tar.xz"
+"dest-filename": "external/tarballs/libcdr-0.1.7.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz;,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/README
lotuswordpro/README | 32 +++- 1 file changed, 31 insertions(+), 1 deletion(-) New commits: commit bb8fb3237c9d1b9516f5803d476c1db09570c2dc Author: David Tardon AuthorDate: Sun Feb 21 18:24:21 2021 +0100 Commit: David Tardon CommitDate: Sun Feb 21 18:26:04 2021 +0100 expand lotuswordpro README a bit Change-Id: Ibe5e5b1bef43049065915f80aae5037a782ed698 diff --git a/lotuswordpro/README b/lotuswordpro/README index 4ec710488b31..a1e3c20e0167 100644 --- a/lotuswordpro/README +++ b/lotuswordpro/README @@ -1 +1,31 @@ -Filter for file format of Lotus Word Pro. +Import filter for file format of Lotus Word Pro. + +== Description == + +The import is not direct, but via an intermediate format: StarOffice +XML, the predecessor of ODF (yes, the code is old). The entry point to +the filter is class LotusWordProImportFilter (refer to Source code +section), but that just hooks up the necessary machinery for processing +StarOffice XML produced by the filter. The real fun starts in function +ReadWordproFile() (source/filter/lwpfilter.cxx); this function +initializes the parser (class Lwp9Reader) and the SAX XML handler that +produces the output (class XFSaxStream). The Lwp9Reader class then does +the actual parsing. + +If the module is built with debug level greater than 0, it is possible +to examine the intermediate XML: set environment variable +DBG_LWPIMPORT_DIR= to an existing directory and, on opening an lwp +document, a file named lwpimport.xml will be created in that directory. + +== Source code == + +=== Module contents === +* inc: module-global headers (can be included by any file in source) +* qa: cppunit tests +* source: the filter itself +* util: UNO passive registration config + +=== Source contents === +* filter: lwp document format parser +* filter/LotusWordProImportFilter.cxx: the entry point to the filter +* filter/xfilter: export to StarOffice XML ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 131
1 file changed, 131 insertions(+)
New commits:
commit 301b09f0c4fef6fca52fa0b28827a6576b39
Author: David Tardon
AuthorDate: Sat Feb 13 15:51:20 2021 +0100
Commit: David Tardon
CommitDate: Sun Feb 21 16:23:39 2021 +0100
lotuswordpro: allow to dump intermediate XML into file
If env. variable DBG_LWPIMPORT_DIR= is set to an existing directory, a
formatted representation of the intermediate XML format is dumped into a
file named lwpimport.xml in that directory. This makes debugging of
Lotus Word Pro import a lot easier.
Change-Id: I872c388c2b378d55f476973890a073ec932e1b4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111283
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index 73335e0bab88..296561bcc375 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -30,6 +30,19 @@
#include "LotusWordProImportFilter.hxx"
#include "lwpfilter.hxx"
+#if OSL_DEBUG_LEVEL > 0
+#include
+
+#include
+#include
+
+#include
+
+#include
+
+#include
+#endif
+
using namespace com::sun::star;
using com::sun::star::uno::Sequence;
using com::sun::star::uno::Any;
@@ -41,6 +54,100 @@ using com::sun::star::ucb::XCommandEnvironment;
using com::sun::star::document::XImporter;
using com::sun::star::xml::sax::XDocumentHandler;
+#if OSL_DEBUG_LEVEL > 0
+namespace
+{
+
+class DebugDocumentHandler final : public cppu::WeakImplHelper<
XDocumentHandler >
+{
+public:
+DebugDocumentHandler(const uno::Reference< XDocumentHandler >& handler,
const uno::Reference< XDocumentHandler >& debug)
+: m_handler(handler)
+, m_debug(debug)
+{
+}
+
+// XDocumentHandler
+
+virtual void SAL_CALL
+startDocument() override
+{
+m_handler->startDocument();
+m_debug->startDocument();
+}
+
+virtual void SAL_CALL
+endDocument() override
+{
+m_handler->endDocument();
+m_debug->endDocument();
+}
+
+virtual void SAL_CALL
+startElement(
+const OUString& aName,
+const uno::Reference< xml::sax::XAttributeList > & xAttribs)
override
+{
+m_handler->startElement(aName, xAttribs);
+m_debug->ignorableWhitespace(" "); // NOTE: needed for pretty-printing
+m_debug->startElement(aName, xAttribs);
+}
+
+virtual void SAL_CALL
+endElement(const OUString& aName) override
+{
+m_handler->endElement(aName);
+m_debug->ignorableWhitespace(" "); // NOTE: needed for pretty-printing
+m_debug->endElement(aName);
+}
+
+virtual void SAL_CALL
+characters(const OUString& aChars) override
+{
+m_handler->characters(aChars);
+m_debug->characters(aChars);
+}
+
+virtual void SAL_CALL
+ignorableWhitespace(const OUString& aWhitespaces) override
+{
+m_handler->ignorableWhitespace(aWhitespaces);
+m_debug->ignorableWhitespace(aWhitespaces);
+}
+
+virtual void SAL_CALL
+processingInstruction(const OUString& aTarget, const OUString& aData)
override
+{
+m_handler->processingInstruction(aTarget, aData);
+m_debug->processingInstruction(aTarget, aData);
+}
+
+virtual void SAL_CALL
+setDocumentLocator(const uno::Reference< xml::sax::XLocator >& xLocator)
override
+{
+m_handler->setDocumentLocator(xLocator);
+m_debug->setDocumentLocator(xLocator);
+}
+
+// XInterface
+
+virtual uno::Any SAL_CALL queryInterface(const uno::Type & rType) override
+{
+uno::Any aIface = cppu::WeakImplHelper< XDocumentHandler
>::queryInterface(rType);
+// delegate all queries we cannot satisfy ourselves to the real handler
+if (!aIface.has< uno::Reference< uno::XInterface > >())
+aIface = m_handler->queryInterface(rType);
+return aIface;
+}
+
+private:
+uno::Reference< XDocumentHandler > m_handler;
+uno::Reference< XDocumentHandler > m_debug;
+};
+
+}
+#endif
+
// W o r d P r o
const sal_Int8 header[] = { 0x57, 0x6f, 0x72, 0x64, 0x50, 0x72, 0x6f };
@@ -61,6 +168,30 @@ bool LotusWordProImportFilter::importImpl( const Sequence<
css::beans::PropertyV
// An XML import service: what we push sax messages to...
uno::Reference< XDocumentHandler > xInternalHandler(
mxContext->getServiceManager()->createInstanceWithContext(
"com.sun.star.comp.Writer.XMLImporter", mxContext ), UNO_Q
[Libreoffice-commits] core.git: download.lst external/libodfgen solenv/flatpak-manifest.in
download.lst
|6 -
external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
| 58 --
external/libodfgen/ExternalProject_libodfgen.mk
|4
external/libodfgen/Library_odfgen.mk
|3
external/libodfgen/UnpackedTarball_libodfgen.mk
|8 -
external/libodfgen/c++11.patch
| 44 ---
external/libodfgen/libodfgen-bundled-soname.patch.0
|5
solenv/flatpak-manifest.in
|6 -
8 files changed, 13 insertions(+), 121 deletions(-)
New commits:
commit f341a9da2eb63ea40ccc5a17d7c9dc557682469f
Author: David Tardon
AuthorDate: Sun Jan 17 16:27:55 2021 +0100
Commit: David Tardon
CommitDate: Sun Jan 24 20:51:21 2021 +0100
upload libodfgen 0.1.8
Change-Id: Ibc59469b74d54a2b307ea708ea5c4a752532f0b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109840
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/download.lst b/download.lst
index 36856cd70c6a..7bcb27631514 100644
--- a/download.lst
+++ b/download.lst
@@ -195,9 +195,9 @@ export NEON_SHA256SUM :=
c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e
export NEON_TARBALL := neon-0.31.1.tar.gz
export NSS_SHA256SUM :=
ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45
export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz
-export ODFGEN_SHA256SUM :=
2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
-export ODFGEN_VERSION_MICRO := 6
-export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
+export ODFGEN_SHA256SUM :=
55200027fd46623b9b38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625
+export ODFGEN_VERSION_MICRO := 8
+export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.xz
export ODFVALIDATOR_SHA256SUM :=
d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0
export ODFVALIDATOR_JAR :=
odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
export OFFICEOTRON_SHA256SUM :=
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
diff --git
a/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
b/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
deleted file mode 100644
index 1fc4e6b9d261..
---
a/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
+++ /dev/null
@@ -1,58 +0,0 @@
-From 68e0c8e4c834df57bc9a0e8da72151f69ff5e7a6 Mon Sep 17 00:00:00 2001
-From: David Tardon
-Date: Fri, 12 Aug 2016 12:50:39 +0200
-Subject: [PATCH] tdf#101077 make double->string conversion locale-agnostic
-
- src/OdsGenerator.cxx | 19 +--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/src/OdsGenerator.cxx b/src/OdsGenerator.cxx
-index 52e135e..8cb7203 100644
a/src/OdsGenerator.cxx
-+++ b/src/OdsGenerator.cxx
-@@ -26,6 +26,8 @@
-
- #include
-
-+#include
-+#include
- #include
- #include
- #include
-@@ -46,6 +48,19 @@
- #include "OdcGenerator.hxx"
- #include "OdfGenerator.hxx"
-
-+namespace
-+{
-+
-+librevenge::RVNGString makePreciseStr(const double value)
-+{
-+ std::ostringstream os;
-+ os.imbue(std::locale::classic());
-+ os << std::fixed << std::setprecision(8) << value;
-+ return os.str().c_str();
-+}
-+
-+}
-+
- class OdsGeneratorPrivate : public OdfGenerator
- {
- public:
-@@ -968,10 +983,10 @@ void OdsGenerator::openSheetCell(const
librevenge::RVNGPropertyList )
- // we need the maximum precision here,
so we must avoid getStr() when possible
- librevenge::RVNGString value;
- if
(propList["librevenge:value"]->getUnit()==librevenge::RVNG_GENERIC)
-- value.sprintf("%.8f",
propList["librevenge:value"]->getDouble());
-+ value =
makePreciseStr(propList["librevenge:value"]->getDouble());
- else if
(propList["librevenge:value"]->getUnit()==librevenge::RVNG_PERCENT)
- {
-- value.sprintf("%.8f",
propList["librevenge:value"]->getDouble()*100.);
-+ value =
makePreciseStr(propList["librevenge:value"]->getDouble()*100.);
- value.append('%');
- }
-
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - download.lst external/libxslt
download.lst |5 +++-- external/libxslt/ExternalPackage_xslt.mk |4 ++-- external/libxslt/libxslt-msvc.patch.2|2 +- 3 files changed, 6 insertions(+), 5 deletions(-) New commits: commit b13ff230d160562deec75667ebb0d16b5831169f Author: David Tardon AuthorDate: Tue Nov 7 19:50:04 2017 +0100 Commit: Samuel Mehrbrodt CommitDate: Wed Sep 30 12:16:39 2020 +0200 upload libxslt 1.1.32 Reviewed-on: https://gerrit.libreoffice.org/44422 Tested-by: Jenkins Reviewed-by: David Tardon (cherry picked from commit c110dabbf0fcddf9da2e61d66ca093cf6e6c57a1) Conflicts: download.lst Change-Id: Idee2f18dccdf309027142137683ac86735f575cc diff --git a/download.lst b/download.lst index cda937e06284..b6363dcce2ec 100644 --- a/download.lst +++ b/download.lst @@ -94,8 +94,9 @@ export LIBEXTTEXTCAT_TARBALL := ae330b9493bd4503ac390106ff6060d7-libexttextcat-3 export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz export LIBXML_TARBALL := ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz -export LIBXSLT_MD5SUM := 70becbbcb1dad55f14de0b84171b91d5 -export LIBXSLT_TARBALL := libxslt-1.1.30.tar.gz +export LIBXSLT_MD5SUM := 1fc72f98e98bf4443f1651165f3aa146 +export LIBXSLT_VERSION_MICRO := 32 +export LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := 05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2 export MDDS_TARBALL := a67a46ec9d00d283a7cd8dbdd2906b59-mdds_0.11.0.tar.bz2 diff --git a/external/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk index 4354bd4b6191..f0fd5336297d 100644 --- a/external/libxslt/ExternalPackage_xslt.mk +++ b/external/libxslt/ExternalPackage_xslt.mk @@ -24,8 +24,8 @@ $(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.dll,wi $(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.dll,win32/bin.msvc/libexslt.dll)) endif else # OS!=WNT -$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.30)) -$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.18)) +$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.$(LIBXSLT_VERSION_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.20)) endif endif # DISABLE_DYNLOADING diff --git a/external/libxslt/libxslt-msvc.patch.2 b/external/libxslt/libxslt-msvc.patch.2 index d5b01dab2c25..19343a782511 100644 --- a/external/libxslt/libxslt-msvc.patch.2 +++ b/external/libxslt/libxslt-msvc.patch.2 @@ -1,7 +1,7 @@ --- build/libxslt-1.1.26/win32/Makefile.msvc.old 2010-10-20 01:02:55.359375000 +0200 +++ build/libxslt-1.1.26/win32/Makefile.msvc 2010-10-20 01:03:05.18750 +0200 @@ -54,6 +54,7 @@ - CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W3 $(CRUNTIME) /D "_REENTRANT" + CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /W3 /wd4244 /wd4267 $(CRUNTIME) /D "_REENTRANT" CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX) CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE +CFLAGS = $(CFLAGS) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw solenv/flatpak-manifest.in writerperfect/qa
configure.ac|2
download.lst|4
external/libmwaw/Library_mwaw.mk|6
solenv/flatpak-manifest.in |6
writerperfect/qa/unit/WpftCalcFilterTest.cxx|1
writerperfect/qa/unit/WpftDrawFilterTest.cxx|2
writerperfect/qa/unit/WpftWriterFilterTest.cxx |1
writerperfect/qa/unit/data/calc/libmwaw/pass/JazzLotus.hqx | 39
writerperfect/qa/unit/data/draw/libmwaw/pass/Canvas_2.hqx | 407
++
writerperfect/qa/unit/data/draw/libmwaw/pass/DrawingTable_1.hqx | 196
writerperfect/qa/unit/data/writer/libmwaw/pass/JazzLotus.hqx| 40
11 files changed, 698 insertions(+), 6 deletions(-)
New commits:
commit 050e95e50d44a5cbb74bb5de481cb30551f83136
Author: David Tardon
AuthorDate: Sun Sep 27 19:07:48 2020 +0200
Commit: David Tardon
CommitDate: Mon Sep 28 08:58:06 2020 +0200
upload libmwaw 0.3.17
Change-Id: I24c6c5a5d93a76a9fcc2213cd48beb8e5a5ca479
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103519
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/configure.ac b/configure.ac
index 0db50672d5fa..7aeb5ef1588e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8846,7 +8846,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.16])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.17])
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 560e004ed80c..a4782bb2b9ef 100644
--- a/download.lst
+++ b/download.lst
@@ -186,8 +186,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 :=
0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868
-export MWAW_VERSION_MICRO := 16
+export MWAW_SHA256SUM :=
8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c
+export MWAW_VERSION_MICRO := 17
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/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 880a70861e24..bb1a880fd9ce 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -41,6 +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/CanvasGraph \
+ UnpackedTarball/libmwaw/src/lib/CanvasParser \
+ UnpackedTarball/libmwaw/src/lib/CanvasStyleManager \
UnpackedTarball/libmwaw/src/lib/ClarisDrawGraph \
UnpackedTarball/libmwaw/src/lib/ClarisDrawParser \
UnpackedTarball/libmwaw/src/lib/ClarisDrawStyleManager \
@@ -63,6 +66,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/CricketDrawParser \
UnpackedTarball/libmwaw/src/lib/DocMkrParser \
UnpackedTarball/libmwaw/src/lib/DocMkrText \
+ UnpackedTarball/libmwaw/src/lib/DrawTableParser \
UnpackedTarball/libmwaw/src/lib/EDocParser \
UnpackedTarball/libmwaw/src/lib/FreeHandParser \
UnpackedTarball/libmwaw/src/lib/FullWrtGraph \
@@ -83,6 +87,8 @@ $(eval $(call
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/HanMacWrdKGraph \
UnpackedTarball/libmwaw/src/lib/HanMacWrdKParser \
UnpackedTarball/libmwaw/src/lib/HanMacWrdKText \
+ UnpackedTarball/libmwaw/src/lib/JazzSSParser \
+ UnpackedTarball/libmwaw/src/lib/JazzWriterParser \
UnpackedTarball/libmwaw/src/lib/LightWayTxtGraph \
UnpackedTarball/libmwaw/src/lib/LightWayTxtParser \
UnpackedTarball/libmwaw/src/lib/LightWayTxtText \
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index df77597b7158..9ac394f22049 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.lib
[Libreoffice-commits] core.git: filter/Configuration_filter.mk filter/source writerperfect/source
filter/Configuration_filter.mk |2 filter/source/config/fragments/filters/PocketWord_File.xcu | 29 ++ filter/source/config/fragments/types/writer_PocketWord_File.xcu | 29 ++ writerperfect/source/writer/MSWorksImportFilter.cxx |3 + 4 files changed, 63 insertions(+) New commits: commit 1e6e891016ae926868de493ab0e29871a2d06b95 Author: David Tardon AuthorDate: Sun Sep 27 15:29:44 2020 +0200 Commit: David Tardon CommitDate: Sun Sep 27 19:03:20 2020 +0200 restore PocketWord filter, this time backed by libwps Change-Id: If9843ae717f58e683252c8ea55360a567978395e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103514 Tested-by: Jenkins Reviewed-by: David Tardon diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index e71ffacf8f25..d53afa704fc9 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -367,6 +367,7 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu Palm_Text_Document \ StarOffice_Writer \ writer_EPUB_Document \ + writer_PocketWord_File \ )) $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,filter/source/config/fragments/filters,\ @@ -415,6 +416,7 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters Palm_Text_Document \ StarOffice_Writer \ EPUB \ + PocketWord_File \ )) # fcfg_web diff --git a/filter/source/config/fragments/filters/PocketWord_File.xcu b/filter/source/config/fragments/filters/PocketWord_File.xcu new file mode 100644 index ..1ce83aa68fe4 --- /dev/null +++ b/filter/source/config/fragments/filters/PocketWord_File.xcu @@ -0,0 +1,29 @@ + + +0 +writer_PocketWord_File +com.sun.star.text.TextDocument + +com.sun.star.comp.Writer.MSWorksImportFilter + + +Pocket Word + +IMPORT ALIEN 3RDPARTYFILTER + diff --git a/filter/source/config/fragments/types/writer_PocketWord_File.xcu b/filter/source/config/fragments/types/writer_PocketWord_File.xcu new file mode 100644 index ..3f146aba5e26 --- /dev/null +++ b/filter/source/config/fragments/types/writer_PocketWord_File.xcu @@ -0,0 +1,29 @@ + + +com.sun.star.comp.Writer.MSWorksImportFilter + +psw +application/x-pocket-word +false +PocketWord File + +Pocket Word + +doctype:pwi + diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx index 5339d9e3f202..ab0efc04f670 100644 --- a/writerperfect/source/writer/MSWorksImportFilter.cxx +++ b/writerperfect/source/writer/MSWorksImportFilter.cxx @@ -115,6 +115,9 @@ bool MSWorksImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OU case libwps::WPS_RESERVED_1: rTypeName = "writer_DosWord"; break; +case libwps::WPS_RESERVED_4: +rTypeName = "writer_PocketWord_File"; +break; default: break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/qa
writerperfect/qa/unit/WpftWriterFilterTest.cxx |1 +
writerperfect/qa/unit/data/writer/libwps/pass/PocketWord.psw |binary
2 files changed, 1 insertion(+)
New commits:
commit 9b9d668d45dce3f318d89d54725a4d6cfc750315
Author: David Tardon
AuthorDate: Sun Sep 27 15:21:42 2020 +0200
Commit: David Tardon
CommitDate: Sun Sep 27 19:04:06 2020 +0200
add import test file for Pocket Word
Change-Id: Idbd2ddb113f77a6dc3966110757c4037d993bd4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103515
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 8bc4c7cadbb3..6f88c694682b 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -48,6 +48,7 @@ void WpftWriterFilterTest::test()
{ "Writer_3.1.sdw", REQUIRE_STAROFFICE_VERSION(0, 0, 2) },
};
const writerperfect::test::WpftOptionalMap_t aWpsOptional{
+{ "PocketWord.psw", REQUIRE_WPS_VERSION(0, 4, 12) },
{ "Word_5.0_DOS.doc", REQUIRE_WPS_VERSION(0, 4, 3) },
{ "Write_3.1.wri", REQUIRE_WPS_VERSION(0, 4, 2) },
};
diff --git a/writerperfect/qa/unit/data/writer/libwps/pass/PocketWord.psw
b/writerperfect/qa/unit/data/writer/libwps/pass/PocketWord.psw
new file mode 100644
index ..75c0b60f397c
Binary files /dev/null and
b/writerperfect/qa/unit/data/writer/libwps/pass/PocketWord.psw differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac download.lst external/libwps solenv/flatpak-manifest.in
configure.ac|2 +-
download.lst|4 ++--
external/libwps/Library_wps.mk |1 +
external/libwps/libtool.patch.0 |9 +
solenv/flatpak-manifest.in |6 +++---
5 files changed, 12 insertions(+), 10 deletions(-)
New commits:
commit 61b05af30133622cc67304c694edad31ebff446c
Author: David Tardon
AuthorDate: Wed Sep 9 09:07:38 2020 +0200
Commit: David Tardon
CommitDate: Sun Sep 27 19:02:07 2020 +0200
upload libwps 0.4.12
Change-Id: Ib787098b98f68185c1b3f6b414efbec36cad02dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102332
Tested-by: David Tardon
Reviewed-by: David Tardon
diff --git a/configure.ac b/configure.ac
index 1ea6b255bb23..0db50672d5fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8837,7 +8837,7 @@
libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar
libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.11])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.12])
libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
diff --git a/download.lst b/download.lst
index 659879a530a3..560e004ed80c 100644
--- a/download.lst
+++ b/download.lst
@@ -260,8 +260,8 @@ export WPD_TARBALL :=
libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
export WPG_SHA256SUM :=
99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c
export WPG_VERSION_MICRO := 3
export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
-export WPS_SHA256SUM :=
a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1
-export WPS_VERSION_MICRO := 11
+export WPS_SHA256SUM :=
e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb
+export WPS_VERSION_MICRO := 12
export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
export XSLTML_SHA256SUM :=
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index 349bdbe83c43..8986ae6e6288 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,wps,\
UnpackedTarball/libwps/src/lib/LotusStyleManager \
UnpackedTarball/libwps/src/lib/MSWrite \
UnpackedTarball/libwps/src/lib/Multiplan \
+ UnpackedTarball/libwps/src/lib/PocketWord \
UnpackedTarball/libwps/src/lib/Quattro \
UnpackedTarball/libwps/src/lib/Quattro9 \
UnpackedTarball/libwps/src/lib/Quattro9Graph \
diff --git a/external/libwps/libtool.patch.0 b/external/libwps/libtool.patch.0
index f2e10ac3822f..cc4b08ba2147 100644
--- a/external/libwps/libtool.patch.0
+++ b/external/libwps/libtool.patch.0
@@ -1,11 +1,12 @@
--- ltmain.sh.sav 2018-08-02 14:21:34.0 +0200
+++ ltmain.sh 2019-05-05 22:04:15.433588776 +0200
-@@ -7277,7 +7277,7 @@ func_mode_link ()
+@@ -7277,7 +7277,8 @@ func_mode_link ()
+ # -stdlib=*select c++ std lib with clang
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-- -fsanitize=*)
-+ -fsanitize=*|-fuse-ld=*|--ld-path=*)
+-
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
++
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
++ -fuse-ld=*|--ld-path=*)
func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result
func_append compile_command " $arg"
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 50cf723eb057..df77597b7158 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -327,10 +327,10 @@
"dest-filename": "external/tarballs/libwpg-0.3.3.tar.xz"
},
{
-"url":
"https://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz;,
-"sha256":
"a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1",
+"url":
"https://dev-www.libreoffice.org/src/libwps-0.4.12.tar.xz;,
+"sha256":
"e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb",
"type": "file",
-"dest-filename": "external/tarballs/libwps-0.4.11.tar.xz"
+"dest-filename": "external/tarballs/libwps-0.4.12.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/libzmf-0.0.2.
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - lotuswordpro/source
lotuswordpro/source/filter/lwpframelayout.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 40f6f850f0ad2b5899655076a317cba1b8d92e89
Author: David Tardon
AuthorDate: Fri Jun 12 16:41:07 2020 +0200
Commit: Caolán McNamara
CommitDate: Sat Jun 13 16:06:36 2020 +0200
use dynamic_cast
Change-Id: Iac420c2dd37be392ae817e0433de68c983546667
(cherry picked from commit 06248bbaf21723f505d99c65906e5c6781c54c83)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96270
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx
b/lotuswordpro/source/filter/lwpframelayout.cxx
index 3e6d9580f4e6..1d7fcc09e7df 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -1172,7 +1172,7 @@ void LwpDropcapLayout::XFConvert(XFContentContainer*
pCont)
void LwpDropcapLayout::RegisterStyle(LwpFoundry* pFoundry)
{
-LwpStory* pStory = static_cast(m_Content.obj(VO_STORY).get());
+LwpStory* pStory = dynamic_cast(m_Content.obj(VO_STORY).get());
if (pStory)
{
pStory->SetDropcapFlag(true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - lotuswordpro/source
lotuswordpro/source/filter/lwpdoc.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 42de309f6dd71811f1aaeea1c3753065b57cfa06
Author: David Tardon
AuthorDate: Fri Jun 12 16:22:22 2020 +0200
Commit: Caolán McNamara
CommitDate: Sat Jun 13 15:14:21 2020 +0200
cast to the right type
This makes paragraph formatting in LWP documents work again (for the
first time since 3.3).
Regression from commit d2a1c2d4cfa51b6ee8a7f38baa258633fae9ec6d
"fix what there is to fix"
Change-Id: I057aeb996837f7c19815de8a5379861ce3c0e8cd
(cherry picked from commit 12cb753350f429e39064365b05926a30a008a516)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96235
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx
b/lotuswordpro/source/filter/lwpdoc.cxx
index f59c41827b22..3c887fdb8387 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -245,7 +245,7 @@ void LwpDocument::RegisterTextStyles()
throw std::runtime_error("loop in register text style");
pParaStyle->SetFoundry(m_xOwnedFoundry.get());
pParaStyle->RegisterStyle();
-pParaStyle =
dynamic_cast(pParaStyle->GetNext().obj().get());
+pParaStyle =
dynamic_cast(pParaStyle->GetNext().obj().get());
}
}
ChangeStyleName();//for click here block
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - 2 commits - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg lotuswordpro/source
icon-themes/breeze/sc/res/lftrgt.png |binary
icon-themes/breeze/sc/res/topdown.png |binary
icon-themes/breeze/sd/res/slide_sorter_focus_border.png |binary
icon-themes/breeze/sd/res/slide_sorter_insert_shadow.png |binary
icon-themes/breeze/sd/res/slide_sorter_shadow.png |binary
icon-themes/breeze/svx/res/rectbtns.png |binary
icon-themes/breeze_dark/sc/res/lftrgt.png |binary
icon-themes/breeze_dark/sc/res/topdown.png|binary
icon-themes/breeze_dark/sd/res/slide_sorter_focus_border.png |binary
icon-themes/breeze_dark/sd/res/slide_sorter_insert_shadow.png |binary
icon-themes/breeze_dark/sd/res/slide_sorter_shadow.png|binary
icon-themes/breeze_dark/svx/res/rectbtns.png |binary
icon-themes/breeze_dark_svg/sc/res/lftrgt.svg |1 +
icon-themes/breeze_dark_svg/sc/res/topdown.svg|1 +
icon-themes/breeze_dark_svg/sd/res/slide_sorter_focus_border.svg |1 +
icon-themes/breeze_dark_svg/sd/res/slide_sorter_insert_shadow.svg |1 +
icon-themes/breeze_dark_svg/sd/res/slide_sorter_shadow.svg|1 +
icon-themes/breeze_dark_svg/svx/res/rectbtns.svg |2 +-
icon-themes/breeze_svg/sc/res/lftrgt.svg |1 +
icon-themes/breeze_svg/sc/res/topdown.svg |1 +
icon-themes/breeze_svg/sd/res/slide_sorter_focus_border.svg |1 +
icon-themes/breeze_svg/sd/res/slide_sorter_insert_shadow.svg |1 +
icon-themes/breeze_svg/sd/res/slide_sorter_shadow.svg |1 +
icon-themes/breeze_svg/svx/res/rectbtns.svg |2 +-
lotuswordpro/source/filter/lwpframelayout.cxx |2 +-
25 files changed, 13 insertions(+), 3 deletions(-)
New commits:
commit 2274c20b25b51473c4c87bc6baee135c296c00eb
Author: David Tardon
AuthorDate: Fri Jun 12 16:41:07 2020 +0200
Commit: Caolán McNamara
CommitDate: Sat Jun 13 15:13:45 2020 +0200
use dynamic_cast
Change-Id: Iac420c2dd37be392ae817e0433de68c983546667
(cherry picked from commit 06248bbaf21723f505d99c65906e5c6781c54c83)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96236
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx
b/lotuswordpro/source/filter/lwpframelayout.cxx
index dc873d16774e..f2a735387005 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -1169,7 +1169,7 @@ void LwpDropcapLayout::XFConvert(XFContentContainer*
pCont)
void LwpDropcapLayout::RegisterStyle(LwpFoundry* pFoundry)
{
-LwpStory* pStory = static_cast(m_Content.obj(VO_STORY).get());
+LwpStory* pStory = dynamic_cast(m_Content.obj(VO_STORY).get());
if (pStory)
{
pStory->SetDropcapFlag(true);
commit b094922d002422ea6872ecc23627f69a4bfc4bb0
Author: Rizal Muttaqin
AuthorDate: Fri Jun 12 12:21:14 2020 +0700
Commit: Rizal Muttaqin
CommitDate: Sat Jun 13 15:13:38 2020 +0200
Breeze: tdf#133753: base point, Calc left to right images
Change-Id: Id3325fbafb4c5e7591f0b28b17aef5b3ba454570
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96190
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin
(cherry picked from commit 6c3cd255cece1ed137ed3a143028fdd636e5c3e6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96188
diff --git a/icon-themes/breeze/sc/res/lftrgt.png
b/icon-themes/breeze/sc/res/lftrgt.png
new file mode 100644
index ..e0ca8251318f
Binary files /dev/null and b/icon-themes/breeze/sc/res/lftrgt.png differ
diff --git a/icon-themes/breeze/sc/res/topdown.png
b/icon-themes/breeze/sc/res/topdown.png
new file mode 100644
index ..3e09e05151a7
Binary files /dev/null and b/icon-themes/breeze/sc/res/topdown.png differ
diff --git a/icon-themes/breeze/sd/res/slide_sorter_focus_border.png
b/icon-themes/breeze/sd/res/slide_sorter_focus_border.png
new file mode 100644
index ..debbc8a1dd2f
Binary files /dev/null and
b/icon-themes/breeze/sd/res/slide_sorter_focus_border.png differ
diff --git a/icon-themes/breeze/sd/res/slide_sorter_insert_shadow.png
b/icon-themes/breeze/sd/res/slide_sorter_insert_shadow.png
new file mode 100644
index ..b4c8b5704a57
Binary files /dev/null and
b/icon-themes/breeze/sd/res/slide_sorter_insert_shadow.png differ
diff --git a/icon-themes/breeze/sd/res/slide_sorter_shadow.png
b/icon-themes/breeze/sd/res/slide_sorter_shadow.png
new file mode 100644
index ..2ab196b42ff7
Binary files /dev/null and b/icon-themes/breeze/sd/res/slide_sorter_shadow.png
differ
diff --git a/icon-themes/breeze/svx/res/rectbtns.png
b/icon-themes/breeze/svx/res/rectbtns.png
index b4742bcbef54..9ae9b1751552 100644
Binary files a/i
[Libreoffice-commits] core.git: 6 commits - lotuswordpro/source
lotuswordpro/source/filter/lwpdoc.cxx | 16
lotuswordpro/source/filter/lwpfoundry.cxx |1 -
lotuswordpro/source/filter/lwpframelayout.cxx |2 +-
lotuswordpro/source/filter/lwptablelayout.cxx |3 +--
lotuswordpro/source/filter/lwptabrack.cxx |3 +--
5 files changed, 11 insertions(+), 14 deletions(-)
New commits:
commit 05664c6ffae062a19ff3aa3e0949354d2586919d
Author: David Tardon
AuthorDate: Fri Jun 12 17:01:40 2020 +0200
Commit: David Tardon
CommitDate: Fri Jun 12 19:05:09 2020 +0200
return directly
Change-Id: Ia5ebadfd825b0cbd106893f0b7b25e28b878dfeb
diff --git a/lotuswordpro/source/filter/lwptabrack.cxx
b/lotuswordpro/source/filter/lwptabrack.cxx
index 84a80decd93b..3aea3905e653 100644
--- a/lotuswordpro/source/filter/lwptabrack.cxx
+++ b/lotuswordpro/source/filter/lwptabrack.cxx
@@ -118,8 +118,7 @@ LwpTab* LwpTabRack::Lookup(sal_uInt16 nIndex)
LwpTabRack* LwpTabRack::GetNext()
{
-LwpTabRack* pTabRack = dynamic_cast(m_NextID.obj().get());
-return pTabRack;
+return dynamic_cast(m_NextID.obj().get());
}
sal_uInt16 LwpTabRack::GetNumTabs()
commit 0bc6b243746837433713804b430f7ade44b9c8c0
Author: David Tardon
AuthorDate: Fri Jun 12 17:00:34 2020 +0200
Commit: David Tardon
CommitDate: Fri Jun 12 19:05:09 2020 +0200
return directly
Change-Id: I727a34213fef5adefdc6c1a046d47a7f37cfdcd0
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx
b/lotuswordpro/source/filter/lwptablelayout.cxx
index fbfc35174dd7..95aaf13715fc 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -514,8 +514,7 @@ LwpSuperTableLayout * LwpTableLayout::GetSuperTableLayout()
*/
LwpTable * LwpTableLayout::GetTable()
{
-LwpTable *pTable = dynamic_cast(m_Content.obj().get());
-return pTable;
+return dynamic_cast(m_Content.obj().get());
}
/**
* @short Get column style name by column ID
commit 06248bbaf21723f505d99c65906e5c6781c54c83
Author: David Tardon
AuthorDate: Fri Jun 12 16:41:07 2020 +0200
Commit: David Tardon
CommitDate: Fri Jun 12 19:05:08 2020 +0200
use dynamic_cast
Change-Id: Iac420c2dd37be392ae817e0433de68c983546667
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx
b/lotuswordpro/source/filter/lwpframelayout.cxx
index 01be3544108d..feb6f76266f1 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -1166,7 +1166,7 @@ void LwpDropcapLayout::XFConvert(XFContentContainer*
pCont)
void LwpDropcapLayout::RegisterStyle(LwpFoundry* pFoundry)
{
-LwpStory* pStory = static_cast(m_Content.obj(VO_STORY).get());
+LwpStory* pStory = dynamic_cast(m_Content.obj(VO_STORY).get());
if (pStory)
{
pStory->SetDropcapFlag(true);
commit 9dfa1d2f9fd94b5a8d25c8dccb2bd674886a12ba
Author: David Tardon
AuthorDate: Fri Jun 12 16:36:06 2020 +0200
Commit: David Tardon
CommitDate: Fri Jun 12 19:05:08 2020 +0200
drop misleading comment
Change-Id: I2ae4b9dbcf3134ec5301d14c32d6904817d350fb
diff --git a/lotuswordpro/source/filter/lwpfoundry.cxx
b/lotuswordpro/source/filter/lwpfoundry.cxx
index 2a17efbe8ae2..d18dcd3903b6 100644
--- a/lotuswordpro/source/filter/lwpfoundry.cxx
+++ b/lotuswordpro/source/filter/lwpfoundry.cxx
@@ -266,7 +266,6 @@ LwpObjectID * LwpFoundry::GetDefaultTextStyle()
*/
LwpObjectID * LwpFoundry::FindParaStyleByName(const OUString& name)
{
-//Register all text styles: para styles, character styles
LwpDLVListHeadHolder* pParaStyleHolder =
dynamic_cast(GetTextStyleHead().obj().get());
if(pParaStyleHolder)
{
commit d65d11343d975cc4e278deca54d166aeff0aa850
Author: David Tardon
AuthorDate: Fri Jun 12 16:30:40 2020 +0200
Commit: David Tardon
CommitDate: Fri Jun 12 19:05:08 2020 +0200
rename variable
Change-Id: I24e0902998420685656a350cb849a19d8c7a8a35
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx
b/lotuswordpro/source/filter/lwpdoc.cxx
index 8aab1b5fb68e..7dc59e13e75a 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -231,19 +231,19 @@ void LwpDocument::RegisterStyle()
void LwpDocument::RegisterTextStyles()
{
//Register all text styles: para styles, character styles
-LwpDLVListHeadHolder* pParaStyleHolder = m_xOwnedFoundry
+LwpDLVListHeadHolder* pTextStyleHolder = m_xOwnedFoundry
?
dynamic_cast(m_xOwnedFoundry->GetTextStyleHead().obj().get())
: nullptr;
-if(pParaStyleHolder)
+if(pTextStyleHolder)
{
-LwpTextStyle* pParaStyle = dynamic_cast
(pParaStyleHolder->GetHeadID().obj().get());
-while(pParaStyle)
+LwpTextStyle* pTextStyle = dynamic_cast
(pTextStyleHolder->GetHeadID().obj().get());
+while(pTextStyle)
{
-if (pParaStyle->GetFoundry())
+if (pTe
[Libreoffice-commits] core.git: configure.ac download.lst external/libwps solenv/flatpak-manifest.in
configure.ac |
2
download.lst |
4
external/libwps/0001-Make-comparison-operator-member-functions-const.patch |
49
external/libwps/Library_wps.mk |
1
external/libwps/UnpackedTarball_libwps.mk |
4
external/libwps/libwps-lotus-version-tdf127887-upstream.patch |
111 --
solenv/flatpak-manifest.in |
6
7 files changed, 7 insertions(+), 170 deletions(-)
New commits:
commit 7664ba694c5667c7fdb75e1a6fa505d3e8baa536
Author: David Tardon
AuthorDate: Sat Apr 18 14:27:56 2020 +0200
Commit: David Tardon
CommitDate: Sat Apr 18 15:25:48 2020 +0200
upload libwps 0.4.11
Change-Id: I068c7fe1ecf28755b095c5502d4c2dd42a54489c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92473
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/configure.ac b/configure.ac
index e5888dff7ccb..b5cde04404d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8546,7 +8546,7 @@
libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar
libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.10])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.11])
libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
diff --git a/download.lst b/download.lst
index dc556960d0d6..bfb417bd2919 100644
--- a/download.lst
+++ b/download.lst
@@ -253,8 +253,8 @@ export WPD_TARBALL :=
libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
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
+export WPS_SHA256SUM :=
a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1
+export WPS_VERSION_MICRO := 11
export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
export XSLTML_SHA256SUM :=
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
diff --git
a/external/libwps/0001-Make-comparison-operator-member-functions-const.patch
b/external/libwps/0001-Make-comparison-operator-member-functions-const.patch
deleted file mode 100644
index c7bfb1e40aa2..
--- a/external/libwps/0001-Make-comparison-operator-member-functions-const.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 555b3e0c18ba16843541867d036da782ecdcdeb1 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann
-Date: Mon, 21 Oct 2019 16:19:13 +0200
-Subject: [PATCH] Make comparison operator member functions const
-
-...which avoids overload resolution ambiguities in C++20, when a synthesized
-candidate of operator == for a reversed-argument rewrite conflicts with the
-actual operator ==, due to the asymmetric const-ness of the implicit object
-parameter and the RHS parameter. (As observed with recent Clang 10 trunk with
--std=c++2a when building libwps as part of LibreOffice:
-
-> QuattroDosChart.cpp:399:18: error: use of overloaded operator '!=' is
ambiguous (with operand types 'WKSChart::Position' and 'WKSChart::Position')
-> if (ranges[0]!=ranges[1])
-> ~^ ~
-> ./WKSChart.h:78:8: note: candidate function
-> bool operator!=(Position ) const
-> ^
-> ./WKSChart.h:73:8: note: candidate function
-> bool operator==(Position ) const
-> ^
-> ./WKSChart.h:73:8: note: candidate function (with reversed parameter order)
-
-)
- src/lib/WKSChart.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/WKSChart.h b/src/lib/WKSChart.h
-index 268fa4a..e490357 100644
a/src/lib/WKSChart.h
-+++ b/src/lib/WKSChart.h
-@@ -70,12 +70,12 @@ public:
- //! operator<<
- friend std::ostream <<(std::ostream , Position const
);
- //! operator==
-- bool operator==(Position ) const
-+ bool operator==(Position const ) const
- {
- return m_pos==pos.m_pos && m_sheetName==pos.m_sheetName;
- }
- //! operator!=
-- bool operator!=(Position ) const
-+ bool operator!=(Position const ) const
- {
- return !(operator==(pos));
- }
---
-2.21.0
-
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index 500a9ab196b2..349bdbe83c43 100644
--- a/external/libwps/Library_wps
[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw solenv/flatpak-manifest.in
configure.ac |2 +-
download.lst |4 ++--
external/libmwaw/Library_mwaw.mk |4
solenv/flatpak-manifest.in |6 +++---
4 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 56c638c0ebb21711b02d1ff235a3ffd3f232
Author: David Tardon
AuthorDate: Sat Apr 18 13:54:18 2020 +0200
Commit: David Tardon
CommitDate: Sat Apr 18 15:25:23 2020 +0200
upload libmwaw 0.3.16
Change-Id: Idc7ed6bbcd3298138fb92c81ddf7dd6278d201dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92472
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/configure.ac b/configure.ac
index 9fd64a41bcb9..e5888dff7ccb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8555,7 +8555,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.15])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.16])
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 d64ecd0493bc..dc556960d0d6 100644
--- a/download.lst
+++ b/download.lst
@@ -179,8 +179,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 :=
0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1
-export MWAW_VERSION_MICRO := 15
+export MWAW_SHA256SUM :=
0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868
+export MWAW_VERSION_MICRO := 16
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/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index fc874fcb5e45..880a70861e24 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -120,6 +120,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetDecoder \
UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetEncoder \
UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetListener \
+ UnpackedTarball/libmwaw/src/lib/MWAWStream \
UnpackedTarball/libmwaw/src/lib/MWAWStringStream \
UnpackedTarball/libmwaw/src/lib/MWAWSubDocument \
UnpackedTarball/libmwaw/src/lib/MWAWTable \
@@ -173,10 +174,13 @@ $(eval $(call
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/PowerPoint7Text \
UnpackedTarball/libmwaw/src/lib/RagTime5Chart \
UnpackedTarball/libmwaw/src/lib/RagTime5ClusterManager \
+ UnpackedTarball/libmwaw/src/lib/RagTime5Document \
+ UnpackedTarball/libmwaw/src/lib/RagTime5Formula \
UnpackedTarball/libmwaw/src/lib/RagTime5Graph \
UnpackedTarball/libmwaw/src/lib/RagTime5Layout \
UnpackedTarball/libmwaw/src/lib/RagTime5Parser \
UnpackedTarball/libmwaw/src/lib/RagTime5Pipeline \
+ UnpackedTarball/libmwaw/src/lib/RagTime5SSParser \
UnpackedTarball/libmwaw/src/lib/RagTime5Spreadsheet \
UnpackedTarball/libmwaw/src/lib/RagTime5StructManager \
UnpackedTarball/libmwaw/src/lib/RagTime5StyleManager \
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 6511d62c5130..2201e6fe6071 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -267,10 +267,10 @@
"dest-filename": "external/tarballs/libmspub-0.1.4.tar.xz"
},
{
-"url":
"https://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz;,
-"sha256":
"0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1",
+"url":
"https://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz;,
+"sha256":
"0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868",
"type": "file",
-"dest-filename": "external/tarballs/libmwaw-0.3.15.tar.xz"
+"dest-filename": "external/tarballs/libmwaw-0.3.16.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2;,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac download.lst external/libstaroffice solenv/flatpak-manifest.in
configure.ac |2 download.lst |4 external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1 | 56 -- external/libstaroffice/0001-add-missing-include-for-std-max.patch.1 | 24 external/libstaroffice/0001-text-send-lastname-should-be-text-sender-lastname.patch.1 | 26 external/libstaroffice/UnpackedTarball_libstaroffice.mk | 10 - solenv/flatpak-manifest.in |6 - 7 files changed, 6 insertions(+), 122 deletions(-) New commits: commit 3e9230bcd4b9c541c0391a3646ed3691140afea2 Author: David Tardon AuthorDate: Sat Apr 18 13:36:37 2020 +0200 Commit: David Tardon CommitDate: Sat Apr 18 15:13:15 2020 +0200 upload libstaroffice 0.0.7 Change-Id: I3a12e75c61671a17653b7feb2147dfe4aff47613 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92471 Tested-by: Jenkins Reviewed-by: David Tardon diff --git a/configure.ac b/configure.ac index c3ef52dc65c1..9fd64a41bcb9 100644 --- a/configure.ac +++ b/configure.ac @@ -8574,7 +8574,7 @@ libo_CHECK_SYSTEM_MODULE([libqxp],[QXP],[libqxp-0.0]) libo_CHECK_SYSTEM_MODULE([libzmf],[ZMF],[libzmf-0.0]) libo_CHECK_SYSTEM_MODULE([libstaroffice],[STAROFFICE],[libstaroffice-0.0]) -libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.6]) +libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.7]) dnl === dnl Check for system lcms2 diff --git a/download.lst b/download.lst index fce6e1195fd2..d64ecd0493bc 100644 --- a/download.lst +++ b/download.lst @@ -236,8 +236,8 @@ export SERF_SHA256SUM := 6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1e export SERF_TARBALL := serf-1.2.1.tar.bz2 export SKIA_SHA256SUM := d724dd60d4375359aa4751ea39950ad833592f01774914873f6d033f14e1c63f export SKIA_TARBALL := skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz -export STAROFFICE_SHA256SUM := 6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4 -export STAROFFICE_VERSION_MICRO := 6 +export STAROFFICE_SHA256SUM := f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db +export STAROFFICE_VERSION_MICRO := 7 export STAROFFICE_TARBALL := libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz export SWING_SHA256SUM := 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip diff --git a/external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1 b/external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1 deleted file mode 100644 index 27fd97727e25.. --- a/external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1 +++ /dev/null @@ -1,56 +0,0 @@ -From 9c0ff663659a28720c4ee3f5752bb8ce8121648f Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Mon, 21 Oct 2019 17:17:48 +0200 -Subject: [PATCH] Fix equality operator arguments - -...which avoids overload resolution ambiguities in C++20, when a synthesized -candidate of operator == for a reversed-argument rewrite conflicts with the -actual operator ==, as one is a template specialization for int and the other -for float. (As observed with recent Clang 10 trunk with -std=c++2a when -building libstaroffice as part of LibreOffice: - -> STOFFChart.cxx:230:63: error: use of overloaded operator '==' is ambiguous (with operand types 'STOFFVec2f' (aka 'STOFFVec2') and 'STOFFVec2i' (aka 'STOFFVec2')) -> bool autoPlace=m_legendPosition==STOFFBox2f()||m_dimension==STOFFVec2i(); ->~~~^ -> ./libstaroffice_internal.hxx:687:8: note: candidate function -> bool operator==(STOFFVec2 const ) const ->^ -> ./libstaroffice_internal.hxx:687:8: note: candidate function (with reversed parameter order) -> STOFFChart.cxx:270:63: error: use of overloaded operator '==' is ambiguous (with operand types 'STOFFVec2f' (aka 'STOFFVec2') and 'STOFFVec2i' (aka 'STOFFVec2')) -> bool autoPlace=m_plotAreaPosition==STOFFBox2f()||m_dimension==STOFFVec2i(); ->~~~^ -> ./libstaroffice_internal.hxx:687:8: note: candidate function -> bool operator==(STOFFVec2 const ) const ->^ -> ./libstaroffice_internal.hxx:687:8: note: candidate function (with reversed parameter order) - -) - src/lib/STOFFChart.cxx | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/lib/STOFFChart.cxx b/src/lib/STOFFChart.cxx -index 3e7310c..b861762 100644 a/src/lib/STOFFChart.cxx -+++ b/src/lib/STOFFChart.cxx -@@ -227,7 +227,7 @@ void STOFFChart::sendChart(STOFFSpreadsheetList
[Libreoffice-commits] core.git: download.lst external/libcdr solenv/flatpak-manifest.in
download.lst |4 -
external/libcdr/0001-Add-missing-include.patch.1 | 33 ---
external/libcdr/UnpackedTarball_libcdr.mk|6 --
external/libcdr/ubsan.patch | 64 ---
solenv/flatpak-manifest.in |6 +-
5 files changed, 5 insertions(+), 108 deletions(-)
New commits:
commit 85dc497f1556ebc53f482e382f48e98b9560b983
Author: David Tardon
AuthorDate: Fri Feb 7 18:45:39 2020 +0100
Commit: David Tardon
CommitDate: Sat Feb 8 16:26:23 2020 +0100
upload libcdr 0.1.6
Change-Id: I569f8ed92358982edbc419a6b687652ffd4fcb14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88236
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/download.lst b/download.lst
index f1066cac4aad..c153f16725cc 100644
--- a/download.lst
+++ b/download.lst
@@ -17,8 +17,8 @@ export BZIP2_TARBALL :=
00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz
export CAIRO_SHA256SUM :=
5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
export CAIRO_VERSION_MICRO := 0
export CAIRO_TARBALL := cairo-1.16.$(CAIRO_VERSION_MICRO).tar.xz
-export CDR_SHA256SUM :=
6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48
-export CDR_TARBALL := libcdr-0.1.5.tar.xz
+export CDR_SHA256SUM :=
01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861
+export CDR_TARBALL := libcdr-0.1.6.tar.xz
export CLUCENE_SHA256SUM :=
ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
export CLUCENE_TARBALL :=
48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
export LIBCMIS_SHA256SUM :=
d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2
diff --git a/external/libcdr/0001-Add-missing-include.patch.1
b/external/libcdr/0001-Add-missing-include.patch.1
deleted file mode 100644
index 93f2b6ccc6fc..
--- a/external/libcdr/0001-Add-missing-include.patch.1
+++ /dev/null
@@ -1,33 +0,0 @@
-From 00c4b331df8157dff7c251323d00ec2d63691dfb Mon Sep 17 00:00:00 2001
-From: Miklos Vajna
-Date: Mon, 28 Jan 2019 09:04:56 +0100
-Subject: [PATCH] Add missing include
-
-CMXParser.cpp:42:43: error: expected ')'
-CDR_DEBUG_MSG(("invalid tag length %" PRIu16 "\n", tagLength));
- ^
-CMXParser.cpp:42:19: note: to match this '('
-CDR_DEBUG_MSG(("invalid tag length %" PRIu16 "\n", tagLength));
- ^
-1 error generated.
-
-Change-Id: I9575a96327a62dc6c44950d35a8740242e1a4433
- src/lib/CMXParser.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/CMXParser.cpp b/src/lib/CMXParser.cpp
-index 78cc417..02852c9 100644
a/src/lib/CMXParser.cpp
-+++ b/src/lib/CMXParser.cpp
-@@ -14,6 +14,7 @@
- #include
- #include
- #include
-+#include
-
- #include "libcdr_utils.h"
- #include "CDRPath.h"
---
-2.21.0
-
diff --git a/external/libcdr/UnpackedTarball_libcdr.mk
b/external/libcdr/UnpackedTarball_libcdr.mk
index 1a72fe8be15c..fd227a2f7445 100644
--- a/external/libcdr/UnpackedTarball_libcdr.mk
+++ b/external/libcdr/UnpackedTarball_libcdr.mk
@@ -15,14 +15,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,0))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libcdr))
-# * external/libcdr/0001-Add-missing-include.patch.1 is from upstream master
(see content for
-# details);
-# * external/libcdr/ubsan.patch is upstream at
<https://gerrit.libreoffice.org/#/c/73182/> "Avoid UB
-# converting from double to int via unsigned":
$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
external/libcdr/libcdr-visibility-win.patch \
-external/libcdr/0001-Add-missing-include.patch.1 \
-external/libcdr/ubsan.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libcdr/ubsan.patch b/external/libcdr/ubsan.patch
deleted file mode 100644
index 316c47a45ab9..
--- a/external/libcdr/ubsan.patch
+++ /dev/null
@@ -1,64 +0,0 @@
src/lib/CDRPath.cpp
-+++ src/lib/CDRPath.cpp
-@@ -796,7 +796,7 @@ void CDRPath::writeOut(librevenge::RVNGString ,
librevenge::RVNGString
-
-
- width = qy - py;
-- viewBox.sprintf("%i %i %i %i", 0, 0, (unsigned)(2540*(qx - px)),
(unsigned)(2540*(qy - py)));
-+ viewBox.sprintf("%i %i %i %i", 0, 0, (int)(2540*(qx - px)), (int)(2540*(qy
- py)));
-
- for (unsigned i = 0; i < vec.count(); ++i)
- {
-@@ -804,38 +804,38 @@ void CDRPath::writeOut(librevenge::RVNGString ,
librevenge::RVNGString
- if (vec[i]["librevenge:path-action"]->getStr() == "M")
- {
- // 2540 is 2.54*1000, 2.54 in = 1 inch
-- sElement.sprintf("M%i %i",
(unsigned)((vec[i]["svg:x"]->getDouble()-px)*2540),
-- (unsigned)((vec[i]["svg:y"]->getDouble()-py)*2540));
-+ sElement.sprintf("M%i %i",
(int)((vec[i]["svg:x"]->
Re: Missing files during libreoffice build
Hi, On Tue, 2019-12-24 at 08:19 +0100, Pieter van Oostrum wrote: > I am building libreoffice on my MacBook (MacOS High Sierra). > The goal is to do some development. > I am using lode to setup the build environment. I followed the recipe > in https://wiki.documentfoundation.org/Development/lode. Now I am at > the 'make' phase. > I had to interrupt the building process because my disk filled up. > After rebooting I started the 'make' again. But at the end at the > check there are missing files: > > Check for macosx > check binaries: +++ > check packaging files: ++ > check config files: > check setting files: > check cpp docu: > check java docu: + > check idl docu: > ERROR: "docs/idl/ref/index.html" is missing > > ERROR: "docs/idl/ref/classes.html" is missing > > and a lot more, all in docs/idl/ref/ > > Could this be caused by the interruption and restart of the build > process? > If so, is there a simple way to correct this, without redoing the > complete build, which takes hours, i.e. without doing a 'make clean'? "make odk.clean" should help. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - download.lst external/libxslt l10ntools/source
download.lst |5 +++-- external/libxslt/ExternalPackage_xslt.mk |4 ++-- external/libxslt/libxslt-msvc.patch.2|2 +- l10ntools/source/uimerge.cxx | 10 +- 4 files changed, 11 insertions(+), 10 deletions(-) New commits: commit 72ec85afa15cfda681c5320f466acd22b3987c10 Author: David Tardon AuthorDate: Tue Nov 7 19:50:04 2017 +0100 Commit: Michael Stahl CommitDate: Mon Nov 25 12:09:16 2019 +0100 upload libxslt 1.1.32 Reviewed-on: https://gerrit.libreoffice.org/44422 Tested-by: Jenkins Reviewed-by: David Tardon (cherry picked from commit c110dabbf0fcddf9da2e61d66ca093cf6e6c57a1) l10ntools: try to fix Win64 build failure in uimerge.cxx by moving libxslt includes first: Change-Id: I445919e1eeb188bb35da38c4b3a5007c1ae48e0a C:/PROGRA~2/WI3CF2~1/10/Include/10.0.17763.0/um\winnt.h(637): warning C4005: 'DECLARE_HANDLE': macro redefinition D:/cygwin/srv/Jenkins/workspace/04-LO-Win64/include\sal/main.h(87): note: see previous definition of 'DECLARE_HANDLE' C:/PROGRA~2/WI3CF2~1/10/Include/10.0.17763.0/shared\minwindef.h(250): error C2371: 'HINSTANCE': redefinition; different basic types D:/cygwin/srv/Jenkins/workspace/04-LO-Win64/include\sal/main.h(89): note: see declaration of 'HINSTANCE' Change-Id: Idee2f18dccdf309027142137683ac86735f575cc Reviewed-on: https://gerrit.libreoffice.org/83525 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/download.lst b/download.lst index 0020e1d19fd8..e2d4eb661eb2 100644 --- a/download.lst +++ b/download.lst @@ -97,8 +97,9 @@ export LIBXMLSEC_TARBALL := ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar. export LIBXML_MD5SUM := 10942a1dc23137a8aa07f0639cbfece5 export LIBXML_VERSION_MICRO := 10 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz -export LIBXSLT_MD5SUM := 70becbbcb1dad55f14de0b84171b91d5 -export LIBXSLT_TARBALL := libxslt-1.1.30.tar.gz +export LIBXSLT_MD5SUM := 1fc72f98e98bf4443f1651165f3aa146 +export LIBXSLT_VERSION_MICRO := 32 +export LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz export MDDS_MD5SUM := 8855cf852a6088cfdc792c6f7ceb0243 diff --git a/external/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk index 4354bd4b6191..f0fd5336297d 100644 --- a/external/libxslt/ExternalPackage_xslt.mk +++ b/external/libxslt/ExternalPackage_xslt.mk @@ -24,8 +24,8 @@ $(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.dll,wi $(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.dll,win32/bin.msvc/libexslt.dll)) endif else # OS!=WNT -$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.30)) -$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.18)) +$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.$(LIBXSLT_VERSION_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.20)) endif endif # DISABLE_DYNLOADING diff --git a/external/libxslt/libxslt-msvc.patch.2 b/external/libxslt/libxslt-msvc.patch.2 index 07e5dce578d8..1f538a5a7f88 100644 --- a/external/libxslt/libxslt-msvc.patch.2 +++ b/external/libxslt/libxslt-msvc.patch.2 @@ -1,7 +1,7 @@ --- build/libxslt-1.1.26/win32/Makefile.msvc.old 2010-10-20 01:02:55.359375000 +0200 +++ build/libxslt-1.1.26/win32/Makefile.msvc 2010-10-20 01:03:05.18750 +0200 @@ -54,6 +54,7 @@ - CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W3 $(CRUNTIME) /D "_REENTRANT" + CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /W3 /wd4244 /wd4267 $(CRUNTIME) /D "_REENTRANT" CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX) CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE +CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common diff --git a/l10ntools/source/uimerge.cxx b/l10ntools/source/uimerge.cxx index 5a53f49c9918..240e49d10f7e 100644 --- a/l10ntools/source/uimerge.cxx +++ b/l10ntools/source/uimerge.cxx @@ -7,17 +7,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include +#include +#include +#include + #include #include #include -#include -#include -#include -#include - #include #include "common.hxx" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - download.lst external/libabw solenv/flatpak-manifest.in
download.lst |4 +-
external/libabw/UnpackedTarball_libabw.mk |4 --
external/libabw/libabw-msvc.patch.1 | 46 --
solenv/flatpak-manifest.in|6 +--
4 files changed, 5 insertions(+), 55 deletions(-)
New commits:
commit d21dde86597dcb875ed2ba284165d7808ebe4fad
Author: David Tardon
AuthorDate: Sat Aug 17 16:46:47 2019 +0200
Commit: Andras Timar
CommitDate: Tue Sep 3 16:21:03 2019 +0200
upload libabw 0.1.3
Change-Id: Ibb45a473f49a9ba8f9cf53593dead375ac8a1951
Reviewed-on: https://gerrit.libreoffice.org/77639
Tested-by: Jenkins
Reviewed-by: David Tardon
Reviewed-on: https://gerrit.libreoffice.org/77884
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/78425
Tested-by: Andras Timar
diff --git a/download.lst b/download.lst
index 9c75372a2dae..45c5f12ab050 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-export ABW_SHA256SUM :=
0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485
-export ABW_TARBALL := libabw-0.1.2.tar.xz
+export ABW_SHA256SUM :=
e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed
+export ABW_TARBALL := libabw-0.1.3.tar.xz
export APACHE_COMMONS_LOGGING_SHA256SUM :=
49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81
export APACHE_COMMONS_LOGGING_TARBALL := commons-logging-1.2-src.tar.gz
export APR_SHA256SUM :=
1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb
diff --git a/external/libabw/UnpackedTarball_libabw.mk
b/external/libabw/UnpackedTarball_libabw.mk
index 27195d3a0ab3..7b9ba49e7e69 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -15,10 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libabw,0))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libabw))
-$(eval $(call gb_UnpackedTarball_add_patches,libabw, \
-external/libabw/libabw-msvc.patch.1 \
-))
-
ifeq ($(COM_IS_CLANG),TRUE)
ifneq ($(filter -fsanitize=%,$(CC)),)
$(eval $(call gb_UnpackedTarball_add_patches,libabw, \
diff --git a/external/libabw/libabw-msvc.patch.1
b/external/libabw/libabw-msvc.patch.1
deleted file mode 100644
index d14b122f9575..
--- a/external/libabw/libabw-msvc.patch.1
+++ /dev/null
@@ -1,46 +0,0 @@
-From 49f6461d4751d3b16e32ab8f9c93a3856b33be49 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna
-Date: Wed, 2 Aug 2017 14:53:36 +0200
-Subject: [PATCH] m4: MSVC defines __cplusplus as 199711L still
-
-See e.g.
-<https://stackoverflow.com/questions/37503029/cplusplus-is-equal-to-199711-in-msvc-does-it-support-c11>,
-on MSVC we can't depend on the value of __cplusplus, since that one is a
-too low value, even if everything else works fine.
- m4/ax_cxx_compile_stdcxx.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff -Naur a/configure b/configure
a/configure2017-08-02 14:50:09.0 +0200
-+++ b/configure2017-08-02 14:50:57.0 +0200
-@@ -16001,7 +16001,7 @@
-
- #error "This is not a C++ compiler"
-
--#elif __cplusplus < 201103L
-+#elif __cplusplus < 201103L && !(defined _MSC_VER)
-
- #error "This is not a C++11 compiler"
-
-@@ -16314,7 +16314,7 @@
-
- #error "This is not a C++ compiler"
-
--#elif __cplusplus < 201103L
-+#elif __cplusplus < 201103L && !(defined _MSC_VER)
-
- #error "This is not a C++11 compiler"
-
-@@ -16636,7 +16636,7 @@
-
- #error "This is not a C++ compiler"
-
--#elif __cplusplus < 201103L
-+#elif __cplusplus < 201103L && !(defined _MSC_VER)
-
- #error "This is not a C++11 compiler"
-
---
-2.12.3
-
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 45b7470a65a5..e6617fe0b590 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -192,10 +192,10 @@
"dest-filename":
"external/tarballs/libgpg-error-1.27.tar.bz2"
},
{
-"url":
"https://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz;,
-"sha256":
"0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485",
+"url":
"https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz;,
+"sha256":
"e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed",
"type": "file",
-"dest-filename": "external/tarballs/libabw-0.1.2.tar.xz"
+"dest-filename": "external/tarballs/libabw-0.1.3.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz;,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - download.lst external/libabw external/libvisio solenv/flatpak-manifest.in
download.lst |8 ++--
external/libabw/UnpackedTarball_libabw.mk |4 --
external/libabw/libabw-msvc.patch.1| 46 -
external/libvisio/0001-fix-debug-build.patch.1 | 40 -
external/libvisio/UnpackedTarball_libvisio.mk |1
external/libvisio/ubsan.patch |4 +-
solenv/flatpak-manifest.in | 12 +++---
7 files changed, 12 insertions(+), 103 deletions(-)
New commits:
commit 4cd02996eeec0c209271371d2a6ba2fa185a05e2
Author: David Tardon
AuthorDate: Sat Aug 17 17:06:07 2019 +0200
Commit: Andras Timar
CommitDate: Wed Aug 21 16:23:03 2019 +0200
upload libvisio 0.1.7
Change-Id: I4eb115c7c085b325370e9cd8f80e1b03f16f5033
Reviewed-on: https://gerrit.libreoffice.org/77640
Tested-by: Jenkins
Reviewed-by: David Tardon
Reviewed-on: https://gerrit.libreoffice.org/77885
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/download.lst b/download.lst
index 7ef1490a39aa..410215e48d77 100644
--- a/download.lst
+++ b/download.lst
@@ -250,8 +250,8 @@ export TWAIN_DSM_SHA256SUM :=
82c818be771f242388457aa8c807e4b52aa84dc22b21c6c561
export TWAIN_DSM_TARBALL := twaindsm_2.4.1.orig.tar.gz
export UCPP_SHA256SUM :=
983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-export VISIO_SHA256SUM :=
fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9
-export VISIO_TARBALL := libvisio-0.1.6.tar.xz
+export VISIO_SHA256SUM :=
8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c
+export VISIO_TARBALL := libvisio-0.1.7.tar.xz
export WPD_SHA256SUM :=
323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610
export WPD_VERSION_MICRO := 2
export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
diff --git a/external/libvisio/0001-fix-debug-build.patch.1
b/external/libvisio/0001-fix-debug-build.patch.1
deleted file mode 100644
index 4146e6e8bfe7..
--- a/external/libvisio/0001-fix-debug-build.patch.1
+++ /dev/null
@@ -1,40 +0,0 @@
-From 15f3774513d0181ad90da382297c175cc3424462 Mon Sep 17 00:00:00 2001
-From: David Tardon
-Date: Sun, 22 Oct 2017 21:24:43 +0200
-Subject: [PATCH] fix debug build
-
-Change-Id: I860b6034e5d833900652aec8c3647eeae185e538
- src/lib/VDXParser.cpp | 2 +-
- src/lib/VSDXParser.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp
-index f2f3154..0f07efd 100644
a/src/lib/VDXParser.cpp
-+++ b/src/lib/VDXParser.cpp
-@@ -916,7 +916,7 @@ xmlChar
*libvisio::VDXParser::readStringData(xmlTextReaderPtr reader)
- ret = xmlTextReaderRead(reader);
- if (1 == ret && stringValue)
- {
-- VSD_DEBUG_MSG(("VDXParser::readStringData stringValue %s\n", (const
char *)stringValue));
-+ VSD_DEBUG_MSG(("VDXParser::readStringData stringValue %s\n", (const
char *)stringValue.get()));
- return stringValue.release();
- }
- }
-diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp
-index 488be3a..efd46b9 100644
a/src/lib/VSDXParser.cpp
-+++ b/src/lib/VSDXParser.cpp
-@@ -555,7 +555,7 @@ xmlChar
*libvisio::VSDXParser::readStringData(xmlTextReaderPtr reader)
- std::unique_ptr
stringValue(xmlTextReaderGetAttribute(reader, BAD_CAST("V")), xmlFree);
- if (stringValue)
- {
--VSD_DEBUG_MSG(("VSDXParser::readStringData stringValue %s\n", (const char
*)stringValue));
-+VSD_DEBUG_MSG(("VSDXParser::readStringData stringValue %s\n", (const char
*)stringValue.get()));
- return stringValue.release();
- }
- return nullptr;
---
-2.14.1
-
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk
b/external/libvisio/UnpackedTarball_libvisio.mk
index 1ab8b392c4e8..eba43f3b7a6e 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -17,7 +17,6 @@ $(eval $(call
gb_UnpackedTarball_update_autoconf_configs,libvisio))
$(eval $(call gb_UnpackedTarball_add_patches,libvisio, \
external/libvisio/ubsan.patch \
-external/libvisio/0001-fix-debug-build.patch.1 \
))
ifeq ($(COM_IS_CLANG),TRUE)
diff --git a/external/libvisio/ubsan.patch b/external/libvisio/ubsan.patch
index 7bba63fda7a1..c9ffbd98f4b6 100644
--- a/external/libvisio/ubsan.patch
+++ b/external/libvisio/ubsan.patch
@@ -4,8 +4,8 @@
}
if (U_SUCCESS(status) && conv)
{
-- const char *src = (const char *)[0];
-+ const char *src = (const char *)characters.data();
+- const auto *src = (const char *)[0];
++ const auto *src = (const char *)characters.data();
const char *srcLimit = (const char *)src + characters.size();
while (src < srcLimit)
{
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
ind
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - 2 commits - download.lst external/libabw external/libvisio solenv/flatpak-manifest.in
download.lst |8 ++--
external/libabw/UnpackedTarball_libabw.mk |4 --
external/libabw/libabw-msvc.patch.1| 46 -
external/libvisio/0001-fix-debug-build.patch.1 | 40 -
external/libvisio/UnpackedTarball_libvisio.mk |1
external/libvisio/ubsan.patch |4 +-
solenv/flatpak-manifest.in | 12 +++---
7 files changed, 12 insertions(+), 103 deletions(-)
New commits:
commit f8bc846025bfafc543a4c25bdfa78952efdbb0e6
Author: David Tardon
AuthorDate: Sat Aug 17 16:46:47 2019 +0200
Commit: Caolán McNamara
CommitDate: Sat Aug 17 21:45:23 2019 +0200
upload libabw 0.1.3
Change-Id: Ibb45a473f49a9ba8f9cf53593dead375ac8a1951
Reviewed-on: https://gerrit.libreoffice.org/77643
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/download.lst b/download.lst
index 4d6b8520f566..2b4a0b1b4688 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-export ABW_SHA256SUM :=
0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485
-export ABW_TARBALL := libabw-0.1.2.tar.xz
+export ABW_SHA256SUM :=
e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed
+export ABW_TARBALL := libabw-0.1.3.tar.xz
export APACHE_COMMONS_LOGGING_SHA256SUM :=
49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81
export APACHE_COMMONS_LOGGING_TARBALL := commons-logging-1.2-src.tar.gz
export APR_SHA256SUM :=
1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb
diff --git a/external/libabw/UnpackedTarball_libabw.mk
b/external/libabw/UnpackedTarball_libabw.mk
index 212abfbc4674..bb7e1fb4ae8c 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -15,10 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libabw,0))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libabw))
-$(eval $(call gb_UnpackedTarball_add_patches,libabw, \
-external/libabw/libabw-msvc.patch.1 \
-))
-
ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
$(eval $(call gb_UnpackedTarball_add_patches,libabw, \
external/libabw/ubsan-visibility.patch \
diff --git a/external/libabw/libabw-msvc.patch.1
b/external/libabw/libabw-msvc.patch.1
deleted file mode 100644
index d14b122f9575..
--- a/external/libabw/libabw-msvc.patch.1
+++ /dev/null
@@ -1,46 +0,0 @@
-From 49f6461d4751d3b16e32ab8f9c93a3856b33be49 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna
-Date: Wed, 2 Aug 2017 14:53:36 +0200
-Subject: [PATCH] m4: MSVC defines __cplusplus as 199711L still
-
-See e.g.
-<https://stackoverflow.com/questions/37503029/cplusplus-is-equal-to-199711-in-msvc-does-it-support-c11>,
-on MSVC we can't depend on the value of __cplusplus, since that one is a
-too low value, even if everything else works fine.
- m4/ax_cxx_compile_stdcxx.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff -Naur a/configure b/configure
a/configure2017-08-02 14:50:09.0 +0200
-+++ b/configure2017-08-02 14:50:57.0 +0200
-@@ -16001,7 +16001,7 @@
-
- #error "This is not a C++ compiler"
-
--#elif __cplusplus < 201103L
-+#elif __cplusplus < 201103L && !(defined _MSC_VER)
-
- #error "This is not a C++11 compiler"
-
-@@ -16314,7 +16314,7 @@
-
- #error "This is not a C++ compiler"
-
--#elif __cplusplus < 201103L
-+#elif __cplusplus < 201103L && !(defined _MSC_VER)
-
- #error "This is not a C++11 compiler"
-
-@@ -16636,7 +16636,7 @@
-
- #error "This is not a C++ compiler"
-
--#elif __cplusplus < 201103L
-+#elif __cplusplus < 201103L && !(defined _MSC_VER)
-
- #error "This is not a C++11 compiler"
-
---
-2.12.3
-
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 7bb0e47db52e..e8849d22807c 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -203,10 +203,10 @@
"dest-filename":
"external/tarballs/libgpg-error-1.27.tar.bz2"
},
{
-"url":
"https://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz;,
-"sha256":
"0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485",
+"url":
"https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz;,
+"sha256":
"e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed",
"type": "file",
-"dest-filename": "external/tarballs/libabw-0.1.2.tar.xz"
+"dest-filename": "external/tarballs/libabw-0.1.3.tar.xz"
},
{
"url
[Libreoffice-commits] core.git: download.lst external/libvisio solenv/flatpak-manifest.in
download.lst |4 +-
external/libvisio/0001-fix-debug-build.patch.1 | 40 -
external/libvisio/UnpackedTarball_libvisio.mk |1
external/libvisio/ubsan.patch |4 +-
solenv/flatpak-manifest.in |6 +--
5 files changed, 7 insertions(+), 48 deletions(-)
New commits:
commit d83472ab6fde650772307f7f93a0a4b96e7ea6a8
Author: David Tardon
AuthorDate: Sat Aug 17 17:06:07 2019 +0200
Commit: David Tardon
CommitDate: Sat Aug 17 18:36:51 2019 +0200
upload libvisio 0.1.7
Change-Id: I4eb115c7c085b325370e9cd8f80e1b03f16f5033
Reviewed-on: https://gerrit.libreoffice.org/77640
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/download.lst b/download.lst
index 2491472e574a..4539a35a9b3c 100644
--- a/download.lst
+++ b/download.lst
@@ -238,8 +238,8 @@ export TWAIN_DSM_SHA256SUM :=
82c818be771f242388457aa8c807e4b52aa84dc22b21c6c561
export TWAIN_DSM_TARBALL := twaindsm_2.4.1.orig.tar.gz
export UCPP_SHA256SUM :=
983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-export VISIO_SHA256SUM :=
fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9
-export VISIO_TARBALL := libvisio-0.1.6.tar.xz
+export VISIO_SHA256SUM :=
8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c
+export VISIO_TARBALL := libvisio-0.1.7.tar.xz
export WPD_SHA256SUM :=
2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09
export WPD_VERSION_MICRO := 3
export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
diff --git a/external/libvisio/0001-fix-debug-build.patch.1
b/external/libvisio/0001-fix-debug-build.patch.1
deleted file mode 100644
index 4146e6e8bfe7..
--- a/external/libvisio/0001-fix-debug-build.patch.1
+++ /dev/null
@@ -1,40 +0,0 @@
-From 15f3774513d0181ad90da382297c175cc3424462 Mon Sep 17 00:00:00 2001
-From: David Tardon
-Date: Sun, 22 Oct 2017 21:24:43 +0200
-Subject: [PATCH] fix debug build
-
-Change-Id: I860b6034e5d833900652aec8c3647eeae185e538
- src/lib/VDXParser.cpp | 2 +-
- src/lib/VSDXParser.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp
-index f2f3154..0f07efd 100644
a/src/lib/VDXParser.cpp
-+++ b/src/lib/VDXParser.cpp
-@@ -916,7 +916,7 @@ xmlChar
*libvisio::VDXParser::readStringData(xmlTextReaderPtr reader)
- ret = xmlTextReaderRead(reader);
- if (1 == ret && stringValue)
- {
-- VSD_DEBUG_MSG(("VDXParser::readStringData stringValue %s\n", (const
char *)stringValue));
-+ VSD_DEBUG_MSG(("VDXParser::readStringData stringValue %s\n", (const
char *)stringValue.get()));
- return stringValue.release();
- }
- }
-diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp
-index 488be3a..efd46b9 100644
a/src/lib/VSDXParser.cpp
-+++ b/src/lib/VSDXParser.cpp
-@@ -555,7 +555,7 @@ xmlChar
*libvisio::VSDXParser::readStringData(xmlTextReaderPtr reader)
- std::unique_ptr
stringValue(xmlTextReaderGetAttribute(reader, BAD_CAST("V")), xmlFree);
- if (stringValue)
- {
--VSD_DEBUG_MSG(("VSDXParser::readStringData stringValue %s\n", (const char
*)stringValue));
-+VSD_DEBUG_MSG(("VSDXParser::readStringData stringValue %s\n", (const char
*)stringValue.get()));
- return stringValue.release();
- }
- return nullptr;
---
-2.14.1
-
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk
b/external/libvisio/UnpackedTarball_libvisio.mk
index 0ff189261f42..9462075ec293 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -17,7 +17,6 @@ $(eval $(call
gb_UnpackedTarball_update_autoconf_configs,libvisio))
$(eval $(call gb_UnpackedTarball_add_patches,libvisio, \
external/libvisio/ubsan.patch \
-external/libvisio/0001-fix-debug-build.patch.1 \
))
ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
diff --git a/external/libvisio/ubsan.patch b/external/libvisio/ubsan.patch
index 7bba63fda7a1..c9ffbd98f4b6 100644
--- a/external/libvisio/ubsan.patch
+++ b/external/libvisio/ubsan.patch
@@ -4,8 +4,8 @@
}
if (U_SUCCESS(status) && conv)
{
-- const char *src = (const char *)[0];
-+ const char *src = (const char *)characters.data();
+- const auto *src = (const char *)[0];
++ const auto *src = (const char *)characters.data();
const char *srcLimit = (const char *)src + characters.size();
while (src < srcLimit)
{
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index c4a36fc0d8dc..e8849d22807c 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -299,10 +299,10 @@
"dest-filename": "external/tarballs/ltm-1.0.zip"
},
[Libreoffice-commits] core.git: download.lst external/libabw solenv/flatpak-manifest.in
download.lst |4 +-
external/libabw/UnpackedTarball_libabw.mk |4 --
external/libabw/libabw-msvc.patch.1 | 46 --
solenv/flatpak-manifest.in|6 +--
4 files changed, 5 insertions(+), 55 deletions(-)
New commits:
commit 2a733f30cc994ead8cc3d1e64947bba6e8fe3924
Author: David Tardon
AuthorDate: Sat Aug 17 16:46:47 2019 +0200
Commit: David Tardon
CommitDate: Sat Aug 17 18:28:21 2019 +0200
upload libabw 0.1.3
Change-Id: Ibb45a473f49a9ba8f9cf53593dead375ac8a1951
Reviewed-on: https://gerrit.libreoffice.org/77639
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/download.lst b/download.lst
index 046b440cd379..2491472e574a 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-export ABW_SHA256SUM :=
0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485
-export ABW_TARBALL := libabw-0.1.2.tar.xz
+export ABW_SHA256SUM :=
e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed
+export ABW_TARBALL := libabw-0.1.3.tar.xz
export APACHE_COMMONS_LOGGING_SHA256SUM :=
49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81
export APACHE_COMMONS_LOGGING_TARBALL := commons-logging-1.2-src.tar.gz
export APR_SHA256SUM :=
1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb
diff --git a/external/libabw/UnpackedTarball_libabw.mk
b/external/libabw/UnpackedTarball_libabw.mk
index 212abfbc4674..bb7e1fb4ae8c 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -15,10 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libabw,0))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libabw))
-$(eval $(call gb_UnpackedTarball_add_patches,libabw, \
-external/libabw/libabw-msvc.patch.1 \
-))
-
ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
$(eval $(call gb_UnpackedTarball_add_patches,libabw, \
external/libabw/ubsan-visibility.patch \
diff --git a/external/libabw/libabw-msvc.patch.1
b/external/libabw/libabw-msvc.patch.1
deleted file mode 100644
index d14b122f9575..
--- a/external/libabw/libabw-msvc.patch.1
+++ /dev/null
@@ -1,46 +0,0 @@
-From 49f6461d4751d3b16e32ab8f9c93a3856b33be49 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna
-Date: Wed, 2 Aug 2017 14:53:36 +0200
-Subject: [PATCH] m4: MSVC defines __cplusplus as 199711L still
-
-See e.g.
-<https://stackoverflow.com/questions/37503029/cplusplus-is-equal-to-199711-in-msvc-does-it-support-c11>,
-on MSVC we can't depend on the value of __cplusplus, since that one is a
-too low value, even if everything else works fine.
- m4/ax_cxx_compile_stdcxx.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff -Naur a/configure b/configure
a/configure2017-08-02 14:50:09.0 +0200
-+++ b/configure2017-08-02 14:50:57.0 +0200
-@@ -16001,7 +16001,7 @@
-
- #error "This is not a C++ compiler"
-
--#elif __cplusplus < 201103L
-+#elif __cplusplus < 201103L && !(defined _MSC_VER)
-
- #error "This is not a C++11 compiler"
-
-@@ -16314,7 +16314,7 @@
-
- #error "This is not a C++ compiler"
-
--#elif __cplusplus < 201103L
-+#elif __cplusplus < 201103L && !(defined _MSC_VER)
-
- #error "This is not a C++11 compiler"
-
-@@ -16636,7 +16636,7 @@
-
- #error "This is not a C++ compiler"
-
--#elif __cplusplus < 201103L
-+#elif __cplusplus < 201103L && !(defined _MSC_VER)
-
- #error "This is not a C++11 compiler"
-
---
-2.12.3
-
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index ba51f89fb7af..c4a36fc0d8dc 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -203,10 +203,10 @@
"dest-filename":
"external/tarballs/libgpg-error-1.27.tar.bz2"
},
{
-"url":
"https://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz;,
-"sha256":
"0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485",
+"url":
"https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz;,
+"sha256":
"e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed",
"type": "file",
-"dest-filename": "external/tarballs/libabw-0.1.2.tar.xz"
+"dest-filename": "external/tarballs/libabw-0.1.3.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz;,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANN] libabw 0.1.3 has been released
libabw is a library for import of Abiword documents. List of changes: - Fix a memory access error found by oss-fuzz. - Configure with --disable-werror by default. - Disable expanding entities by XML parser as a vulnerability prevention measure. Abiword-saved documents do not contain entities, so there is no difference in behavior. Home page: https://wiki.documentfoundation.org/DLP/Libraries/libabw Download from: http://dev-www.libreoffice.org/src/libabw/ Note: As an experiment, only xz-compressed tarball has been uploaded. If there is anyone who still needs gzip- or bzip2-compressed tarballs, please let me know and I will upload them too. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANN] libvisio 0.1.7 has been released
libvisio is a library for import of MS Visio documents. List of changes: - Fix a few memory leaks found by oss-fuzz. - Fix date and time conversion to string. (tdf#98291) - Fix number conversion to string. (tdf#76829) - Fix unit conversion. (tdf#126292) - Handle more arrow styles. (tdf#126402) - Fix some issues found by Coverity. - Disable expanding entities by XML parser as a vulnerability prevention measure. Applications writing VSDX/VDX documents do not use entities, so there is no difference in behavior. Home page: https://wiki.documentfoundation.org/DLP/Libraries/libvisio Download from: http://dev-www.libreoffice.org/src/libvisio/ Note: As an experiment, only xz-compressed tarball has been uploaded. If there is anyone who still needs gzip- or bzip2-compressed tarballs, please let me know and I will upload them too. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] minutes of ESC call ...
On Thu, 2019-06-27 at 15:22 +0100, Michael Meeks wrote: > + fuzzit https://fuzzit.dev/ available > + offering things to OSS projects – but looks like oss-fuzz > + seem to be pushing hard to encourage people to use it > + may look on return from vacation For the record, there is also https://fuzzbuzz.io/ , which appears to be another of the same. (Automatic fuzzing is becoming popular, eh?) But I don't think there's much value in using another service that uses the same fuzzing engine(s) internally... D. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] minutes of ESC call ...
On Thu, 2019-06-27 at 15:22 +0100, Michael Meeks wrote: > + fuzzit https://fuzzit.dev/ available > + offering things to OSS projects – but looks like oss-fuzz > + seem to be pushing hard to encourage people to use it > + may look on return from vacation For the record, there is also https://fuzzbuzz.io/ , which appears to be another of the same. (Automatic fuzzing is becoming popular, eh?) But I don't think there's much value in using another service that uses the same fuzzing engine(s) internally... D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/libodfgen
external/libodfgen/README |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8e71900531f39cb604e0658316c32e6b75c9dd14 Author: David Tardon AuthorDate: Thu May 16 14:16:10 2019 +0200 Commit: David Tardon CommitDate: Thu May 16 14:19:29 2019 +0200 update libodfgen README a bit Change-Id: I9d0a7e782b1bd5955cb524153b8a7bdea9e174e7 diff --git a/external/libodfgen/README b/external/libodfgen/README index efeffac5dc21..01454e0d93ab 100644 --- a/external/libodfgen/README +++ b/external/libodfgen/README @@ -1 +1 @@ -From [http://libwpg.sourceforge.net/]. Library to generate ODT and ODG documents from libwpd and libwpg API calls. +From [https://sourceforge.net/p/libwpd/wiki/libodfgen/]. Library to generate ODT and ODG documents from librevenge API calls. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw solenv/flatpak-manifest.in writerperfect/qa
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
AuthorDate: Thu Apr 18 20:04:51 2019 +0200
Commit: David Tardon
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
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..
--- 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
-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 )
- 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
-$
Re: GSOC 2019 - Project Proposal
Dear Sir/Ma'am, On Mon, 2019-04-01 at 18:22 +0530, Apoorv Jain wrote: > I am interested in contributing to the libre-office as it has some > really great projects to work upon and also they align with my > experience. I am mainly interested in "Improve Adobe Pagemaker import > filter". > > The project is based on Python, which is my domain of interest. It's plain to us that you haven't even read the description of the task, as it clearly says that the library is implemented in C++ (Python is only needed for OLEToy, a tool we use to help us with reverse- engineering). In addition, you're very late; you were supposed to appear during the previous phase. Nevertheless, we'll give you a chance to qualify: There are two PageMaker documents in https://people.freedesktop.org/~dtardon/pm/, one in 6.5 and the other in 6(.0) format. Kindly download them and fix the libpagemaker code so they are displayed correctly. Once you've done that, we can talk about application. Hoping to see your change requests (and potential pull requests for oletoy) at your earliest possible convenience. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building Error ./autogen.sh
Hi, On Fri, 2019-01-18 at 15:56 -0700, hakan wrote: > Now I receive > > checking whether to use specific JVM search path at runtime... no > checking for ant... /usr/bin/ant > checking if /usr/share/ant/bin/ant works... configure: error: Ant > does not > work - Some Java projects will not build! > Error running configure at ./autogen.sh line 296. Please put config.log to a pastebin somewhere (e.g., https://paste.debian.net) and post the link here. Alternatively, if you don't care about the few java parts of LibreOffice, add --without-java into autogen.input . D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 2 commits - download.lst external/poppler
download.lst |4 +-
external/poppler/0001-Fix-building-with-old-clang.patch.1 | 25
external/poppler/ExternalProject_poppler.mk |2 -
external/poppler/UnpackedTarball_poppler.mk |1
external/poppler/ubsan.patch.0| 28 +++---
5 files changed, 44 insertions(+), 16 deletions(-)
New commits:
commit 4490513018868f1752c693c9480d28277920a3e0
Author: David Tardon
Date: Thu Sep 7 15:50:09 2017 +0200
upload poppler 0.59.0
Change-Id: I21dfa3aa04bd960cb2fb87a53213ae4bbd510a24
Reviewed-on: https://gerrit.libreoffice.org/42061
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit 1c983335116a6f09cabf0b3eae7f5195341e)
Reviewed-on: https://gerrit.libreoffice.org/56256
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/download.lst b/download.lst
index ccd5e8b3b1bd..5677ab58e433 100644
--- a/download.lst
+++ b/download.lst
@@ -129,8 +129,8 @@ export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2
export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
export PNG_MD5SUM := 897ccec1ebfb0922e83c2bfaa1be8748
export PNG_TARBALL := libpng-1.6.28.tar.gz
-export POPPLER_MD5SUM := f7a8230626b6d2061acfdc852930b7dd
-export POPPLER_TARBALL := poppler-0.55.0.tar.xz
+export POPPLER_MD5SUM := 6e44408a3b4f4a738f8a6770d0aea8a5
+export POPPLER_TARBALL := poppler-0.59.0.tar.xz
export POSTGRESQL_TARBALL :=
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
ifeq ($(PYTHON_VERSION_MINOR),3)
diff --git a/external/poppler/0001-Fix-building-with-old-clang.patch.1
b/external/poppler/0001-Fix-building-with-old-clang.patch.1
new file mode 100644
index ..dcddd11d2967
--- /dev/null
+++ b/external/poppler/0001-Fix-building-with-old-clang.patch.1
@@ -0,0 +1,25 @@
+From dd80c182cbcb188af0dd590f222ba9bbb31e3fb7 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid
+Date: Mon, 4 Sep 2017 19:36:06 +0200
+Subject: [PATCH] Fix building with old clang
+
+---
+ poppler/StructElement.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/poppler/StructElement.cc b/poppler/StructElement.cc
+index 0fbd336a..451213f8 100644
+--- a/poppler/StructElement.cc
b/poppler/StructElement.cc
+@@ -248,6 +248,8 @@ struct AttributeMapEntry {
+ };
+
+ struct AttributeDefaults {
++ AttributeDefaults() {}; // needed to support old clang
++
+ Object Inline = Object(objName, "Inline");
+ Object LrTb = Object(objName, "LrTb");
+ Object Normal = Object(objName, "Normal");
+--
+2.13.5
+
diff --git a/external/poppler/UnpackedTarball_poppler.mk
b/external/poppler/UnpackedTarball_poppler.mk
index f72c040c513b..94c8eb650dbc 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/poppler-mac-fake.patch.1 \
external/poppler/ubsan.patch.0 \
external/poppler/poppler-libjpeg.patch.1 \
+ external/poppler/0001-Fix-building-with-old-clang.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/poppler/ubsan.patch.0 b/external/poppler/ubsan.patch.0
index e0bf164ce7fc..f6e4667dc133 100644
--- a/external/poppler/ubsan.patch.0
+++ b/external/poppler/ubsan.patch.0
@@ -9,7 +9,7 @@
{
doc = docA;
xref = doc->getXRef();
- aobj->copy();
+ obj = aobj->copy();
- Dict* dict = obj.getDict();
ref.num = ref.gen = 0;
type = ty;
@@ -23,9 +23,9 @@
+void FormField::init(std::set *usedParents)
+{
+ Dict* dict = obj.getDict();
- Object obj1;
//childs
- if (dict->lookup("Kids", )->isArray()) {
+ Object obj1 = dict->lookup("Kids");
+ if (obj1.isArray()) {
@@ -803,9 +806,15 @@
//
// FormFieldButton
@@ -80,14 +80,16 @@
numChoices = 0;
choices = NULL;
editedChoice = NULL;
-@@ -1379,9 +1400,15 @@
+@@ -1379,11 +1400,17 @@
//
// FormFieldSignature
//
-FormFieldSignature::FormFieldSignature(PDFDoc *docA, Object *dict, const Ref&
ref, FormField *parent, std::set *usedParents)
-- : FormField(docA, dict, ref, parent, usedParents, formSignature)
+- : FormField(docA, dict, ref, parent, usedParents, formSignature),
+FormFieldSignature::FormFieldSignature(PDFDoc *docA, Object *dict, const Ref&
ref, FormField *parent)
-+ : FormField(docA, dict, ref, parent, formSignature)
++ : FormField(docA, dict, ref, parent, formSignature),
+ signature_type(adbe_pkcs7_detached),
+ signature(nullptr), signature_info(nullptr)
{
+}
+
@@ -99,9 +101,9 @@
signature_info = new SignatureInfo();
@@ -16
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 2 commits - download.lst external/poppler
download.lst|4 +-
external/poppler/UnpackedTarball_poppler.mk |2 -
external/poppler/poppler-0.46.0-std-max.patch.1 | 10 --
external/poppler/poppler-vs2013.patch.1 | 11 ---
external/poppler/ubsan.patch.0 | 37
5 files changed, 2 insertions(+), 62 deletions(-)
New commits:
commit b5411a225f25f7157649fcd42b710396b609d62c
Author: David Tardon
Date: Wed Nov 23 13:47:52 2016 +0100
upload poppler 0.49.0
Change-Id: I98508a1a2b57c7b39d5be3bf216271001b6a0427
Reviewed-on: https://gerrit.libreoffice.org/3
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit 6f1ae11761ddfa2f928254ff51f1860155f670a4)
Signed-off-by: David Tardon
(cherry picked from commit b1d30ac04e95e72883c759110df6d5e46ce94510)
Reviewed-on: https://gerrit.libreoffice.org/56254
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/download.lst b/download.lst
index 958ed3048252..18681926e860 100644
--- a/download.lst
+++ b/download.lst
@@ -129,8 +129,8 @@ export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2
export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
export PNG_MD5SUM := 897ccec1ebfb0922e83c2bfaa1be8748
export PNG_TARBALL := libpng-1.6.28.tar.gz
-export POPPLER_MD5SUM := 8d61c91cb9e99ad38bba1b0b4432f174
-export POPPLER_TARBALL := poppler-0.48.0.tar.xz
+export POPPLER_MD5SUM := 9e057ed8eee1f9979fa75d8f044783b8
+export POPPLER_TARBALL := poppler-0.49.0.tar.xz
export POSTGRESQL_TARBALL :=
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
ifeq ($(PYTHON_VERSION_MINOR),3)
diff --git a/external/poppler/UnpackedTarball_poppler.mk
b/external/poppler/UnpackedTarball_poppler.mk
index afad5fba13b6..f72c040c513b 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -15,8 +15,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/poppler-notests.patch.1 \
$(if $(filter
MSC-120,$(COM)-$(VCVER)),external/poppler/poppler-snprintf.patch.1) \
external/poppler/poppler-mac-fake.patch.1 \
- external/poppler/poppler-vs2013.patch.1 \
- external/poppler/poppler-0.46.0-std-max.patch.1 \
external/poppler/ubsan.patch.0 \
external/poppler/poppler-libjpeg.patch.1 \
))
diff --git a/external/poppler/poppler-0.46.0-std-max.patch.1
b/external/poppler/poppler-0.46.0-std-max.patch.1
deleted file mode 100644
index 96a9abe88695..
--- a/external/poppler/poppler-0.46.0-std-max.patch.1
+++ /dev/null
@@ -1,10 +0,0 @@
a/poppler/PSOutputDev.cc
-+++ b/poppler/PSOutputDev.cc
-@@ -48,6 +48,7 @@
- #include
- #include
- #include
-+#include
- #include "goo/GooString.h"
- #include "goo/GooList.h"
- #include "goo/GooHash.h"
diff --git a/external/poppler/poppler-vs2013.patch.1
b/external/poppler/poppler-vs2013.patch.1
deleted file mode 100644
index ca892dfc2500..
--- a/external/poppler/poppler-vs2013.patch.1
+++ /dev/null
@@ -1,11 +0,0 @@
poppler/poppler/poppler-config.h.in
-+++ poppler/poppler/poppler-config.h.in
-@@ -186,7 +186,7 @@ char * strtok_r (char *s, const char *delim, char
**save_ptr);
- #define GCC_PRINTF_FORMAT(fmt_index, va_index)
- #endif
-
--#if defined(_MSC_VER)
-+#if defined(_MSC_VER) && _MSC_VER < 1800
- #define fmax(a, b) std::max(a, b)
- #define fmin(a, b) std::min(a, b)
- #endif
commit 8096faecce90b327c4ff0e0951460411471e52c8
Author: Michael Stahl
Date: Thu Nov 3 11:13:29 2016 +0100
poppler: remove obsolete ubsan patch hunk
With eea709f67d91e271e3df37e6c6724b7b5870b1ee "poppler: build against
libjpeg" the poppler internal JPEG code is no longer used.
Change-Id: I018a53a495ec505af92bb9b1c1a0c42e0a4f35b8
(cherry picked from commit 21ca0db5ec27662a3e047d7547eae9beb87b0b01)
Reviewed-on: https://gerrit.libreoffice.org/56253
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/external/poppler/ubsan.patch.0 b/external/poppler/ubsan.patch.0
index 575cb47dc682..67675253b5ad 100644
--- a/external/poppler/ubsan.patch.0
+++ b/external/poppler/ubsan.patch.0
@@ -216,43 +216,6 @@
SignatureInfo *validateSignature(bool doVerifyCert, bool forceRevalidation);
poppler/Stream.cc
-+++ poppler/Stream.cc
-@@ -2966,12 +2966,12 @@
- } else {
- amp = 0;
- }
-- data[0] += (*prevDC += amp) << scanInfo.al;
-+ data[0] += (int) ((unsigned) (*prevDC += amp) << scanInfo.al);
- } else {
- if ((bit = readBit()) == ) {
- return gFalse;
- }
-- data[0] += bit << scanInfo.al;
-+ data[0] += (unsigned) bit << scanInfo.al;
- }
- ++i;
- }
-@@ -3064,7 +3064,7 @@
- j = dctZigZag[i++];
- }
- }
-- data[j] = amp << scanInfo.al;
-+
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 2 commits - download.lst external/poppler
download.lst |4
external/poppler/UnpackedTarball_poppler.mk |1
external/poppler/poppler-0.46.0-unused-private-field.patch.1 | 11
external/poppler/ubsan.patch.0 | 229 ++-
4 files changed, 220 insertions(+), 25 deletions(-)
New commits:
commit 7f51b445b4dd3950527d826c01091be4e9a77be0
Author: David Tardon
Date: Sat Oct 22 10:16:56 2016 +0200
upload poppler 0.48.0
Change-Id: I18c49505f71ab609e5cc0e4db759152c3c1d5825
(cherry picked from commit dc522a114d24ad7c550c072d4f29f50a62260b77)
Reviewed-on: https://gerrit.libreoffice.org/56252
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/download.lst b/download.lst
index 42ed25265e27..958ed3048252 100644
--- a/download.lst
+++ b/download.lst
@@ -129,8 +129,8 @@ export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2
export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
export PNG_MD5SUM := 897ccec1ebfb0922e83c2bfaa1be8748
export PNG_TARBALL := libpng-1.6.28.tar.gz
-export POPPLER_MD5SUM := 38c758d84437378ec4f5aae9f875301d
-export POPPLER_TARBALL := poppler-0.46.0.tar.bz2
+export POPPLER_MD5SUM := 8d61c91cb9e99ad38bba1b0b4432f174
+export POPPLER_TARBALL := poppler-0.48.0.tar.xz
export POSTGRESQL_TARBALL :=
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
ifeq ($(PYTHON_VERSION_MINOR),3)
diff --git a/external/poppler/UnpackedTarball_poppler.mk
b/external/poppler/UnpackedTarball_poppler.mk
index efcbee7c7e0f..afad5fba13b6 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/poppler-mac-fake.patch.1 \
external/poppler/poppler-vs2013.patch.1 \
external/poppler/poppler-0.46.0-std-max.patch.1 \
- external/poppler/poppler-0.46.0-unused-private-field.patch.1 \
external/poppler/ubsan.patch.0 \
external/poppler/poppler-libjpeg.patch.1 \
))
diff --git a/external/poppler/poppler-0.46.0-unused-private-field.patch.1
b/external/poppler/poppler-0.46.0-unused-private-field.patch.1
deleted file mode 100644
index e0765fc92251..
--- a/external/poppler/poppler-0.46.0-unused-private-field.patch.1
+++ /dev/null
@@ -1,11 +0,0 @@
a/goo/GooString.h
-+++ b/goo/GooString.h
-@@ -175,7 +175,7 @@
- // You can tweak the final object size for different time/space tradeoffs.
- // In libc malloc(), rounding is 16 so it's best to choose a value that
- // is a multiple of 16.
-- class MemoryLayout {
-+ struct MemoryLayout {
- char c[sizeof(char*)];
- int i;
- char* s;
diff --git a/external/poppler/ubsan.patch.0 b/external/poppler/ubsan.patch.0
index a27f00f790d2..575cb47dc682 100644
--- a/external/poppler/ubsan.patch.0
+++ b/external/poppler/ubsan.patch.0
@@ -1,14 +1,3 @@
goo/GooString.cc
-+++ goo/GooString.cc
-@@ -161,7 +161,7 @@
- // assert(s != s1) the roundedSize condition ensures this
- if (newLength < length) {
- memcpy(s1, s, newLength);
-- } else {
-+ } else if (length != 0) {
- memcpy(s1, s, length);
- }
- if (s != sStatic)
--- poppler/Form.cc
+++ poppler/Form.cc
@@ -463,12 +463,11 @@
commit 3c181843cb878f4ac5a563e0ceff582d46763a45
Author: Stephan Bergmann
Date: Fri Oct 14 15:34:53 2016 +0200
external/poppler: Avoid UBSan warning about undefined downcast
...of this-ptr of in-construction FormFieldSignature while still in the base
FormField ctor, as happens (in the xpdfimport process) during
CppunitTest_xmlsecurity_signing:
> Form.cc:448:12: runtime error: downcast of address 0x60f00040 which
does not point to an object of type 'FormFieldSignature'
> 0x60f00040: note: object is of type 'FormField'
> 03 00 00 6d 50 84 f2 00 00 00 00 00 03 00 00 00 04 00 00 00 00 00 00
00 01 be be be 07 00 00 00
> ^~~
> vptr for 'FormField'
> #0 0x73d7f4 in FormWidgetSignature::FormWidgetSignature(PDFDoc*,
Object*, unsigned int, Ref, FormField*)
workdir/UnpackedTarball/poppler/poppler/Form.cc:448:12
> #1 0x741713 in FormField::_createWidget(Object*, Ref)
workdir/UnpackedTarball/poppler/poppler/Form.cc:677:34
> #2 0x73e747 in FormField::FormField(PDFDoc*, Object*, Ref const&,
FormField*, std::set, std::allocator >*,
FormFieldType) workdir/UnpackedTarball/poppler/poppler/Form.cc:547:7
> #3 0x74ec2b in FormFieldSignature::FormFieldSignature(PDFDoc*,
Object*, Ref const&, FormField*, std::set,
std::allocator >*) workdir/UnpackedTarball/poppler/poppler/Form.cc:1383:5
> #4 0x740d7f in Form::createFieldFromDict(Object*, PDFDoc*, Ref
const&, FormField*, std::set, std::allocator >*)
workdir/UnpackedTarball
[Libreoffice-commits] core.git: external/libmwaw
external/libmwaw/Library_mwaw.mk |1 - 1 file changed, 1 deletion(-) New commits: commit d5d7f94f4911b293812d421493ae0c633628bba1 Author: David Tardon Date: Wed Jun 13 15:54:18 2018 +0200 drop unneeded define Change-Id: Icced4a3f9a7ad4cbcc908412e577b4dfb85fc6eb Reviewed-on: https://gerrit.libreoffice.org/55757 Tested-by: Jenkins Reviewed-by: David Tardon diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk index 0b28836cdb80..fbdd9e1cf1da 100644 --- a/external/libmwaw/Library_mwaw.mk +++ b/external/libmwaw/Library_mwaw.mk @@ -26,7 +26,6 @@ $(eval $(call gb_Library_add_defs,mwaw,\ -DBUILD_MWAW \ -DNDEBUG \ -D_WINDLL \ - -DSHAREDPTR_STD \ )) $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libwps
external/libwps/Library_wps.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 2821e958256e1233db76af2f1de0065b7f04b217 Author: David Tardon Date: Wed Jun 13 15:53:14 2018 +0200 drop unneeded define Change-Id: Idb825a2c96089c53c2734783e0bad02ba3c0f592 Reviewed-on: https://gerrit.libreoffice.org/55755 Tested-by: Jenkins Reviewed-by: David Tardon diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk index 4c2cf0e3b1d0..60709ab77603 100644 --- a/external/libwps/Library_wps.mk +++ b/external/libwps/Library_wps.mk @@ -26,7 +26,6 @@ $(eval $(call gb_Library_add_defs,wps,\ -DBUILD_WPS\ -DDLL_EXPORT \ -DNDEBUG \ - -DSHAREDPTR_STD \ )) $(eval $(call gb_Library_set_generated_cxx_suffix,wps,cpp)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libstaroffice
external/libstaroffice/Library_staroffice.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 6a8eae612efcb665bb5efc2752af2bf514d11a12 Author: David Tardon Date: Wed Jun 13 15:51:10 2018 +0200 drop unneeded define Change-Id: I3a61e345593959c47b62ba2da97abafca24ee0e8 Reviewed-on: https://gerrit.libreoffice.org/55754 Tested-by: Jenkins Reviewed-by: David Tardon diff --git a/external/libstaroffice/Library_staroffice.mk b/external/libstaroffice/Library_staroffice.mk index 6ff99fb46eb1..079003e48e48 100644 --- a/external/libstaroffice/Library_staroffice.mk +++ b/external/libstaroffice/Library_staroffice.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Library_add_defs,staroffice,\ -DBUILD_STOFF \ -D_WINDLL \ -DNDEBUG \ - -DSHAREDPTR_STD \ )) $(eval $(call gb_Library_add_generated_exception_objects,staroffice,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: workdir/ExternalProject/libatomic_ops/build: checking build system type... ./config.guess: unable to guess system type
Hi, On Mon, 2018-06-11 at 19:44 +0200, Paul Menzel wrote: > configure: error: cannot guess build type; you must specify one > /dev/shm/libreoffice- > core/external/libatomic_ops/ExternalProject_libatomic_ops.mk:19: > recipe for target '/dev/shm/libreoffice- > core/workdir/ExternalProject/libatomic_ops/build' failed > make[1]: *** [/dev/shm/libreoffice- > core/workdir/ExternalProject/libatomic_ops/build] Error 1 > make[1]: *** Waiting for unfinished jobs Add $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libatomic_ops)) to external/libatomic_ops/UnpackedTarball_libatomic_ops.mk . This will replace the library's config.sub and config.guess by our internal--more up-to-date--copies. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - download.lst external/libepubgen solenv/flatpak-manifest.in
download.lst
|4
external/libepubgen/0001-Enclose-span-with-ruby-if-text-ruby-text-is-set.patch.1
| 117 --
external/libepubgen/0001-Support-writing-mode-for-reflowable-layout-method.patch.1
| 264 --
external/libepubgen/0002-Always-keep-page-properties-when-splitting-the-HTML-.patch.1
| 181
external/libepubgen/0003-Ensure-page-properties-in-the-page-span-works.patch.1
| 225 -
external/libepubgen/UnpackedTarball_libepubgen.mk
| 10
external/libepubgen/libepubgen-epub3.patch.1
| 425 --
solenv/flatpak-manifest.in
|6
8 files changed, 5 insertions(+), 1227 deletions(-)
New commits:
commit 0b7e83bd28201f966eb845bba88a43e20222a41c
Author: David Tardon
Date: Sun Jun 3 14:45:55 2018 +0200
upload libepubgen 0.1.1
Change-Id: Ib294f412055ef23a6ca5608675bc924dacae56f4
Reviewed-on: https://gerrit.libreoffice.org/55248
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit 5ea927288a35ea7d5d8747185278b920c1779f50)
Reviewed-on: https://gerrit.libreoffice.org/55250
diff --git a/download.lst b/download.lst
index 1a5e697767b6..3d4a94649370 100644
--- a/download.lst
+++ b/download.lst
@@ -37,8 +37,8 @@ export EPOXY_SHA256SUM :=
1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2
export EPOXY_TARBALL := libepoxy-1.3.1.tar.bz2
export EPM_SHA256SUM :=
b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91
export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
-export EPUBGEN_SHA256SUM :=
730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633
-export EPUBGEN_TARBALL := libepubgen-0.1.0.tar.bz2
+export EPUBGEN_SHA256SUM :=
03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad
+export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz
export ETONYEK_SHA256SUM :=
9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d
export ETONYEK_VERSION_MICRO := 8
export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
diff --git
a/external/libepubgen/0001-Enclose-span-with-ruby-if-text-ruby-text-is-set.patch.1
b/external/libepubgen/0001-Enclose-span-with-ruby-if-text-ruby-text-is-set.patch.1
deleted file mode 100644
index 99c8523a9dc9..
---
a/external/libepubgen/0001-Enclose-span-with-ruby-if-text-ruby-text-is-set.patch.1
+++ /dev/null
@@ -1,117 +0,0 @@
-From 16c4e93af6d5eb9d021a671c54af664edc120df9 Mon Sep 17 00:00:00 2001
-From: Mark Hung
-Date: Mon, 23 Apr 2018 01:24:48 +0800
-Subject: [PATCH] Enclose with if text:ruby-text is set.
-
- src/lib/EPUBHTMLGenerator.cpp | 22 ++
- src/test/EPUBTextGeneratorTest.cpp | 25 +
- 2 files changed, 47 insertions(+)
-
-diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
-index 0080816..a4467a9 100644
a/src/lib/EPUBHTMLGenerator.cpp
-+++ b/src/lib/EPUBHTMLGenerator.cpp
-@@ -397,6 +397,7 @@ struct EPUBHTMLGeneratorImpl
- , m_linkPropertiesStack()
- , m_paragraphAttributesStack()
- , m_spanAttributesStack()
-+, m_rubyText()
- , m_stylesMethod(stylesMethod)
- , m_layoutMethod(layoutMethod)
- , m_actualSink()
-@@ -500,6 +501,9 @@ struct EPUBHTMLGeneratorImpl
- std::stack m_paragraphAttributesStack;
- std::stack m_spanAttributesStack;
-
-+ /// This is set when the span has ruby text and should be wrapped in
.
-+ std::string m_rubyText;
-+
- EPUBStylesMethod m_stylesMethod;
- EPUBLayoutMethod m_layoutMethod;
-
-@@ -743,6 +747,14 @@ void EPUBHTMLGenerator::openSpan(const RVNGPropertyList
)
- attrs.insert("style", m_impl->m_spanManager.getStyle(propList,
false).c_str());
- break;
- }
-+
-+ const librevenge::RVNGProperty *rubyText = propList["text:ruby-text"];
-+ if (rubyText)
-+ {
-+m_impl->m_rubyText = rubyText->getStr().cstr();
-+m_impl->output(false).openElement("ruby", attrs);
-+ }
-+
- m_impl->output(false).openElement("span", attrs);
-
- librevenge::RVNGPropertyList::Iter i(attrs);
-@@ -761,6 +773,16 @@ void EPUBHTMLGenerator::closeSpan()
- m_impl->m_spanAttributesStack.pop();
-
- m_impl->output().closeElement("span");
-+
-+ if (m_impl->m_rubyText.length())
-+ {
-+m_impl->output().openElement("rt");
-+m_impl->output().insertCharacters(m_impl->m_rubyText.c_str());
-+m_impl->output().closeElement("rt");
-+m_impl->output().closeElement("ruby");
-+m_impl->m_hasText = true;
-+m_impl->m_rubyText.clear();
-+ }
- }
-
- void EPUBHTMLGenerator::openLink(const RVNGPropertyList )
-diff --git a/src/test/EPUBTextGeneratorTest.cpp
b/src/test/EPUBTextGeneratorTest.cpp
-index f03824f..61
[Libreoffice-commits] core.git: download.lst external/libepubgen solenv/flatpak-manifest.in
download.lst
|4
external/libepubgen/0001-Enclose-span-with-ruby-if-text-ruby-text-is-set.patch.1
| 117 --
external/libepubgen/0001-Support-writing-mode-for-reflowable-layout-method.patch.1
| 264 --
external/libepubgen/0002-Always-keep-page-properties-when-splitting-the-HTML-.patch.1
| 181
external/libepubgen/0003-Ensure-page-properties-in-the-page-span-works.patch.1
| 225 -
external/libepubgen/UnpackedTarball_libepubgen.mk
| 10
external/libepubgen/libepubgen-epub3.patch.1
| 425 --
solenv/flatpak-manifest.in
|6
8 files changed, 5 insertions(+), 1227 deletions(-)
New commits:
commit 5ea927288a35ea7d5d8747185278b920c1779f50
Author: David Tardon
Date: Sun Jun 3 14:45:55 2018 +0200
upload libepubgen 0.1.1
Change-Id: Ib294f412055ef23a6ca5608675bc924dacae56f4
Reviewed-on: https://gerrit.libreoffice.org/55248
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/download.lst b/download.lst
index a26b2d573f35..3481884e0398 100644
--- a/download.lst
+++ b/download.lst
@@ -37,8 +37,8 @@ export EPOXY_SHA256SUM :=
1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2
export EPOXY_TARBALL := libepoxy-1.3.1.tar.bz2
export EPM_SHA256SUM :=
b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91
export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
-export EPUBGEN_SHA256SUM :=
730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633
-export EPUBGEN_TARBALL := libepubgen-0.1.0.tar.bz2
+export EPUBGEN_SHA256SUM :=
03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad
+export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz
export ETONYEK_SHA256SUM :=
9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d
export ETONYEK_VERSION_MICRO := 8
export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
diff --git
a/external/libepubgen/0001-Enclose-span-with-ruby-if-text-ruby-text-is-set.patch.1
b/external/libepubgen/0001-Enclose-span-with-ruby-if-text-ruby-text-is-set.patch.1
deleted file mode 100644
index 99c8523a9dc9..
---
a/external/libepubgen/0001-Enclose-span-with-ruby-if-text-ruby-text-is-set.patch.1
+++ /dev/null
@@ -1,117 +0,0 @@
-From 16c4e93af6d5eb9d021a671c54af664edc120df9 Mon Sep 17 00:00:00 2001
-From: Mark Hung
-Date: Mon, 23 Apr 2018 01:24:48 +0800
-Subject: [PATCH] Enclose with if text:ruby-text is set.
-
- src/lib/EPUBHTMLGenerator.cpp | 22 ++
- src/test/EPUBTextGeneratorTest.cpp | 25 +
- 2 files changed, 47 insertions(+)
-
-diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
-index 0080816..a4467a9 100644
a/src/lib/EPUBHTMLGenerator.cpp
-+++ b/src/lib/EPUBHTMLGenerator.cpp
-@@ -397,6 +397,7 @@ struct EPUBHTMLGeneratorImpl
- , m_linkPropertiesStack()
- , m_paragraphAttributesStack()
- , m_spanAttributesStack()
-+, m_rubyText()
- , m_stylesMethod(stylesMethod)
- , m_layoutMethod(layoutMethod)
- , m_actualSink()
-@@ -500,6 +501,9 @@ struct EPUBHTMLGeneratorImpl
- std::stack m_paragraphAttributesStack;
- std::stack m_spanAttributesStack;
-
-+ /// This is set when the span has ruby text and should be wrapped in
.
-+ std::string m_rubyText;
-+
- EPUBStylesMethod m_stylesMethod;
- EPUBLayoutMethod m_layoutMethod;
-
-@@ -743,6 +747,14 @@ void EPUBHTMLGenerator::openSpan(const RVNGPropertyList
)
- attrs.insert("style", m_impl->m_spanManager.getStyle(propList,
false).c_str());
- break;
- }
-+
-+ const librevenge::RVNGProperty *rubyText = propList["text:ruby-text"];
-+ if (rubyText)
-+ {
-+m_impl->m_rubyText = rubyText->getStr().cstr();
-+m_impl->output(false).openElement("ruby", attrs);
-+ }
-+
- m_impl->output(false).openElement("span", attrs);
-
- librevenge::RVNGPropertyList::Iter i(attrs);
-@@ -761,6 +773,16 @@ void EPUBHTMLGenerator::closeSpan()
- m_impl->m_spanAttributesStack.pop();
-
- m_impl->output().closeElement("span");
-+
-+ if (m_impl->m_rubyText.length())
-+ {
-+m_impl->output().openElement("rt");
-+m_impl->output().insertCharacters(m_impl->m_rubyText.c_str());
-+m_impl->output().closeElement("rt");
-+m_impl->output().closeElement("ruby");
-+m_impl->m_hasText = true;
-+m_impl->m_rubyText.clear();
-+ }
- }
-
- void EPUBHTMLGenerator::openLink(const RVNGPropertyList )
-diff --git a/src/test/EPUBTextGeneratorTest.cpp
b/src/test/EPUBTextGeneratorTest.cpp
-index f03824f..61c7cac 100644
a/src/test/EPUBTextGeneratorTest.cpp
-+++ b/src/test/EPUBTextGeneratorTest.cpp
-@@ -240,6 +24
[Libreoffice-commits] core.git: filter/source
filter/source/config/cache/contenthandlerfactory.cxx |6 ++ filter/source/config/cache/filterfactory.cxx |4 +--- filter/source/config/cache/frameloaderfactory.cxx|6 ++ 3 files changed, 5 insertions(+), 11 deletions(-) New commits: commit 3fe61a95b90773b8e4df2cb68b83109f630526ad Author: David Tardon <dtar...@redhat.com> Date: Sun May 27 08:15:35 2018 +0200 drop unneded variables Change-Id: Ia494251483b57d747348976674206dd33eb29c7c Reviewed-on: https://gerrit.libreoffice.org/54874 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index afedebfcd06f..ae7b03c7cec9 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -59,15 +59,13 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); -OUString sRealHandler = sHandler; - auto & cache = TheFilterCache::get(); // search handler on cache -CacheItem aHandler = cache.getItem(FilterCache::E_CONTENTHANDLER, sRealHandler); +CacheItem aHandler = cache.getItem(FilterCache::E_CONTENTHANDLER, sHandler); // create service instance -xHandler = m_xContext->getServiceManager()->createInstanceWithContext(sRealHandler, m_xContext); +xHandler = m_xContext->getServiceManager()->createInstanceWithContext(sHandler, m_xContext); // initialize filter css::uno::Reference< css::lang::XInitialization > xInit(xHandler, css::uno::UNO_QUERY); diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index 0e04d668a1d9..bd22e9e78b87 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -76,12 +76,10 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); -OUString sRealFilter = sFilter; - auto & cache = TheFilterCache::get(); // search filter on cache -CacheItem aFilter = cache.getItem(FilterCache::E_FILTER, sRealFilter); +CacheItem aFilter = cache.getItem(FilterCache::E_FILTER, sFilter); OUString sFilterService; aFilter[PROPNAME_FILTERSERVICE] >>= sFilterService; diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index 2bf7b9a5efd2..abf51d859baf 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -56,15 +56,13 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); -OUString sRealLoader = sLoader; - auto & cache = TheFilterCache::get(); // search loader on cache -CacheItem aLoader = cache.getItem(m_eType, sRealLoader); +CacheItem aLoader = cache.getItem(m_eType, sLoader); // create service instance -css::uno::Reference< css::uno::XInterface > xLoader = m_xContext->getServiceManager()->createInstanceWithContext(sRealLoader, m_xContext); +css::uno::Reference< css::uno::XInterface > xLoader = m_xContext->getServiceManager()->createInstanceWithContext(sLoader, m_xContext); // initialize filter css::uno::Reference< css::lang::XInitialization > xInit(xLoader, css::uno::UNO_QUERY); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/qa
writerperfect/qa/unit/ImportTest.cxx |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit bb27318a41e7d8ee20cd23ed2c94d493f4ba0f81 Author: David Tardon <dtar...@redhat.com> Date: Sun May 27 08:13:03 2018 +0200 creation of css::document::XFilter needs filter name Change-Id: I5d580e2efe6cf34b9855e47190f6242323d7823a Reviewed-on: https://gerrit.libreoffice.org/54873 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/writerperfect/qa/unit/ImportTest.cxx b/writerperfect/qa/unit/ImportTest.cxx index 1775f4fc6eeb..3168ac6aade3 100644 --- a/writerperfect/qa/unit/ImportTest.cxx +++ b/writerperfect/qa/unit/ImportTest.cxx @@ -95,9 +95,12 @@ WpftLoader ImportTest::createLoader(const rtl::OUString& rUrl, aDesc[utl::MediaDescriptor::PROP_URL()] <<= rUrl; aDesc[utl::MediaDescriptor::PROP_READONLY()] <<= true; uno::Sequence lDesc(aDesc.getAsConstPropertyValueList()); -const rtl::OUString sType = m_xTypeDetection->queryTypeByDescriptor(lDesc, true); -CPPUNIT_ASSERT(!sType.isEmpty()); -const uno::Reference xFilter(m_xFilterFactory->createInstance(sType), +m_xTypeDetection->queryTypeByDescriptor(lDesc, true); +aDesc = lDesc; +rtl::OUString sFilter; +aDesc[utl::MediaDescriptor::PROP_FILTERNAME()] >>= sFilter; +CPPUNIT_ASSERT(!sFilter.isEmpty()); +const uno::Reference xFilter(m_xFilterFactory->createInstance(sFilter), UNO_QUERY); CPPUNIT_ASSERT(xFilter.is()); return WpftLoader(rUrl, xFilter, rFactoryUrl, m_xDesktop, m_xTypeMap, m_xContext); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/qa
writerperfect/qa/unit/ImportTest.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 307b26c1bd1f2bd3ca3325a96933c1dc38b5224e
Author: David Tardon <dtar...@redhat.com>
Date: Sun May 27 08:27:47 2018 +0200
re-enable test
Change-Id: Id1283afe1ed4429a194a2a2c27eaf5c76387a23a
Reviewed-on: https://gerrit.libreoffice.org/54875
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/writerperfect/qa/unit/ImportTest.cxx
b/writerperfect/qa/unit/ImportTest.cxx
index dca0808bd432..1775f4fc6eeb 100644
--- a/writerperfect/qa/unit/ImportTest.cxx
+++ b/writerperfect/qa/unit/ImportTest.cxx
@@ -80,9 +80,7 @@ void ImportTest::testWK3WithFM3()
CPPUNIT_ASSERT(xCellProps.is());
sal_Int32 nCharColor = 0;
CPPUNIT_ASSERT(xCellProps->getPropertyValue("CharColor") >>= nCharColor);
-#if 0 // broken by commit 8154953add163554c00935486a1cf5677cef2609
CPPUNIT_ASSERT_EQUAL(sal_Int32(0xff), nCharColor); // blue text
-#endif
}
WpftLoader ImportTest::createCalcLoader(const rtl::OUString& rFile) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sysui/productlist.mk
sysui/productlist.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f4f21e3a3bae06bd13bd7cc221502d9373e55994 Author: David Tardon <dtar...@redhat.com> Date: Wed Dec 6 19:16:19 2017 +0100 fix variable name Change-Id: Ie3eef59c934f5fe4146a911e4ee652457b94edd8 (cherry picked from commit 8978fdf58a403aa62e04d47e65cd799740e6b909) Reviewed-on: https://gerrit.libreoffice.org/54807 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/sysui/productlist.mk b/sysui/productlist.mk index aa6fbd4a38d4..5d21a8e52b87 100644 --- a/sysui/productlist.mk +++ b/sysui/productlist.mk @@ -11,7 +11,7 @@ PRODUCTLIST := libreoffice libreofficedev PKGVERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO) PKGVERSIONSHORT := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR) PRODUCTNAME.libreoffice := LibreOffice -PRODUCTNAME.libreofficeodev := LibreOfficeDev +PRODUCTNAME.libreofficedev := LibreOfficeDev UNIXFILENAME.libreoffice := libreoffice$(PKGVERSIONSHORT) UNIXFILENAME.libreofficedev := libreofficedev$(PKGVERSIONSHORT) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 93f8e7405e4a852a2908c011456719dc8e3033e6 Author: David Tardon <dtar...@redhat.com> Date: Sat May 5 13:44:41 2018 +0200 disable werror by default Change-Id: I56bc2296c8705ac0c9c475aa1cf76baa5dddac83 diff --git a/configure.ac b/configure.ac index e41be19..3927e5e 100644 --- a/configure.ac +++ b/configure.ac @@ -202,9 +202,9 @@ AS_IF([test $platform_win32 = yes], # Check for cflags # AC_ARG_ENABLE([werror], - [AS_HELP_STRING([--disable-werror], [Treat all warnings as errors, useful for development])], + [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])], [enable_werror="$enableval"], - [enable_werror=yes] + [enable_werror=no] ) AS_IF([test x"$enable_werror" != "xno"], [ CFLAGS="$CFLAGS -Werror" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - filter/source writerperfect/inc writerperfect/source
filter/source/config/fragments/filters/MS_Multiplan.xcu|2
filter/source/config/fragments/types/calc_MS_Multiplan.xcu |7 --
writerperfect/inc/strings.hrc |1
writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 45 +++--
4 files changed, 32 insertions(+), 23 deletions(-)
New commits:
commit aea66f8a3d5757e073b9bdcf1ff240371777314e
Author: David Tardon <dtar...@redhat.com>
Date: Mon Apr 30 15:30:22 2018 +0200
convert a sequence of if to a switch
Change-Id: Ibca33b2170348ce56e9fa376009ee1cdea2dd67e
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index 969f0e0b4417..2b560e795a55 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -195,31 +195,35 @@ bool
MSWorksCalcImportFilter::doImportDocument(librevenge::RVNGInputStream& rInp
if (needEncoding)
{
OUString title, encoding;
-if (creator == libwps::WPS_MSWORKS)
-{
-title = WpResId(STR_ENCODING_DIALOG_TITLE_MSWORKS);
-encoding = "CP850";
-}
-else if (creator == libwps::WPS_LOTUS)
-{
-title = WpResId(STR_ENCODING_DIALOG_TITLE_LOTUS);
-encoding = "CP437";
-}
-else if (creator == libwps::WPS_SYMPHONY)
-{
-title = WpResId(STR_ENCODING_DIALOG_TITLE_SYMPHONY);
-encoding = "CP437";
-}
-else if (creator == libwps::WPS_QUATTRO_PRO)
-{
-title = WpResId(STR_ENCODING_DIALOG_TITLE_QUATTROPRO);
-encoding = "CP437";
-}
-else
+switch (creator)
{
-title = WpResId(STR_ENCODING_DIALOG_TITLE_MSMULTIPLAN);
-encoding = "CP437";
+case libwps::WPS_MSWORKS:
+title = WpResId(STR_ENCODING_DIALOG_TITLE_MSWORKS);
+encoding = "CP850";
+break;
+case libwps::WPS_LOTUS:
+title = WpResId(STR_ENCODING_DIALOG_TITLE_LOTUS);
+encoding = "CP437";
+break;
+case libwps::WPS_SYMPHONY:
+title = WpResId(STR_ENCODING_DIALOG_TITLE_SYMPHONY);
+encoding = "CP437";
+break;
+case libwps::WPS_QUATTRO_PRO:
+title = WpResId(STR_ENCODING_DIALOG_TITLE_QUATTROPRO);
+encoding = "CP437";
+break;
+case libwps::WPS_RESERVED_2:
+title = WpResId(STR_ENCODING_DIALOG_TITLE_MSMULTIPLAN);
+encoding = "CP437";
+break;
+default:
+SAL_INFO("writerperfect", "unexpected creator: " << creator);
+title = WpResId(STR_ENCODING_DIALOG_TITLE);
+encoding = "CP437";
+break;
}
+
try
{
const ScopedVclPtrInstance
pDlg(title, encoding);
commit d324ed83fa6941f5408402d7ab0ec65f5c18d1d2
Author: osnola <alo...@loria.fr>
Date: Mon Apr 30 15:25:24 2018 +0200
tdf#117323 fix import of MS Multiplan for DOS
Change-Id: Ica053852c17ac993b4e50c4c58dbaf2ee4f33035
diff --git a/filter/source/config/fragments/filters/MS_Multiplan.xcu
b/filter/source/config/fragments/filters/MS_Multiplan.xcu
index f10e0ddcf6f9..780901d5329f 100644
--- a/filter/source/config/fragments/filters/MS_Multiplan.xcu
+++ b/filter/source/config/fragments/filters/MS_Multiplan.xcu
@@ -12,7 +12,7 @@
IMPORT ALIEN 3RDPARTYFILTER PREFERRED
-org.libreoffice.comp.Calc.MSWorksCalcImportFilter
+com.sun.star.comp.Calc.MSWorksCalcImportFilter
Microsoft Multiplan
diff --git a/filter/source/config/fragments/types/calc_MS_Multiplan.xcu
b/filter/source/config/fragments/types/calc_MS_Multiplan.xcu
index d6feee60af25..8f2bba34f0a2 100644
--- a/filter/source/config/fragments/types/calc_MS_Multiplan.xcu
+++ b/filter/source/config/fragments/types/calc_MS_Multiplan.xcu
@@ -9,11 +9,10 @@
-org.libreoffice.comp.Calc.MSWorksCalcImportFilter
-
-
-*
+com.sun.star.comp.Calc.MSWorksCalcImportFilter
+
+
true
diff --git a/writerperfect/inc/strings.hrc b/writerperfect/inc/strings.hrc
index 9f9b60d8bee8..2bd8d27ac82a 100644
--- a/writerperfect/inc/strings.hrc
+++ b/writerperfect/inc/strings.hrc
@@ -13,6 +13,7 @@
#define NC_(Context, String) (Context "\004" u8##String)
#define STR_ENCODING_DIALOG_TITLE
NC_("STR_ENCODING_DIALOG_TITLE", "Import file")
+#define STR_ENCODING_DIALOG_TITLE_MSMULTIPLAN
NC_("STR_ENCODING_DIALOG_TITLE_MSMULTIPLAN", "Import
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - 29 commits - download.lst editeng/source external/graphite external/icu external/lcms2 external/lpsolve external/openssl external/pyt
Rebased ref, commits from common ancestor: commit 044f467cbe14fcbad5ce929a24795676d4463d61 Author: David Tardon <dtar...@redhat.com> Date: Tue Jan 31 22:35:37 2017 +0100 upload zlib 1.2.11 Reviewed-on: https://gerrit.libreoffice.org/33770 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: David Tardon <dtar...@redhat.com> Conflicts: download.lst Change-Id: I4e19a9d976c28f5e6649bdbb3dd609e03a4c03a8 diff --git a/Makefile.fetch b/Makefile.fetch index 6b6fbcb4cd1e..9b0e231d85ef 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -90,6 +90,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \ $(call fetch_Optional,PYTHON,PYTHON_TARBALL) \ $(call fetch_Optional,VISIO,VISIO_TARBALL) \ + $(call fetch_Optional,ZLIB,ZLIB_TARBALL) \ ,$(call fetch_Download_item_special,http://dev-www.libreoffice.org/src,$(item))) $(foreach item, \ $(call fetch_Optional,AFMS,$(AFMS_TARBALL)) \ @@ -172,7 +173,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,WPG,$(WPG_TARBALL)) \ $(call fetch_Optional,WPS,$(WPS_TARBALL)) \ $(call fetch_Optional,XSLTML,$(XSLTML_TARBALL)) \ - $(call fetch_Optional,ZLIB,$(ZLIB_TARBALL)) \ ,$(call fetch_Download_item,http://dev-www.libreoffice.org/src,$(item))) $(foreach item, \ $(call fetch_Optional,DBGHELP,$(DBGHELP_DLL)) \ diff --git a/download.lst b/download.lst index 059a06f684da..1e8e665767cf 100644 --- a/download.lst +++ b/download.lst @@ -32,6 +32,8 @@ PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021 export PYTHON_TARBALL := Python-3.3.5.tgz OPENSSL_MD5SUM := 44279b8557c3247cbe324e2322ecd114 export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz +ZLIB_MD5SUM := 85adef240c5f370b308da8c938951a68 +export ZLIB_TARBALL := zlib-1.2.11.tar.xz export AFMS_TARBALL := 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz export APACHE_COMMONS_CODEC_TARBALL := 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz @@ -110,7 +112,6 @@ export WPD_TARBALL := a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2 export WPG_TARBALL := b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2 export WPS_TARBALL := 46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip -export ZLIB_TARBALL := 2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2 export MOZ_ZIP_INC := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)inc.zip export MOZ_ZIP_LIB := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)lib.zip commit 53299350e2aabe9f24b9a73c6033531358e881c2 Author: Thorsten Behrens <thorsten.behr...@cib.de> Date: Mon Apr 30 14:33:09 2018 +0200 update openssl to 1.0.2o Change-Id: I6f7308e60ba74bbcec1719c9aeec8e6c21d24ecc diff --git a/Makefile.fetch b/Makefile.fetch index bb0b02f4ac5e..6b6fbcb4cd1e 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -86,6 +86,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ + $(call fetch_Optional,OPENSSL,OPENSSL_TARBALL) \ $(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \ $(call fetch_Optional,PYTHON,PYTHON_TARBALL) \ $(call fetch_Optional,VISIO,VISIO_TARBALL) \ @@ -154,7 +155,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,NSS,$(NSS_TARBALL)) \ $(NUMBERTEXT_EXTENSION_PACK) \ $(call fetch_Optional,OPENLDAP,$(OPENLDAP_TARBALL)) \ - $(call fetch_Optional,OPENSSL,$(OPENSSL_TARBALL)) \ $(call fetch_Optional,ORCUS,$(ORCUS_TARBALL)) \ $(call fetch_Optional,CAIRO,$(PIXMAN_TARBALL)) \ $(call fetch_Optional,LIBPNG,$(PNG_TARBALL)) \ diff --git a/download.lst b/download.lst index f83677a20ba9..059a06f684da 100644 --- a/download.lst +++ b/download.lst @@ -30,6 +30,8 @@ LANGTAGREG_MD5SUM := 504af523f5d1a5590bbeb6a4b55e8a97 export LANGTAGREG_TARBALL := language-subtag-registry-2014-03-27.tar.bz2 PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021 export PYTHON_TARBALL := Python-3.3.5.tgz +OPENSSL_MD5SUM := 44279b8557c3247cbe324e2322ecd114 +export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz export AFMS_TARBALL := 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz export APACHE_COMMONS_CODEC_TARBALL := 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz @@ -92,7 +94,6 @@ export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61d
[Libreoffice-commits] core.git: filter/source
filter/source/config/fragments/types/calc_MS_Multiplan.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e0958329000ac04601ceed964fc9fe6559649503 Author: David Tardon <dtar...@redhat.com> Date: Mon Apr 30 13:10:46 2018 +0200 tdf#117323 add dummy extension to fix assertion Change-Id: I88494b6686102dc727048ffa5fa8d7d483e04174 diff --git a/filter/source/config/fragments/types/calc_MS_Multiplan.xcu b/filter/source/config/fragments/types/calc_MS_Multiplan.xcu index aec1df902889..d6feee60af25 100644 --- a/filter/source/config/fragments/types/calc_MS_Multiplan.xcu +++ b/filter/source/config/fragments/types/calc_MS_Multiplan.xcu @@ -12,7 +12,7 @@ org.libreoffice.comp.Calc.MSWorksCalcImportFilter - +* true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/source
writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 36 --
writerperfect/source/writer/MSWorksImportFilter.cxx | 26 ++---
2 files changed, 30 insertions(+), 32 deletions(-)
New commits:
commit e0e8f5f60f9912cd2e12818cd1bc2eb6c3e1e75f
Author: David Tardon <dtar...@redhat.com>
Date: Thu Apr 26 14:41:09 2018 +0200
replace a series of if/else if/ by a switch
Change-Id: I6319971e1a2a4bffa0466fa37a31beff5a349fd1
Reviewed-on: https://gerrit.libreoffice.org/53535
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index 0972c97df84e..04dcffcdac48 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -388,29 +388,27 @@ bool
MSWorksCalcImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput
if ((kind == libwps::WPS_SPREADSHEET || kind == libwps::WPS_DATABASE)
&& confidence != libwps::WPS_CONFIDENCE_NONE)
{
-if (creator == libwps::WPS_MSWORKS)
-{
-rTypeName = "calc_MS_Works_Document";
-return true;
-}
-if (creator == libwps::WPS_LOTUS || creator == libwps::WPS_SYMPHONY)
-{
-rTypeName = "calc_WPS_Lotus_Document";
-return true;
-}
-if (creator == libwps::WPS_QUATTRO_PRO)
-{
-rTypeName = "calc_WPS_QPro_Document";
-return true;
-}
-if (creator == libwps::WPS_RESERVED_2)
+switch (creator)
{
-rTypeName = "calc_MS_Multiplan";
-return true;
+case libwps::WPS_MSWORKS:
+rTypeName = "calc_MS_Works_Document";
+break;
+case libwps::WPS_LOTUS:
+case libwps::WPS_SYMPHONY:
+rTypeName = "calc_WPS_Lotus_Document";
+break;
+case libwps::WPS_QUATTRO_PRO:
+rTypeName = "calc_WPS_QPro_Document";
+break;
+case libwps::WPS_RESERVED_2:
+rTypeName = "calc_MS_Multiplan";
+break;
+default:
+break;
}
}
-return false;
+return !rTypeName.isEmpty();
}
void MSWorksCalcImportFilter::doRegisterHandlers(OdsGenerator&) {}
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx
b/writerperfect/source/writer/MSWorksImportFilter.cxx
index c22474d190bc..4c2c86c5e787 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -98,23 +98,23 @@ bool
MSWorksImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OU
if ((kind == libwps::WPS_TEXT) && (confidence ==
libwps::WPS_CONFIDENCE_EXCELLENT))
{
-if (creator == libwps::WPS_MSWORKS)
+switch (creator)
{
-rTypeName = "writer_MS_Works_Document";
+case libwps::WPS_MSWORKS:
+rTypeName = "writer_MS_Works_Document";
+break;
+case libwps::WPS_RESERVED_0:
+rTypeName = "writer_MS_Write";
+break;
+case libwps::WPS_RESERVED_1:
+rTypeName = "writer_DosWord";
+break;
+default:
+break;
}
-else if (creator == libwps::WPS_RESERVED_0)
-{
-rTypeName = "writer_MS_Write";
-}
-else
-{
-rTypeName = "writer_DosWord";
-}
-
-return true;
}
-return false;
+return !rTypeName.isEmpty();
}
void MSWorksImportFilter::doRegisterHandlers(OdtGenerator& rGenerator)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac download.lst external/libstaroffice solenv/flatpak-manifest.in
configure.ac |
2
download.lst |
4 -
external/libstaroffice/0001-add-missing-include-for-std-max.patch.1 |
24 ++
external/libstaroffice/0001-fix-null-ptr-deref.-if-decryption-failed.patch.1 |
35 --
external/libstaroffice/Library_staroffice.mk |
2
external/libstaroffice/UnpackedTarball_libstaroffice.mk |
4 -
solenv/flatpak-manifest.in |
6 -
7 files changed, 34 insertions(+), 43 deletions(-)
New commits:
commit 488f70e0c5209fd092b67252fdebb784efa04673
Author: David Tardon <dtar...@redhat.com>
Date: Thu Apr 26 08:41:52 2018 +0200
upload libstaroffice 0.0.6
Change-Id: Id3a845174e7cebad999895bc57e2d05f36f3d597
Reviewed-on: https://gerrit.libreoffice.org/53499
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/configure.ac b/configure.ac
index bdc3efa59172..56e9b01811a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7881,7 +7881,7 @@ libo_CHECK_SYSTEM_MODULE([libqxp],[QXP],[libqxp-0.0])
libo_CHECK_SYSTEM_MODULE([libzmf],[ZMF],[libzmf-0.0])
libo_CHECK_SYSTEM_MODULE([libstaroffice],[STAROFFICE],[libstaroffice-0.0])
-libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.4])
+libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.6])
dnl ===
dnl Check for system lcms2
diff --git a/download.lst b/download.lst
index e61ba6be9fae..c05c99ba4dc0 100644
--- a/download.lst
+++ b/download.lst
@@ -225,8 +225,8 @@ export RHINO_SHA256SUM :=
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131
export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
export SERF_SHA256SUM :=
6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700
export SERF_TARBALL := serf-1.2.1.tar.bz2
-export STAROFFICE_SHA256SUM :=
315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982
-export STAROFFICE_VERSION_MICRO := 5
+export STAROFFICE_SHA256SUM :=
6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4
+export STAROFFICE_VERSION_MICRO := 6
export STAROFFICE_TARBALL :=
libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz
export SWING_SHA256SUM :=
64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
diff --git
a/external/libstaroffice/0001-add-missing-include-for-std-max.patch.1
b/external/libstaroffice/0001-add-missing-include-for-std-max.patch.1
new file mode 100644
index ..2445d2a4a8e3
--- /dev/null
+++ b/external/libstaroffice/0001-add-missing-include-for-std-max.patch.1
@@ -0,0 +1,24 @@
+From d6c34e98a6adb060ad42b9f1c60a1e8036bc27ff Mon Sep 17 00:00:00 2001
+From: David Tardon <dtar...@redhat.com>
+Date: Thu, 26 Apr 2018 14:21:06 +0200
+Subject: [PATCH] add missing include for std::max
+
+---
+ src/lib/STOFFChart.cxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/STOFFChart.cxx b/src/lib/STOFFChart.cxx
+index cd1566f..3e7310c 100644
+--- a/src/lib/STOFFChart.cxx
b/src/lib/STOFFChart.cxx
+@@ -37,6 +37,7 @@
+ *
+ */
+
++#include
+ #include
+ #include
+ #include
+--
+2.14.3
+
diff --git
a/external/libstaroffice/0001-fix-null-ptr-deref.-if-decryption-failed.patch.1
b/external/libstaroffice/0001-fix-null-ptr-deref.-if-decryption-failed.patch.1
deleted file mode 100644
index 658f6797940d..
---
a/external/libstaroffice/0001-fix-null-ptr-deref.-if-decryption-failed.patch.1
+++ /dev/null
@@ -1,35 +0,0 @@
-From 59f29dd735bf5890ea29fdde809afcf111463a65 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtar...@redhat.com>
-Date: Mon, 12 Mar 2018 20:33:54 +0100
-Subject: [PATCH] fix null ptr deref. if decryption failed
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Thanks to Antti Levomäki and Christian Jalio from Forcepoint.
- src/lib/StarObjectDraw.cxx | 7 ---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/StarObjectDraw.cxx b/src/lib/StarObjectDraw.cxx
-index fd3411a..8a19b1c 100644
a/src/lib/StarObjectDraw.cxx
-+++ b/src/lib/StarObjectDraw.cxx
-@@ -199,10 +199,11 @@ try
-if the user mask does correspond to the real mask.
- */
- input=StarEncryption::decodeStream(input,
StarEncryption::getMaskToDecodeStream(firstByte, 0x44));
--if (input) {
-- zone.setInput(input);
-- input->seek(0, librevenge::RVNG_SEEK_SET);
-+if (!input) {
-+ STOFF_DEBUG_MSG(("StarObjectDraw::readDrawDocument: decryption
failed\n"));
-+ return false;
- }
-+zone.setInput(input);
- }
- input->seek(0, librevenge::RVNG_SEEK_SET);
- std::shared_ptr model(new StarObject
[Libreoffice-commits] core.git: external/libwps
external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
| 56 ++
external/libwps/UnpackedTarball_libwps.mk
|4
2 files changed, 60 insertions(+)
New commits:
commit 74c35a46c813b00ae4f1d9686fa07e60e83d0992
Author: David Tardon <dtar...@redhat.com>
Date: Thu Apr 26 14:29:19 2018 +0200
fix asan build
Change-Id: I83a0832ed180a57517d3344e3bc9ada482f0fc70
diff --git
a/external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
b/external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
new file mode 100644
index ..46983dd9eed2
--- /dev/null
+++
b/external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
@@ -0,0 +1,56 @@
+From 9181ad021cf1c200bc80edb9f5a6df5b780be046 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtar...@redhat.com>
+Date: Thu, 26 Apr 2018 14:24:55 +0200
+Subject: [PATCH] avoid name clash with MultiplanParser from libmwaw
+
+---
+ src/lib/Multiplan.cpp | 5 -
+ src/lib/Multiplan.h | 5 +
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/Multiplan.cpp b/src/lib/Multiplan.cpp
+index 278f699..26ceca3 100644
+--- a/src/lib/Multiplan.cpp
b/src/lib/Multiplan.cpp
+@@ -44,7 +44,8 @@
+
+ #include "Multiplan.h"
+
+-using namespace libwps;
++namespace libwps
++{
+
+ //! Internal: namespace to define internal class of MultiplanParser
+ namespace MultiplanParserInternal
+@@ -2912,4 +2913,6 @@ RVNGInputStreamPtr
MultiplanParser::decodeStream(RVNGInputStreamPtr input)
+ return res;
+ }
+
++}
++
+ /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+diff --git a/src/lib/Multiplan.h b/src/lib/Multiplan.h
+index 87e0565..83c83f2 100644
+--- a/src/lib/Multiplan.h
b/src/lib/Multiplan.h
+@@ -34,6 +34,9 @@
+
+ #include "WKSParser.h"
+
++namespace libwps
++{
++
+ namespace MultiplanParserInternal
+ {
+ struct State;
+@@ -127,5 +130,7 @@ protected:
+ std::shared_ptr m_state;
+ };
+
++}
++
+ #endif /* WPS4_H */
+ /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+--
+2.14.3
+
diff --git a/external/libwps/UnpackedTarball_libwps.mk
b/external/libwps/UnpackedTarball_libwps.mk
index d712f25406bd..d82b2be75783 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -35,4 +35,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps, \
endif
endif
+$(eval $(call gb_UnpackedTarball_add_patches,libwps,\
+
external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
\
+))
+
# vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac download.lst external/libwps filter/Configuration_filter.mk filter/source solenv/flatpak-manifest.in writerperfect/qa writerperfect/source
configure.ac
|2
download.lst
|4 -
external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1
| 27 -
external/libwps/0001-drop-unneeded-include.patch.1
| 24
external/libwps/Library_wps.mk
|1
external/libwps/UnpackedTarball_libwps.mk
|5 -
filter/Configuration_filter.mk
|2
filter/source/config/fragments/filters/MS_Multiplan.xcu
| 29 ++
filter/source/config/fragments/types/calc_MS_Multiplan.xcu
| 26
solenv/flatpak-manifest.in
|6 +-
writerperfect/qa/unit/WpftCalcFilterTest.cxx
|1
writerperfect/qa/unit/data/calc/libwps/pass/Multiplan_3
|binary
writerperfect/source/calc/MSWorksCalcImportFilter.cxx
|5 +
13 files changed, 70 insertions(+), 62 deletions(-)
New commits:
commit 9739749ba8da87001b73027136f120ef532f0b2b
Author: David Tardon <dtar...@redhat.com>
Date: Wed Apr 25 07:02:54 2018 +0200
upload libwps 0.4.9
Change-Id: I9571d91d6ce81d7e8752f24c3220f858a5303986
Reviewed-on: https://gerrit.libreoffice.org/53431
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/configure.ac b/configure.ac
index d0ca94754b0f..bdc3efa59172 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7853,7 +7853,7 @@
libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar
libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.8])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.9])
libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
diff --git a/download.lst b/download.lst
index 897a6c83498e..0fa8763fdeae 100644
--- a/download.lst
+++ b/download.lst
@@ -242,8 +242,8 @@ export WPD_TARBALL :=
libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
export WPG_SHA256SUM :=
57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33
export WPG_VERSION_MICRO := 2
export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
-export WPS_SHA256SUM :=
e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e
-export WPS_VERSION_MICRO := 8
+export WPS_SHA256SUM :=
13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922
+export WPS_VERSION_MICRO := 9
export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
export XSLTML_SHA256SUM :=
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
diff --git
a/external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1
b/external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1
deleted file mode 100644
index 40c929ab8ea0..
---
a/external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2a3465442d1305c7fec55e986c9793a86e571baa Mon Sep 17 00:00:00 2001
-From: osnola <alo...@loria.fr>
-Date: Fri, 24 Nov 2017 12:32:30 +0100
-Subject: [PATCH] Lotus .123: do no assume that a file containing a fdc's
- structure is a Mac file :-~
-
- src/lib/Lotus.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/lib/Lotus.cpp b/src/lib/Lotus.cpp
-index d145014..514faad 100644
a/src/lib/Lotus.cpp
-+++ b/src/lib/Lotus.cpp
-@@ -3046,8 +3046,7 @@ bool
LotusParser::readMacFontName(std::shared_ptr stream, long endPos
- }
- else if (nameOk && !name.empty())
- {
-- auto encoding=name!="Symbol" ?
libwps_tools_win::Font::MAC_ROMAN : libwps_tools_win::Font::MAC_SYMBOL;
-- LotusParserInternal::Font font(encoding);
-+ LotusParserInternal::Font font(getDefaultFontType());
- font.m_name=name;
- m_state->m_fontsMap.insert(std::map<int,
LotusParserInternal::Font>::value_type(id,font));
- }
---
-2.14.3
-
diff --git a/external/libwps/0001-drop-unneeded-include.patch.1
b/external/libwps/0001-drop-unneeded-include.patch.1
deleted file mode 100644
index 4d7b5a494530..
--- a/external/libwps/0001-drop-unneeded-include.patch.1
+++ /dev/null
@@ -1,24 +0,0 @@
-From cec7e4b57b0e10139d5a5dcede9027b0ea85e07d Mon Sep 17 00:00:00 2001
-From: David Tardon <dtar...@redhat.com>
-Date: Mon, 27 Nov 2017 19:32:53 +0100
-Subject: [PATCH] drop unneeded include
-
- src/lib/QuattroSpreadsheet.cpp
[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw solenv/flatpak-manifest.in writerperfect/qa
configure.ac |2
download.lst |4
external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1 | 25 -
external/libmwaw/0001-ssize_t-is-not-std-type.patch.1| 27 ++
external/libmwaw/Library_mwaw.mk |2
external/libmwaw/UnpackedTarball_libmwaw.mk |4
solenv/flatpak-manifest.in |6 -
writerperfect/qa/unit/WpftCalcFilterTest.cxx |5 -
writerperfect/qa/unit/data/calc/libmwaw/pass/Multiplan_1.hqx | 46 +++
9 files changed, 87 insertions(+), 34 deletions(-)
New commits:
commit e24f6397e34a6bb02dfb80316060f11e7f179263
Author: David Tardon <dtar...@redhat.com>
Date: Tue Apr 24 17:25:07 2018 +0200
upload libmwaw 0.3.14
Change-Id: I727171251964eaf7a14595abaaa2d08fb783258c
Reviewed-on: https://gerrit.libreoffice.org/53419
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 7ccc9f1997c6..c3b24edee347 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7862,7 +7862,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.13])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.14])
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 3e9e1be3aa15..897a6c83498e 100644
--- a/download.lst
+++ b/download.lst
@@ -170,8 +170,8 @@ export MDNSRESPONDER_SHA256SUM :=
4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09
export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz
export MSPUB_SHA256SUM :=
ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
export MSPUB_TARBALL := libmspub-0.1.4.tar.xz
-export MWAW_SHA256SUM :=
db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea
-export MWAW_VERSION_MICRO := 13
+export MWAW_SHA256SUM :=
aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9
+export MWAW_VERSION_MICRO := 14
export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
export MYSQL_CONNECTOR_CPP_SHA256SUM :=
a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
export MYSQL_CONNECTOR_CPP_TARBALL :=
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
diff --git a/external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1
b/external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1
deleted file mode 100644
index 2036fa869f86..
--- a/external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4bc8ec0481f89b989b0c34236c9d5d9b8038d4a9 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtar...@redhat.com>
-Date: Wed, 15 Nov 2017 13:15:44 +0100
-Subject: [PATCH] fix call of explicit ctor
-
- src/lib/libmwaw_internal.hxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/libmwaw_internal.hxx b/src/lib/libmwaw_internal.hxx
-index 2875a0fb..b844a9d5 100644
a/src/lib/libmwaw_internal.hxx
-+++ b/src/lib/libmwaw_internal.hxx
-@@ -1027,7 +1027,7 @@ public:
- }
- //! generic constructor
- template explicit MWAWBox2(MWAWBox2 const )
--: m_data(p.min(), p.max())
-+: m_data(MWAWVec2(p.min()), MWAWVec2(p.max()))
- {
- }
-
---
-2.14.3
-
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
new file mode 100644
index ..e33f2a19d560
--- /dev/null
+++ b/external/libmwaw/0001-ssize_t-is-not-std-type.patch.1
@@ -0,0 +1,27 @@
+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 )
+ 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 91280f47460d..
[Libreoffice-commits] core.git: solenv/flatpak-manifest.in
solenv/flatpak-manifest.in |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 5f7264f8f8fe9117c1a4ce29ae720811b441d4d9
Author: David Tardon <dtar...@redhat.com>
Date: Tue Apr 24 17:15:43 2018 +0200
update flatpak-manifest.in for new libetonyek
Change-Id: I472b0b86f1e7745c09f6ec4960c9846cacbdfd09
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index fe7b3bf919e3..3b4fa0d67f54 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -248,10 +248,10 @@
"dest-filename": "external/tarballs/libe-book-0.1.3.tar.xz"
},
{
-"url":
"https://dev-www.libreoffice.org/src/libetonyek-0.1.7.tar.xz;,
-"sha256":
"69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac",
+"url":
"https://dev-www.libreoffice.org/src/libetonyek-0.1.8.tar.xz;,
+"sha256":
"9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d",
"type": "file",
-"dest-filename":
"external/tarballs/libetonyek-0.1.7.tar.xz"
+"dest-filename":
"external/tarballs/libetonyek-0.1.8.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz;,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - filter/source writerperfect/qa
filter/source/config/fragments/filters/AppleKeynote.xcu |2 +-
filter/source/config/fragments/filters/AppleNumbers.xcu |2 +-
filter/source/config/fragments/filters/ApplePages.xcu |2 +-
writerperfect/qa/unit/WpftImpressFilterTest.cxx |6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 4a7ebfea57094b914c4b1c3e46936dbf67dec499
Author: David Tardon <dtar...@redhat.com>
Date: Sun Apr 22 17:43:36 2018 +0200
all Keynote/Pages/Numbers versions are supported
Change-Id: I5c7ac03fdea3ebdef720a65e7a694deae98e5d97
Reviewed-on: https://gerrit.libreoffice.org/53293
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/filter/source/config/fragments/filters/AppleKeynote.xcu
b/filter/source/config/fragments/filters/AppleKeynote.xcu
index d55c204bb283..48a99ba7c85f 100644
--- a/filter/source/config/fragments/filters/AppleKeynote.xcu
+++ b/filter/source/config/fragments/filters/AppleKeynote.xcu
@@ -15,7 +15,7 @@
org.libreoffice.comp.Impress.KeynoteImportFilter
-Apple Keynote 5
+Apple Keynote
0
diff --git a/filter/source/config/fragments/filters/AppleNumbers.xcu
b/filter/source/config/fragments/filters/AppleNumbers.xcu
index a789aec70dc5..2bfa87072941 100644
--- a/filter/source/config/fragments/filters/AppleNumbers.xcu
+++ b/filter/source/config/fragments/filters/AppleNumbers.xcu
@@ -15,7 +15,7 @@
org.libreoffice.comp.Calc.NumbersImportFilter
-Apple Numbers 2
+Apple Numbers
0
diff --git a/filter/source/config/fragments/filters/ApplePages.xcu
b/filter/source/config/fragments/filters/ApplePages.xcu
index e7fd4d732e10..25ca2f015c23 100644
--- a/filter/source/config/fragments/filters/ApplePages.xcu
+++ b/filter/source/config/fragments/filters/ApplePages.xcu
@@ -15,7 +15,7 @@
org.libreoffice.comp.Writer.PagesImportFilter
-Apple Pages 4
+Apple Pages
0
commit 43374afb82ee4a011b813dc76fbf5f9ca6c6112b
Author: David Tardon <dtar...@redhat.com>
Date: Sun Apr 22 17:41:30 2018 +0200
rename test files
Change-Id: I40b58b2a6df33783073731790d17aacc35e0b75c
Reviewed-on: https://gerrit.libreoffice.org/53292
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
index 4156f394665a..f6f7608f7dad 100644
--- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
@@ -32,9 +32,9 @@ void WpftImpressFilterTest::test()
{
const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{
{ "Keynote_1.key", REQUIRE_ETONYEK_VERSION(0, 1, 8) },
-{ "v2.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1) },
-{ "v3.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1) },
-{ "v6.zip", REQUIRE_ETONYEK_VERSION(0, 1, 4) },
+{ "Keynote_2.key", REQUIRE_ETONYEK_VERSION(0, 1, 1) },
+{ "Keynote_3.key", REQUIRE_ETONYEK_VERSION(0, 1, 1) },
+{ "Keynote_6.key", REQUIRE_ETONYEK_VERSION(0, 1, 4) },
};
const writerperfect::test::WpftOptionalMap_t aMWAWOptional{
{ "ClarisWorks_6.0.cwk", REQUIRE_MWAW_VERSION(0, 3, 3) },
diff --git a/writerperfect/qa/unit/data/impress/libetonyek/pass/v2.zip
b/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_2.key
similarity index 100%
rename from writerperfect/qa/unit/data/impress/libetonyek/pass/v2.zip
rename to writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_2.key
diff --git a/writerperfect/qa/unit/data/impress/libetonyek/pass/v3.zip
b/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_3.key
similarity index 100%
rename from writerperfect/qa/unit/data/impress/libetonyek/pass/v3.zip
rename to writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_3.key
diff --git a/writerperfect/qa/unit/data/impress/libetonyek/pass/v4.zip
b/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_4.key
similarity index 100%
rename from writerperfect/qa/unit/data/impress/libetonyek/pass/v4.zip
rename to writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_4.key
diff --git a/writerperfect/qa/unit/data/impress/libetonyek/pass/v5.key
b/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_5.key
similarity index 100%
rename from writerperfect/qa/unit/data/impress/libetonyek/pass/v5.key
rename to writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_5.key
diff --git a/writerperfect/qa/unit/data/impress/libetonyek/pass/v6.zip
b/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_6.key
similarity index 100%
rename from writerperfect/qa/unit/data/impress/libetonyek/pass/v6.zip
rename to writerperfect/qa/unit/data/im
[Libreoffice-commits] core.git: configure.ac download.lst writerperfect/qa
configure.ac |2 +-
download.lst |4 ++--
writerperfect/qa/unit/WpftImpressFilterTest.cxx |1 +
writerperfect/qa/unit/WpftWriterFilterTest.cxx |1 +
writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_1.key |binary
writerperfect/qa/unit/data/writer/libetonyek/pass/Pages_5.pages |binary
6 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit aa3d62173be3b0621f87e77f34c65e59825a1a40
Author: David Tardon <dtar...@redhat.com>
Date: Sat Apr 21 20:48:16 2018 +0200
upload libetonyek 0.1.8
Change-Id: Id7c15e4ee902016dec70e44cd2495ee17fd6d263
Reviewed-on: https://gerrit.libreoffice.org/53291
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/configure.ac b/configure.ac
index f52b0b2b0310..d0240806303f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7855,7 +7855,7 @@ libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >=
0.3.1])
libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.13])
libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
-libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.7])
+libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8])
libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
diff --git a/download.lst b/download.lst
index 9e0e21fc3a16..3e9e1be3aa15 100644
--- a/download.lst
+++ b/download.lst
@@ -39,9 +39,9 @@ export EPM_SHA256SUM :=
b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7
export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
export EPUBGEN_SHA256SUM :=
730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633
export EPUBGEN_TARBALL := libepubgen-0.1.0.tar.bz2
-export ETONYEK_SHA256SUM :=
8a70cc83a9ee031444f9c891609b1cc11e20e2d6b41ae02d17d8f1ca8a68c4f2
+export ETONYEK_SHA256SUM :=
9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d
export ETONYEK_VERSION_MICRO := 8
-export ETONYEK_TARBALL :=
libetonyek-0.1.$(ETONYEK_VERSION_MICRO)-snapshot1.tar.xz
+export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
export EXPAT_SHA256SUM :=
d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6
export EXPAT_TARBALL := expat-2.2.5.tar.bz2
export FIREBIRD_SHA256SUM :=
6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860
diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
index 261085f97cdf..4156f394665a 100644
--- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
@@ -31,6 +31,7 @@ WpftImpressFilterTest::WpftImpressFilterTest()
void WpftImpressFilterTest::test()
{
const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{
+{ "Keynote_1.key", REQUIRE_ETONYEK_VERSION(0, 1, 8) },
{ "v2.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1) },
{ "v3.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1) },
{ "v6.zip", REQUIRE_ETONYEK_VERSION(0, 1, 4) },
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 0ec335da6c00..8bc4c7cadbb3 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -35,6 +35,7 @@ void WpftWriterFilterTest::test()
};
const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{
{ "Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2) },
+{ "Pages_5.pages", REQUIRE_ETONYEK_VERSION(0, 1, 8) },
};
const writerperfect::test::WpftOptionalMap_t aMWAWOptional{
{ "MaxWrite_1.hqx", REQUIRE_MWAW_VERSION(0, 3, 8) },
diff --git a/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_1.key
b/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_1.key
new file mode 100644
index ..f59ccfab0595
Binary files /dev/null and
b/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_1.key differ
diff --git a/writerperfect/qa/unit/data/writer/libetonyek/pass/Pages_5.pages
b/writerperfect/qa/unit/data/writer/libetonyek/pass/Pages_5.pages
new file mode 100644
index ..cd4438a34b45
Binary files /dev/null and
b/writerperfect/qa/unit/data/writer/libetonyek/pass/Pages_5.pages differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANN] libetonyek 0.1.8 has been released
libetonyek is a library for parsing Apple Keynote, Pages and Numbers formats. Special thanks to Laurent Alonso, who did most of the work for this release! List of changes: - All formats: + Parse fields. + Improve parsing of lists. + Fix output of orphans and widows paragraph properties. + Correctly handle rectangles with rounded corners. + Improve output of callouts. + Parse line ends (arrows). + Parse curves with multiple components. + Improve parsing of fills. + Improve parsing of tables. + Handle cropped images. + Parse grouped shapes. + Parse audio/video preview images. + Parse text wrap. - Keynote 2-5: + Parse old-style images (Keynote 2-3?). + Parse slide styles. + Output master slides. + Parse connection lines. - Keynote 6: + Improve detection of Keynote 6 documents. (tdf#113737) + Output master slides. + Parse connection lines. - Numbers 1-2: + Properly parse TRUE and FALSE functions. - Pages 1-4: + Parse annotations. + Improve parsing of images (position etc.). + Handle tables in a group. + Parse page dimensions from print settings. - Pages 5: + Parse page dimensions. + Parse footnotes/endnotes. + Parse comments. + Parse headers/footers. + Parse tables. + Parse textboxes. + Fix line spacing and paragraph margins. + Parse more text properties. - Miscellaneous: + Add support for Keynote 1 documents. + Add support for Numbers 3 documents. + Fix several issues found by oss-fuzz. + Fix build with glm 0.9.9. + Other fixes and improvements. Home page: https://wiki.documentfoundation.org/DLP/Libraries/libetonyek Download from: http://dev-www.libreoffice.org/src/libetonyek/ D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac |7 --- 1 file changed, 7 deletions(-) New commits: commit f1451fb7742bba9da298027e3ab79390acb196d9 Author: David Tardon <dtar...@redhat.com> Date: Sun Feb 4 09:35:10 2018 +0100 drop pointless check for bzip2 There are many .tar.bz2 (or .tar.xz) tarballs in the bundled projects. It doesn't make sense to check for bzip2 just for one of them. diff --git a/configure.ac b/configure.ac index 6f9b2dc7fc90..f52b0b2b0310 100644 --- a/configure.ac +++ b/configure.ac @@ -8256,13 +8256,6 @@ internal) if test "$HOME" = ""; then export HOME="" fi -# bz2 tarball and bzip2 is not standard -if test -z "$BZIP2"; then -AC_PATH_PROG( BZIP2, bzip2) -if test -z "$BZIP2"; then -AC_MSG_ERROR([the internal Python module has a .tar.bz2. You need bzip2]) -fi -fi ;; no) DISABLE_PYTHON=TRUE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - reportbuilder/Module_reportbuilder.mk reportbuilder/Package_reportbuilder-templates.mk reportbuilder/Package_templates.mk Repository.mk scripting/Package_sc
Repository.mk|6 +++--- reportbuilder/Module_reportbuilder.mk|2 +- reportbuilder/Package_templates.mk |4 ++-- scripting/Package_scriptproviderforpython.mk |6 +++--- sysui/Package_share.mk |6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 4ee275e72e36a5a4182cf6860d709f095b4d87da Author: David Tardon <dtar...@redhat.com> Date: Sun Apr 15 12:33:48 2018 +0200 use the standard name pattern for a package Change-Id: I28f468b84ba0848c6af9bcc3c27971fae1e89fa7 diff --git a/Repository.mk b/Repository.mk index a6dfe7cb8a1c..81268953a3a3 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1062,7 +1062,7 @@ $(eval $(call gb_Helper_register_packages_for_install,python, \ )) $(eval $(call gb_Helper_register_packages_for_install,python_scriptprovider, \ -scriptproviderforpython \ +scripting_scriptproviderforpython \ )) $(eval $(call gb_Helper_register_packages_for_install,python_librelogo, \ diff --git a/scripting/Package_scriptproviderforpython.mk b/scripting/Package_scriptproviderforpython.mk index f16758707ee7..7e21439984b8 100644 --- a/scripting/Package_scriptproviderforpython.mk +++ b/scripting/Package_scriptproviderforpython.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,scriptproviderforpython,$(SRCDIR)/scripting/source/pyprov)) +$(eval $(call gb_Package_Package,scripting_scriptproviderforpython,$(SRCDIR)/scripting/source/pyprov)) -$(eval $(call gb_Package_add_file,scriptproviderforpython,$(LIBO_ETC_FOLDER)/services/scriptproviderforpython.rdb,scriptproviderforpython.rdb)) -$(eval $(call gb_Package_add_file,scriptproviderforpython,$(LIBO_LIB_PYUNO_FOLDER)/pythonscript.py,pythonscript.py)) +$(eval $(call gb_Package_add_file,scripting_scriptproviderforpython,$(LIBO_ETC_FOLDER)/services/scriptproviderforpython.rdb,scriptproviderforpython.rdb)) +$(eval $(call gb_Package_add_file,scripting_scriptproviderforpython,$(LIBO_LIB_PYUNO_FOLDER)/pythonscript.py,pythonscript.py)) # vim: set noet sw=4 ts=4: commit 7d01b75c68291ad57145c22d60db6959758e69ef Author: David Tardon <dtar...@redhat.com> Date: Sun Apr 15 12:31:45 2018 +0200 use the standard name pattern for a package Change-Id: Ia5bf93d6af6ff301439ef04593fcb1d13ab3aa9f diff --git a/Repository.mk b/Repository.mk index 8310a842eb96..a6dfe7cb8a1c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -811,7 +811,7 @@ $(eval $(call gb_Helper_register_packages, \ postprocess_registry \ readlicense_oo_readmes \ setup_native_misc \ - share \ + sysui_share \ vcl_fontunxpsprint \ )) diff --git a/sysui/Package_share.mk b/sysui/Package_share.mk index 3fa7cbeee59d..25ae39bdf1b4 100644 --- a/sysui/Package_share.mk +++ b/sysui/Package_share.mk @@ -7,12 +7,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,share,$(share_WORKDIR)/libreoffice)) +$(eval $(call gb_Package_Package,sysui_share,$(share_WORKDIR)/libreoffice)) -$(eval $(call gb_Package_add_files,share,share/xdg,\ +$(eval $(call gb_Package_add_files,sysui_share,share/xdg,\ $(addsuffix .desktop,$(LAUNCHERLIST)) \ )) -$(eval $(call gb_Package_use_custom_target,share,sysui/share)) +$(eval $(call gb_Package_use_custom_target,sysui_share,sysui/share)) # vim: set noet sw=4 ts=4: commit 1be0d0cddd3571f8bb8bc590e0e22a3a092ca2d7 Author: David Tardon <dtar...@redhat.com> Date: Sun Apr 15 12:30:53 2018 +0200 use the standard name pattern for a package Change-Id: Ie9113403bb87543816220c84e53bf8b30673b194 diff --git a/Repository.mk b/Repository.mk index 69bcdae4d396..8310a842eb96 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1000,7 +1000,7 @@ $(eval $(call gb_Helper_register_packages_for_install,pdfimport, \ endif $(eval $(call gb_Helper_register_packages_for_install,reportbuilder,\ - reportbuilder-templates \ + reportbuilder_templates \ )) $(eval $(call gb_Helper_register_packages_for_install,xsltfilter,\ diff --git a/reportbuilder/Module_reportbuilder.mk b/reportbuilder/Module_reportbuilder.mk index aaa3e596e845..4f554301d271 100644 --- a/reportbuilder/Module_reportbuilder.mk +++ b/reportbuilder/Module_reportbuilder.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,reportbuilder)) ifeq ($(ENABLE_REPORTBUILDER),TRUE) $(eval $(call gb_Module_add_targets,reportbuilder,\ Jar_reportbuilder \ - Package_reportbuilder-templates \ + Package_templates \ )) endif diff --git a/reportbuilder/Package_reportbuilder-templates.mk b/reportbuilder/Package_templates.mk similarity index 84% rename from reportbuilder/Package_reportbuilder-templates.mk rename to reportbuilder/Package_templates.mk index 9f137763198f..570c1f880514 100644 --- a/reportbuilder/Package_reportbuilder-templates.mk +
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/gbuild
solenv/gbuild/UnpackedTarball.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit 4cb868abaf789afe3f2b4bc65454c21c08666a78 Author: David Tardon <dtar...@redhat.com> Date: Thu Mar 29 14:56:44 2018 +0200 tdf#115396 fix mode of files installed from externals Change-Id: I608f46235f2e80e74f6900831d13e082b167cfce Reviewed-on: https://gerrit.libreoffice.org/52144 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index 9654d42fe2de..37913c8c7369 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -358,6 +358,7 @@ endef define gb_UnpackedTarbal__make_pattern_rule $(call gb_UnpackedTarball_get_dir,$(1))/%$(2) : $$(if $$(wildcard $$@),,$$(call gb_Output_error,file $$@ does not exist in the tarball)) + $$(if $$(UNPACKED_MODE),chmod $$(UNPACKED_MODE) $$@ &&) \ touch $$@ $(eval gb_UnpackedTarball_PATTERN_RULES_$(1) += $(2)) @@ -372,6 +373,7 @@ endef define gb_UnpackedTarbal__make_file_rule $(call gb_UnpackedTarball_get_dir,$(1))/$(2) : $$(if $$(wildcard $$@),,$$(call gb_Output_error,file $$@ does not exist in the tarball)) + $$(if $$(UNPACKED_MODE),chmod $$(UNPACKED_MODE) $$@ &&) \ touch $$@ endef @@ -388,6 +390,7 @@ endef define gb_UnpackedTarball_mark_output_file $(call gb_UnpackedTarball_get_final_target,$(1)) : $(call gb_UnpackedTarball_get_dir,$(1))/$(2) $(call gb_UnpackedTarball_get_dir,$(1))/$(2) : $(call gb_UnpackedTarball_get_target,$(1)) +$(call gb_UnpackedTarball_get_dir,$(1))/$(2) : UNPACKED_MODE := 644 $(if $(suffix $(2)),\ $(call gb_UnpackedTarbal__ensure_pattern_rule,$(1),$(suffix $(2))),\ $(call gb_UnpackedTarbal__make_file_rule,$(1),$(2)) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/UnpackedTarball.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit 2340536cf478f95e33b718d3f69da5345fc4d2b4 Author: David Tardon <dtar...@redhat.com> Date: Thu Mar 29 14:56:44 2018 +0200 tdf#115396 fix mode of files installed from externals Change-Id: I608f46235f2e80e74f6900831d13e082b167cfce Reviewed-on: https://gerrit.libreoffice.org/52074 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index 9654d42fe2de..37913c8c7369 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -358,6 +358,7 @@ endef define gb_UnpackedTarbal__make_pattern_rule $(call gb_UnpackedTarball_get_dir,$(1))/%$(2) : $$(if $$(wildcard $$@),,$$(call gb_Output_error,file $$@ does not exist in the tarball)) + $$(if $$(UNPACKED_MODE),chmod $$(UNPACKED_MODE) $$@ &&) \ touch $$@ $(eval gb_UnpackedTarball_PATTERN_RULES_$(1) += $(2)) @@ -372,6 +373,7 @@ endef define gb_UnpackedTarbal__make_file_rule $(call gb_UnpackedTarball_get_dir,$(1))/$(2) : $$(if $$(wildcard $$@),,$$(call gb_Output_error,file $$@ does not exist in the tarball)) + $$(if $$(UNPACKED_MODE),chmod $$(UNPACKED_MODE) $$@ &&) \ touch $$@ endef @@ -388,6 +390,7 @@ endef define gb_UnpackedTarball_mark_output_file $(call gb_UnpackedTarball_get_final_target,$(1)) : $(call gb_UnpackedTarball_get_dir,$(1))/$(2) $(call gb_UnpackedTarball_get_dir,$(1))/$(2) : $(call gb_UnpackedTarball_get_target,$(1)) +$(call gb_UnpackedTarball_get_dir,$(1))/$(2) : UNPACKED_MODE := 644 $(if $(suffix $(2)),\ $(call gb_UnpackedTarbal__ensure_pattern_rule,$(1),$(suffix $(2))),\ $(call gb_UnpackedTarbal__make_file_rule,$(1),$(2)) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 9c459fd919cb8199a69fc2d630742930e533285b Author: David Tardon <dtar...@redhat.com> Date: Thu Mar 29 09:20:19 2018 +0200 upload openssl 1.0.2o Change-Id: Ib44570ff53d754d1d568378ef0dac4d4789f2042 Reviewed-on: https://gerrit.libreoffice.org/52051 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: David Tardon <dtar...@redhat.com> diff --git a/download.lst b/download.lst index cadfd170dce2..5225f03d7148 100644 --- a/download.lst +++ b/download.lst @@ -190,8 +190,8 @@ export OFFICEOTRON_SHA256SUM := f2443f27561af52324eee03a1892d9f569adc8db9e7bca55 export OFFICEOTRON_JAR := 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar export OPENLDAP_SHA256SUM := cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824 export OPENLDAP_TARBALL := openldap-2.4.45.tgz -export OPENSSL_SHA256SUM := 8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f -export OPENSSL_TARBALL := openssl-1.0.2m.tar.gz +export OPENSSL_SHA256SUM := ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d +export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz export ORCUS_SHA256SUM := bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b export ORCUS_TARBALL := liborcus-0.13.4.tar.gz export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libstaroffice
external/libstaroffice/0001-fix-null-ptr-deref.-if-decryption-failed.patch.1 |
35 ++
external/libstaroffice/UnpackedTarball_libstaroffice.mk |
4 +
2 files changed, 39 insertions(+)
New commits:
commit 21827d1776b3c47ecab76561cf3e95bbf79f4a6e
Author: David Tardon <dtar...@redhat.com>
Date: Wed Mar 28 14:56:40 2018 +0200
forcepoint: fix null ptr deref.
Change-Id: I867a4332d666bf4a0e38e93c0c7918fb106958c6
diff --git
a/external/libstaroffice/0001-fix-null-ptr-deref.-if-decryption-failed.patch.1
b/external/libstaroffice/0001-fix-null-ptr-deref.-if-decryption-failed.patch.1
new file mode 100644
index ..658f6797940d
--- /dev/null
+++
b/external/libstaroffice/0001-fix-null-ptr-deref.-if-decryption-failed.patch.1
@@ -0,0 +1,35 @@
+From 59f29dd735bf5890ea29fdde809afcf111463a65 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtar...@redhat.com>
+Date: Mon, 12 Mar 2018 20:33:54 +0100
+Subject: [PATCH] fix null ptr deref. if decryption failed
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Thanks to Antti Levomäki and Christian Jalio from Forcepoint.
+---
+ src/lib/StarObjectDraw.cxx | 7 ---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/lib/StarObjectDraw.cxx b/src/lib/StarObjectDraw.cxx
+index fd3411a..8a19b1c 100644
+--- a/src/lib/StarObjectDraw.cxx
b/src/lib/StarObjectDraw.cxx
+@@ -199,10 +199,11 @@ try
+if the user mask does correspond to the real mask.
+ */
+ input=StarEncryption::decodeStream(input,
StarEncryption::getMaskToDecodeStream(firstByte, 0x44));
+-if (input) {
+- zone.setInput(input);
+- input->seek(0, librevenge::RVNG_SEEK_SET);
++if (!input) {
++ STOFF_DEBUG_MSG(("StarObjectDraw::readDrawDocument: decryption
failed\n"));
++ return false;
+ }
++zone.setInput(input);
+ }
+ input->seek(0, librevenge::RVNG_SEEK_SET);
+ std::shared_ptr model(new StarObjectModel(*this, true));
+--
+2.14.3
+
diff --git a/external/libstaroffice/UnpackedTarball_libstaroffice.mk
b/external/libstaroffice/UnpackedTarball_libstaroffice.mk
index 17bf429eb8d0..781634ab9fb3 100644
--- a/external/libstaroffice/UnpackedTarball_libstaroffice.mk
+++ b/external/libstaroffice/UnpackedTarball_libstaroffice.mk
@@ -37,4 +37,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \
))
endif
+$(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \
+
external/libstaroffice/0001-fix-null-ptr-deref.-if-decryption-failed.patch.1 \
+))
+
# vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRDocument.cpp |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 4d3c9a8ca4a0390965c2ebae4e263a4af566e206
Author: David Tardon <dtar...@redhat.com>
Date: Tue Mar 27 09:45:09 2018 +0200
ofz#7119 avoid setting ref to a temp. var.
Change-Id: I9f91a4e892867ce45f3bd0450ee323a45c42ecd3
diff --git a/src/lib/CDRDocument.cpp b/src/lib/CDRDocument.cpp
index 73a9527..a271090 100644
--- a/src/lib/CDRDocument.cpp
+++ b/src/lib/CDRDocument.cpp
@@ -116,8 +116,9 @@ CDRAPI bool
libcdr::CDRDocument::parse(librevenge::RVNGInputStream *input_, libr
{
input->seek(0, librevenge::RVNG_SEEK_SET);
CDRParserState ps;
+ std::vector<std::unique_ptr>
dummyDataStreams;
CDRStylesCollector stylesCollector(ps);
- CDRParser
stylesParser(std::vector<std::unique_ptr>(),
);
+ CDRParser stylesParser(dummyDataStreams, );
if (version >= 300)
retVal = stylesParser.parseRecords(input.get());
else
@@ -128,7 +129,7 @@ CDRAPI bool
libcdr::CDRDocument::parse(librevenge::RVNGInputStream *input_, libr
{
input->seek(0, librevenge::RVNG_SEEK_SET);
CDRContentCollector contentCollector(ps, painter);
-CDRParser
contentParser(std::vector<std::unique_ptr>(),
);
+CDRParser contentParser(dummyDataStreams, );
if (version >= 300)
retVal = contentParser.parseRecords(input.get());
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Resources on writing import/export file filters for Writer
Hi, On Mon, 2018-03-26 at 09:26 +0200, Jens Tröger wrote: > Thanks David, I'll noodle through the Wiki then. > > (Maybe) last question for now: if this: > > https://github.com/LibreOffice/core/tree/master/sw/source/filter > > are the import filters for (some) of the file formats that Writer is > able to read, where would the export filters be? In the same directory as the import filters, typically... D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libvisio.git: 7 commits - src/lib
src/lib/VDXParser.cpp | 39 ---
src/lib/VSD5Parser.cpp |7 ---
src/lib/VSD6Parser.cpp |5 +++--
src/lib/VSDCharacterList.cpp|3 ++-
src/lib/VSDContentCollector.cpp |3 ++-
src/lib/VSDFieldList.cpp|3 ++-
src/lib/VSDGeometryList.cpp |3 ++-
src/lib/VSDInternalStream.cpp |2 +-
src/lib/VSDMetaData.cpp |1 +
src/lib/VSDPages.cpp|1 +
src/lib/VSDParagraphList.cpp| 33 ++---
src/lib/VSDParagraphList.h |3 ++-
src/lib/VSDParser.cpp | 23 +++
src/lib/VSDShapeList.cpp|2 +-
src/lib/VSDStencils.cpp | 25 +++--
src/lib/VSDStencils.h |7 ---
src/lib/VSDStyles.cpp |3 ++-
src/lib/VSDStylesCollector.cpp |3 ++-
src/lib/VSDXMLHelper.cpp|5 +
src/lib/VSDXMLParserBase.cpp|9 +
src/lib/VSDXMLTokenMap.cpp |1 +
src/lib/VSDXMetaData.cpp|1 +
src/lib/VSDXParser.cpp | 39 ---
src/lib/VisioDocument.cpp |3 ++-
src/lib/libvisio_utils.cpp |6 ++
src/lib/libvisio_xml.cpp|3 +++
26 files changed, 112 insertions(+), 121 deletions(-)
New commits:
commit c1bb49486e73e9e19944be6a995e3bbd96210f8f
Author: David Tardon <dtar...@redhat.com>
Date: Sun Mar 25 16:49:53 2018 +0200
move define where it should be
Change-Id: Ie8080354158b01bd29c14105dce3919eb19a01e6
diff --git a/src/lib/VSDXMLHelper.cpp b/src/lib/VSDXMLHelper.cpp
index c0e1cf5..6f483b8 100644
--- a/src/lib/VSDXMLHelper.cpp
+++ b/src/lib/VSDXMLHelper.cpp
@@ -7,10 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef BOOST_LEXICAL_CAST_ASSUME_C_LOCALE
-#define BOOST_LEXICAL_CAST_ASSUME_C_LOCALE 1
-#endif
-
#include "VSDXMLHelper.h"
#include
diff --git a/src/lib/libvisio_xml.cpp b/src/lib/libvisio_xml.cpp
index fb18627..df0c5f9 100644
--- a/src/lib/libvisio_xml.cpp
+++ b/src/lib/libvisio_xml.cpp
@@ -9,6 +9,9 @@
#include "libvisio_xml.h"
+#ifndef BOOST_LEXICAL_CAST_ASSUME_C_LOCALE
+#define BOOST_LEXICAL_CAST_ASSUME_C_LOCALE 1
+#endif
#include
#include "VSDTypes.h"
commit 5fa2b1a754a026f7c36f339b396574c1c43700c8
Author: David Tardon <dtar...@redhat.com>
Date: Sun Mar 25 16:48:12 2018 +0200
make sure headers are self-contained
Change-Id: I77beb4ce00ec070f2599362f6462d967613abd2b
diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp
index 0e5cc1b..c305ab8 100644
--- a/src/lib/VDXParser.cpp
+++ b/src/lib/VDXParser.cpp
@@ -7,12 +7,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include "VDXParser.h"
+
#include
#include
#include
#include
#include
-#include "VDXParser.h"
#include "libvisio_utils.h"
#include "libvisio_xml.h"
#include "VSDContentCollector.h"
diff --git a/src/lib/VSD5Parser.cpp b/src/lib/VSD5Parser.cpp
index fe841cc..cfc0d94 100644
--- a/src/lib/VSD5Parser.cpp
+++ b/src/lib/VSD5Parser.cpp
@@ -7,13 +7,14 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include "VSD5Parser.h"
+
#include
#include
#include
#include
#include
#include "libvisio_utils.h"
-#include "VSD5Parser.h"
#include "VSDInternalStream.h"
#include "VSDDocumentStructure.h"
#include "VSDContentCollector.h"
diff --git a/src/lib/VSD6Parser.cpp b/src/lib/VSD6Parser.cpp
index ea3be55..a41016b 100644
--- a/src/lib/VSD6Parser.cpp
+++ b/src/lib/VSD6Parser.cpp
@@ -7,12 +7,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include "VSD6Parser.h"
+
#include
#include
#include
#include
#include "libvisio_utils.h"
-#include "VSD6Parser.h"
#include "VSDInternalStream.h"
#include "VSDDocumentStructure.h"
#include "VSDContentCollector.h"
diff --git a/src/lib/VSDCharacterList.cpp b/src/lib/VSDCharacterList.cpp
index 6f9fe8e..17935fc 100644
--- a/src/lib/VSDCharacterList.cpp
+++ b/src/lib/VSDCharacterList.cpp
@@ -7,9 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "VSDCollector.h"
#include "VSDCharacterList.h"
+#include "VSDCollector.h"
+
namespace libvisio
{
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index cde0ad0..8b297da 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include "VSDContentCollector.h"
+
#include
#include
#include // for memcpy
@@ -17,7 +19,6 @@
#include
#include
-#include "VSDContentCollector.h"
#include "VSDParse
[Libreoffice-commits] libvisio.git: 8 commits - src/lib
src/lib/VSDCharacterList.cpp | 29 +++-
src/lib/VSDCharacterList.h |3
src/lib/VSDContentCollector.cpp |3
src/lib/VSDFieldList.cpp | 31 +++--
src/lib/VSDFieldList.h |3
src/lib/VSDGeometryList.cpp | 131 ++-
src/lib/VSDGeometryList.h|5 -
src/lib/VSDOutputElementList.cpp | 19 -
src/lib/VSDParagraphList.cpp | 11 ++-
src/lib/libvisio_utils.h | 12 +++
10 files changed, 101 insertions(+), 146 deletions(-)
New commits:
commit 40c8a1d8216bebfccfcea5ec55af2848f3a72170
Author: David Tardon <dtar...@redhat.com>
Date: Sun Mar 25 14:25:47 2018 +0200
guard against self-assignment
Change-Id: I2eff7abe7d341455c111291ecf81ff348846bc11
diff --git a/src/lib/VSDCharacterList.cpp b/src/lib/VSDCharacterList.cpp
index 65de7af..6f9fe8e 100644
--- a/src/lib/VSDCharacterList.cpp
+++ b/src/lib/VSDCharacterList.cpp
@@ -88,10 +88,13 @@ libvisio::VSDCharacterList::VSDCharacterList(const
libvisio::VSDCharacterList
libvisio::VSDCharacterList ::VSDCharacterList::operator=(const
libvisio::VSDCharacterList )
{
- clear();
- for (auto iter = charList.m_elements.begin(); iter !=
charList.m_elements.end(); ++iter)
-m_elements[iter->first] = clone(iter->second);
- m_elementsOrder = charList.m_elementsOrder;
+ if (this != )
+ {
+clear();
+for (auto iter = charList.m_elements.begin(); iter !=
charList.m_elements.end(); ++iter)
+ m_elements[iter->first] = clone(iter->second);
+m_elementsOrder = charList.m_elementsOrder;
+ }
return *this;
}
diff --git a/src/lib/VSDGeometryList.cpp b/src/lib/VSDGeometryList.cpp
index ac1b616..92746d8 100644
--- a/src/lib/VSDGeometryList.cpp
+++ b/src/lib/VSDGeometryList.cpp
@@ -579,10 +579,13 @@ libvisio::VSDGeometryList::VSDGeometryList(const
VSDGeometryList ) :
libvisio::VSDGeometryList ::VSDGeometryList::operator=(const
VSDGeometryList )
{
- clear();
- for (auto iter = geomList.m_elements.begin(); iter !=
geomList.m_elements.end(); ++iter)
-m_elements[iter->first] = clone(iter->second);
- m_elementsOrder = geomList.m_elementsOrder;
+ if (this != )
+ {
+clear();
+for (auto iter = geomList.m_elements.begin(); iter !=
geomList.m_elements.end(); ++iter)
+ m_elements[iter->first] = clone(iter->second);
+m_elementsOrder = geomList.m_elementsOrder;
+ }
return *this;
}
diff --git a/src/lib/VSDParagraphList.cpp b/src/lib/VSDParagraphList.cpp
index f279bb8..c1863a1 100644
--- a/src/lib/VSDParagraphList.cpp
+++ b/src/lib/VSDParagraphList.cpp
@@ -89,10 +89,13 @@ libvisio::VSDParagraphList::VSDParagraphList(const
libvisio::VSDParagraphList
libvisio::VSDParagraphList ::VSDParagraphList::operator=(const
libvisio::VSDParagraphList )
{
- clear();
- for (auto iter = paraList.m_elements.begin(); iter !=
paraList.m_elements.end(); ++iter)
-m_elements[iter->first] = iter->second->clone();
- m_elementsOrder = paraList.m_elementsOrder;
+ if (this != )
+ {
+clear();
+for (auto iter = paraList.m_elements.begin(); iter !=
paraList.m_elements.end(); ++iter)
+ m_elements[iter->first] = iter->second->clone();
+m_elementsOrder = paraList.m_elementsOrder;
+ }
return *this;
}
commit 467618a5b883c7303fc6ef8e10756e203ceaed11
Author: David Tardon <dtar...@redhat.com>
Date: Sun Mar 25 14:23:08 2018 +0200
avoid manual memory mgmt
Change-Id: I4694b93a135dc568beb234a6300a492326122257
diff --git a/src/lib/VSDCharacterList.cpp b/src/lib/VSDCharacterList.cpp
index ae702ef..65de7af 100644
--- a/src/lib/VSDCharacterList.cpp
+++ b/src/lib/VSDCharacterList.cpp
@@ -83,14 +83,14 @@ libvisio::VSDCharacterList::VSDCharacterList(const
libvisio::VSDCharacterList
m_elementsOrder(charList.m_elementsOrder)
{
for (auto iter = charList.m_elements.begin(); iter !=
charList.m_elements.end(); ++iter)
-m_elements[iter->first] = iter->second->clone();
+m_elements[iter->first] = clone(iter->second);
}
libvisio::VSDCharacterList ::VSDCharacterList::operator=(const
libvisio::VSDCharacterList )
{
clear();
for (auto iter = charList.m_elements.begin(); iter !=
charList.m_elements.end(); ++iter)
-m_elements[iter->first] = iter->second->clone();
+m_elements[iter->first] = clone(iter->second);
m_elementsOrder = charList.m_elementsOrder;
return *this;
}
@@ -107,14 +107,11 @@ void libvisio::VSDCharacterList::addCharIX(unsigned id,
unsigned level, unsigned
const boost::optional
, const boost::optional , const boost::optional
,
const boost::optional
, const boost::optional , const
boost::optional )
{
- auto *tmpElement = dynamic_cast(m_elements[id]);
+ auto *tmpElement = dynamic_cast(m_elements[id].get());
if (!tmpElement)
{
-if (m_elements[id])
- del
[Libreoffice-commits] libcdr.git: 8 commits - src/lib
src/lib/CDRContentCollector.cpp | 13 --
src/lib/CDRContentCollector.h|3
src/lib/CDRDocument.cpp | 11 +-
src/lib/CDROutputElementList.cpp | 179 +++
src/lib/CDROutputElementList.h |7 -
src/lib/CDRParser.cpp|4
src/lib/CDRParser.h |7 -
src/lib/CDRPath.cpp | 168 +---
src/lib/CDRPath.h|9 +
src/lib/libcdr_utils.h |7 +
10 files changed, 164 insertions(+), 244 deletions(-)
New commits:
commit 517dbbed46ee34710d0346dbe84c9fbe6a426e7d
Author: David Tardon <dtar...@redhat.com>
Date: Sat Mar 24 17:22:15 2018 +0100
drop unused headers
Change-Id: I44a999f25ea14a73737019350d40dd4ebb982854
diff --git a/src/lib/CDRParser.h b/src/lib/CDRParser.h
index 4bb79d6..242736d 100644
--- a/src/lib/CDRParser.h
+++ b/src/lib/CDRParser.h
@@ -10,8 +10,6 @@
#ifndef __CDRPARSER_H__
#define __CDRPARSER_H__
-#include
-#include
#include
#include
#include
commit 7c9f013d8924407c88515533a1a5703282b075dc
Author: David Tardon <dtar...@redhat.com>
Date: Sat Mar 24 17:21:45 2018 +0100
use unique_ptr
Change-Id: I8954729882f578f59ec15bef193737736281a940
diff --git a/src/lib/CDRDocument.cpp b/src/lib/CDRDocument.cpp
index 96f652e..73a9527 100644
--- a/src/lib/CDRDocument.cpp
+++ b/src/lib/CDRDocument.cpp
@@ -117,7 +117,7 @@ CDRAPI bool
libcdr::CDRDocument::parse(librevenge::RVNGInputStream *input_, libr
input->seek(0, librevenge::RVNG_SEEK_SET);
CDRParserState ps;
CDRStylesCollector stylesCollector(ps);
- CDRParser stylesParser(std::vector(),
);
+ CDRParser
stylesParser(std::vector<std::unique_ptr>(),
);
if (version >= 300)
retVal = stylesParser.parseRecords(input.get());
else
@@ -128,7 +128,7 @@ CDRAPI bool
libcdr::CDRDocument::parse(librevenge::RVNGInputStream *input_, libr
{
input->seek(0, librevenge::RVNG_SEEK_SET);
CDRContentCollector contentCollector(ps, painter);
-CDRParser contentParser(std::vector(),
);
+CDRParser
contentParser(std::vector<std::unique_ptr>(),
);
if (version >= 300)
retVal = contentParser.parseRecords(input.get());
else
@@ -144,7 +144,6 @@ CDRAPI bool
libcdr::CDRDocument::parse(librevenge::RVNGInputStream *input_, libr
}
librevenge::RVNGInputStream *tmpInput = input_;
- std::vector dataStreams;
try
{
std::vector dataFiles;
@@ -179,6 +178,7 @@ CDRAPI bool
libcdr::CDRDocument::parse(librevenge::RVNGInputStream *input_, libr
}
}
}
+std::vector<std::unique_ptr> dataStreams;
dataStreams.reserve(dataFiles.size());
for (const auto : dataFiles)
{
@@ -186,7 +186,8 @@ CDRAPI bool
libcdr::CDRDocument::parse(librevenge::RVNGInputStream *input_, libr
streamName += dataFile;
CDR_DEBUG_MSG(("Extracting stream: %s\n", streamName.c_str()));
tmpInput->seek(0, librevenge::RVNG_SEEK_SET);
- dataStreams.push_back(tmpInput->getSubStreamByName(streamName.c_str()));
+ std::unique_ptr
strm(tmpInput->getSubStreamByName(streamName.c_str()));
+ dataStreams.push_back(std::move(strm));
}
if (!input)
input.reset(tmpInput, CDRDummyDeleter());
@@ -223,8 +224,6 @@ CDRAPI bool
libcdr::CDRDocument::parse(librevenge::RVNGInputStream *input_, libr
{
retVal = false;
}
- for (auto : dataStreams)
-delete dataStream;
return retVal;
}
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 4e7956e..e58fbca 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -157,7 +157,7 @@ void normalizeAngle(double )
} // anonymous namespace
-libcdr::CDRParser::CDRParser(const std::vector
, libcdr::CDRCollector *collector)
+libcdr::CDRParser::CDRParser(const
std::vector<std::unique_ptr> ,
libcdr::CDRCollector *collector)
: CommonParser(collector), m_externalStreams(externalStreams),
m_fonts(), m_fillStyles(), m_lineStyles(), m_arrows(), m_version(0),
m_waldoOutlId(0), m_waldoFillId(0) {}
@@ -2427,7 +2427,7 @@ bool
libcdr::CDRParser::_redirectX6Chunk(librevenge::RVNGInputStream **input, un
if (streamNumber < m_externalStreams.size())
{
unsigned streamOffset = readU32(*input);
- *input = m_externalStreams[streamNumber];
+ *input = m_externalStreams[streamNumber].get();
if (*input)
{
(*input)->seek(streamOffset, librevenge::RVNG_SEEK_SET);
diff --git a/src/lib/CDRParser.h b/src/lib/CDRParser.h
index 8ce7887..4bb79d6 100644
--- a/src/lib/CDRParser.h
+++ b/src/lib/CDRParser.h
@@ -12,6 +12,7 @@
#include
#include
+#include
#include
#include
#include
@@ -27,7 +28,7 @@ class CDRCollector;
class CDRParser : protected CommonParser
{
public:
- explicit CDRParser(const std::vector
, CDRCollector *collector);
Re: Resources on writing import/export file filters for Writer
Hi, On Wed, 2018-03-21 at 22:44 -0700, Jens Tröger wrote: > Thank you David. That's a start but still assumes a lot of implicit > knowledge > about the surrounding infrastructure. Is there a minimal export > plugin to > start from? I do have quite some experience with the object model > from the > Python/UNO view. I don't know. There might be something in the UNO examples. I think there is also a chapter about filters in the old OO.o Developers Guide (http://www.openoffice.org/api/DevelopersGuide/DevelopersGuide.html). > Also, it appears that LO6+ imports (x)html files to some extend. > Where do I > ask questions On this list or on IRC. > /file bugs around that? At http://tdf.io/bugs . Btw, the HTML import is nothing new. Quite the contrary. It was already present in OO.o 1.0 (and the code has changed very little since that time). > Or, in the context of this thread, > where do I find the source on https://github.com/LibreOffice ? In sw/source/filter/html in the core repo. > I assume this one is a good way to settle in: > https://wiki.documentfoundation.org/Development/BuildingOnLinuxux ? Yes, it is. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libmspub.git: src/lib
src/lib/PolygonUtils.cpp |4
1 file changed, 4 insertions(+)
New commits:
commit 3988aba06f5297fc2262462d89cb601aeffcae3b
Author: David Tardon <dtar...@redhat.com>
Date: Wed Mar 21 15:03:03 2018 +0100
ofz#7053 avoid access to empty vector
Change-Id: I0d353901c1d5a02b57cc068aa9b7669af81f3073
diff --git a/src/lib/PolygonUtils.cpp b/src/lib/PolygonUtils.cpp
index 7738809..17f3515 100644
--- a/src/lib/PolygonUtils.cpp
+++ b/src/lib/PolygonUtils.cpp
@@ -5786,6 +5786,10 @@ void drawEmulatedLine(std::shared_ptr
shape, ShapeType shapeT
}
}
}
+
+ if (lineInfos.empty())
+return;
+
if (rectangle)
{
LineInfo *top = [0];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libmspub.git: src/lib
src/lib/MSPUBCollector.cpp |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 4a517815d868b3fa5ab4bf99621177dda8dc3f3b
Author: David Tardon <dtar...@redhat.com>
Date: Mon Mar 19 10:24:53 2018 +0100
ofz#7006 tweak to avoid signed int overflow
Change-Id: Ic8d3835c7f70639ec4d0cb566c2cf6eaa543a61e
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index a2efb2c..94266c2 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -459,13 +459,13 @@ Coordinate getFudgedCoordinates(Coordinate coord, const
std::vector
}
else
{
-if (unsigned(fudged.m_xe - fudged.m_xs) > leftFudge)
+if (int64_t(fudged.m_xe) - fudged.m_xs > leftFudge)
fudged.m_xs += leftFudge;
-if (unsigned(fudged.m_xe - fudged.m_xs) > rightFudge)
+if (int64_t(fudged.m_xe) - fudged.m_xs > rightFudge)
fudged.m_xe -= rightFudge;
-if (unsigned(fudged.m_ye - fudged.m_ys) > topFudge)
+if (int64_t(fudged.m_ye) - fudged.m_ys > topFudge)
fudged.m_ys += topFudge;
-if (unsigned(fudged.m_ye - fudged.m_ys) > bottomFudge)
+if (int64_t(fudged.m_ye) - fudged.m_ys > bottomFudge)
fudged.m_ye -= bottomFudge;
}
return fudged;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: HELP
On Sat, 2018-03-17 at 21:32 +0530, Projat Banerjee wrote: > What is the type of proposal should I submit here ? Read https://wiki.documentfoundation.org/Development/GSoC#Proposals. Then look at https://wiki.documentfoundation.org/Development/GSoC/Ideas . Then get involved. And you'd better not delay much, because you haven't left much time to yourself... > What kind or on what basis should I build my proposal so that I may > get easily selected or chances for my selection is high ? Seriously?! You're expecting _us_ to help _you_ to get selected?! Sorry, but it doesn't work that way. If you're just looking for some easy money, you're at the wrong address... D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRParser.cpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 10fa0f73c0cf39bc03a39e08c49084ed7bc9ac9e
Author: David Tardon <dtar...@redhat.com>
Date: Sat Mar 17 11:35:24 2018 +0100
ofz#6948 ensure pattern dims are initialized
Change-Id: Id03ebbaadf8e6a5b752b429da19639f024bbba86
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 1dd4bfa..4e7956e 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -2338,7 +2338,7 @@ void
libcdr::CDRParser::readBmpf(librevenge::RVNGInputStream *input, unsigned le
if (!_redirectX6Chunk(, length))
throw GenericException();
unsigned patternId = readU32(input);
- unsigned width, height;
+ unsigned width{}, height{};
std::vector pattern;
readBmpPattern(width, height, pattern, length-4, input);
m_collector->collectBmpf(patternId, width, height, pattern);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/pdf/pdffilter.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit fd877edc1822816be04b2e2fa0f883c00b5d2fb0 Author: David Tardon <dtar...@redhat.com> Date: Tue Mar 13 10:20:32 2018 +0100 tdf#105679 honor more saved settings on direct PDF export Change-Id: I555b2e2609b731ffac09014a3d84eda434cbb7a6 diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx index d20a2d3acd98..b8ccf47f455a 100644 --- a/filter/source/pdf/pdffilter.cxx +++ b/filter/source/pdf/pdffilter.cxx @@ -74,6 +74,7 @@ bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) aCfgItem.ReadBool( "ExportNotes", false ); aCfgItem.ReadBool( "ExportPlaceholders", false ); aCfgItem.ReadBool( "ExportNotesPages", false ); +aCfgItem.ReadBool( "ExportOnlyNotesPages", false ); aCfgItem.ReadBool( "UseTransitionEffects", true ); aCfgItem.ReadBool( "IsSkipEmptyPages", false ); aCfgItem.ReadBool( "ExportFormFields", true ); @@ -87,8 +88,10 @@ bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) aCfgItem.ReadBool( "DisplayPDFDocumentTitle", true ); aCfgItem.ReadInt32( "InitialView", 0 ); aCfgItem.ReadInt32( "Magnification", 0 ); +aCfgItem.ReadInt32( "Zoom", 100 ); aCfgItem.ReadInt32( "PageLayout", 0 ); aCfgItem.ReadBool( "FirstPageOnLeft", false ); +aCfgItem.ReadInt32( "InitialPage", 1 ); aCfgItem.ReadBool( "IsAddStream", false ); // the encryption is not available when exporting directly, since the encryption is off by default and the selection ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRContentCollector.cpp | 27 +++
src/lib/CDRParser.cpp | 18 +-
2 files changed, 20 insertions(+), 25 deletions(-)
New commits:
commit 6c957a8bb3639bd47a8b697e665772ce84baf788
Author: David Tardon <dtar...@redhat.com>
Date: Mon Mar 12 13:57:08 2018 +0100
speed up angle normalization
Change-Id: I788422726995f95eb3d040978887fb0dcf647ebf
diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index 0487319..c8a556f 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -50,6 +50,13 @@ void normalize(double )
}
}
+void normalizeAngle(double )
+{
+ angle = fmod(angle, 360);
+ if (angle < 0)
+angle += 360;
+}
+
}
}
@@ -718,10 +725,7 @@ void
libcdr::CDRContentCollector::_fillProperties(librevenge::RVNGPropertyList &
else if (m_currentFillStyle.gradient.m_stops.size() == 2)
{
double angle = m_currentFillStyle.gradient.m_angle * 180 / M_PI;
- while (angle < 0.0)
-angle += 360.0;
- while (angle > 360.0)
-angle -= 360.0;
+ normalizeAngle(angle);
propList.insert("draw:fill", "gradient");
propList.insert("draw:start-color",
m_ps.getRGBColorString(m_currentFillStyle.gradient.m_stops[0].m_color));
propList.insert("draw:end-color",
m_ps.getRGBColorString(m_currentFillStyle.gradient.m_stops[1].m_color));
@@ -732,10 +736,7 @@ void
libcdr::CDRContentCollector::_fillProperties(librevenge::RVNGPropertyList &
case 3: // conical
propList.insert("draw:style", "linear");
angle += 90.0;
-while (angle < 0.0)
- angle += 360.0;
-while (angle > 360.0)
- angle -= 360.0;
+normalizeAngle(angle);
propList.insert("draw:angle", (int)angle);
propList.insert("draw:border",
(double)(m_currentFillStyle.gradient.m_edgeOffset)/100.0,
librevenge::RVNG_PERCENT);
break;
@@ -754,10 +755,7 @@ void
libcdr::CDRContentCollector::_fillProperties(librevenge::RVNGPropertyList &
default:
propList.insert("draw:style", "linear");
angle += 90.0;
-while (angle < 0.0)
- angle += 360.0;
-while (angle > 360.0)
- angle -= 360.0;
+normalizeAngle(angle);
propList.insert("draw:angle", (int)angle);
librevenge::RVNGPropertyListVector vec;
for (auto : m_currentFillStyle.gradient.m_stops)
@@ -778,10 +776,7 @@ void
libcdr::CDRContentCollector::_fillProperties(librevenge::RVNGPropertyList &
propList.insert("draw:style", "linear");
double angle = m_currentFillStyle.gradient.m_angle * 180 / M_PI;
angle += 90.0;
- while (angle < 0.0)
-angle += 360.0;
- while (angle > 360.0)
-angle -= 360.0;
+ normalizeAngle(angle);
propList.insert("draw:angle", (int)angle);
librevenge::RVNGPropertyListVector vec;
for (auto : m_currentFillStyle.gradient.m_stops)
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 6528d32..1dd4bfa 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -148,6 +148,13 @@ static int parseColourString(const char *colourString,
libcdr::CDRColor ,
return 1;
}
+void normalizeAngle(double )
+{
+ angle = std::fmod(angle, 2*M_PI);
+ if (angle < 0)
+angle += 2*M_PI;
+}
+
} // anonymous namespace
libcdr::CDRParser::CDRParser(const std::vector
, libcdr::CDRCollector *collector)
@@ -1283,15 +1290,8 @@ void
libcdr::CDRParser::readEllipse(librevenge::RVNGInputStream *input)
double rx = fabs(cx);
double ry = fabs(cy);
- while (angle1 < 0.0)
-angle1 += 2*M_PI;
- while (angle1 > 2*M_PI)
-angle1 -= 2*M_PI;
-
- while (angle2 < 0.0)
-angle2 += 2*M_PI;
- while (angle2 > 2*M_PI)
-angle2 -= 2*M_PI;
+ normalizeAngle(angle1);
+ normalizeAngle(angle2);
CDRPath path;
if (angle1 != angle2)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSDContentCollector.cpp |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit f85c44b280a57cc273217c8385dd95a4989bd827
Author: David Tardon <dtar...@redhat.com>
Date: Mon Mar 12 13:32:53 2018 +0100
speed up angle normalization
Change-Id: I2531cae69ef9a64d5004692919bdcd96a069e994
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index 9b4b39e..25907eb 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -638,9 +638,8 @@ void libvisio::VSDContentCollector::_flushText()
if (flipX)
angle -= M_PI;
- while (angle > M_PI)
-angle -= 2 * M_PI;
- while (angle < -M_PI)
+ angle = std::fmod(angle, 2 * M_PI);
+ if (angle < 0)
angle += 2 * M_PI;
textBlockProps.insert("svg:x", m_scale * x);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libmspub.git: 3 commits - src/lib
src/lib/Coordinate.cpp | 36
src/lib/Coordinate.h |5 -
src/lib/MSPUBCollector.cpp | 14 +-
src/lib/MSPUBParser.cpp|1 +
src/lib/Makefile.am|1 +
src/lib/PolygonUtils.cpp | 17 -
src/lib/PolygonUtils.h |2 --
7 files changed, 51 insertions(+), 25 deletions(-)
New commits:
commit 28c545e7d04d58af998bcf4af5d1bb326d29836c
Author: David Tardon <dtar...@redhat.com>
Date: Mon Mar 12 11:23:48 2018 +0100
ofz#6469 ensure coords are in correct order
I.e., xs <= xe and ys <= ye. The previous situation could lead to
surprises like negative width/height.
Change-Id: I23fc2786292d9eebe713870a69e577c9324da09f
diff --git a/src/lib/Coordinate.cpp b/src/lib/Coordinate.cpp
new file mode 100644
index 000..b865632
--- /dev/null
+++ b/src/lib/Coordinate.cpp
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * This file is part of the libmspub project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "Coordinate.h"
+
+#include
+
+namespace libmspub
+{
+
+Coordinate::Coordinate(int xs, int ys, int xe, int ye)
+ : m_xs(xs)
+ , m_ys(ys)
+ , m_xe(xe)
+ , m_ye(ye)
+{
+ arrange();
+}
+
+void Coordinate::arrange()
+{
+ if (m_xs > m_xe)
+std::swap(m_xs, m_xe);
+ if (m_ys > m_ye)
+std::swap(m_ys, m_ye);
+}
+
+}
+
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/Coordinate.h b/src/lib/Coordinate.h
index bec3fe2..4471f86 100644
--- a/src/lib/Coordinate.h
+++ b/src/lib/Coordinate.h
@@ -10,14 +10,17 @@
#ifndef INCLUDED_COORDINATE_H
#define INCLUDED_COORDINATE_H
+#include
+
#include "MSPUBConstants.h"
namespace libmspub
{
struct Coordinate
{
- Coordinate(int xs, int ys, int xe, int ye) : m_xs(xs), m_ys(ys), m_xe(xe),
m_ye(ye) { }
+ Coordinate(int xs, int ys, int xe, int ye);
Coordinate() : m_xs(0), m_ys(0), m_xe(0), m_ye(0) { }
+ void arrange();
int m_xs, m_ys, m_xe, m_ye;
double getXIn(double pageWidth) const
{
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index c050930..a2efb2c 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -459,10 +459,14 @@ Coordinate getFudgedCoordinates(Coordinate coord, const
std::vector
}
else
{
-fudged.m_xs += leftFudge;
-fudged.m_xe -= rightFudge;
-fudged.m_ys += topFudge;
-fudged.m_ye -= bottomFudge;
+if (unsigned(fudged.m_xe - fudged.m_xs) > leftFudge)
+ fudged.m_xs += leftFudge;
+if (unsigned(fudged.m_xe - fudged.m_xs) > rightFudge)
+ fudged.m_xe -= rightFudge;
+if (unsigned(fudged.m_ye - fudged.m_ys) > topFudge)
+ fudged.m_ys += topFudge;
+if (unsigned(fudged.m_ye - fudged.m_ys) > bottomFudge)
+ fudged.m_ye -= bottomFudge;
}
return fudged;
}
diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index 883cf67..b13bb47 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -1622,6 +1622,7 @@ void
MSPUBParser::parseEscherShape(librevenge::RVNGInputStream *input, const Esc
parentCoordinateSystem.m_ys = readU32(input);
parentCoordinateSystem.m_xe = readU32(input);
parentCoordinateSystem.m_ye = readU32(input);
+parentCoordinateSystem.arrange();
definesRelativeCoordinates = true;
}
input->seek(sp.contentsOffset, librevenge::RVNG_SEEK_SET);
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 2573363..bd8a68a 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -16,6 +16,7 @@
libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_SOURCES = \
BorderArtInfo.h \
ColorReference.cpp \
ColorReference.h \
+ Coordinate.cpp \
Coordinate.h \
Dash.cpp \
Dash.h \
commit fc3a3285a47433d599627b64c8b97aa16569663a
Author: David Tardon <dtar...@redhat.com>
Date: Mon Mar 12 11:10:41 2018 +0100
drop unused function
Change-Id: I5a64871e16d755496b69f749cc2a4a11d833bc00
diff --git a/src/lib/PolygonUtils.cpp b/src/lib/PolygonUtils.cpp
index b5e47e9..7738809 100644
--- a/src/lib/PolygonUtils.cpp
+++ b/src/lib/PolygonUtils.cpp
@@ -5680,23 +5680,6 @@ double
getSpecialIfNecessary(std::function<double(unsigned index)> calculator, i
return special ? calculator(val ^ 0x8000) : val;
}
-Coordinate CustomShape::getTextRectangle(double x, double y, double width,
double height, std::function<double(unsigned index)> calculator) const
-{
- double scaleX = width * m_coordWidth;
- double scaleY = height * m_coordHeight;
- if (m_numTextRectangles == 0)
- {
-return Coordinate(x, y, x + width, y + height);
- }
- const Vertex = mp_textRectangles[0].first;
- con
[Libreoffice-commits] core.git: external/icu
external/icu/UnpackedTarball_icu.mk |1 +
external/icu/ofz4860.patch.2| 25 +
2 files changed, 26 insertions(+)
New commits:
commit 2b69156c43261ceae55eb4d3b644c4c2d73231ba
Author: David Tardon <dtar...@redhat.com>
Date: Tue Mar 6 15:17:13 2018 +0100
forcepoint: fix out-of-bounds read in ICU
Change-Id: I5061d38d0e7df0de9a5c7574d522ce69934e4a24
diff --git a/external/icu/UnpackedTarball_icu.mk
b/external/icu/UnpackedTarball_icu.mk
index 499650976a55..a4d0b16ecb36 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
$(if $(filter-out
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
external/icu/icu4c-khmerbreakengine.patch.1 \
external/icu/icu4c-59-werror-shadow.patch.1 \
+ external/icu/ofz4860.patch.2 \
))
$(eval $(call
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/ofz4860.patch.2 b/external/icu/ofz4860.patch.2
new file mode 100644
index ..14114d52878b
--- /dev/null
+++ b/external/icu/ofz4860.patch.2
@@ -0,0 +1,25 @@
+From 529ba01ee606940ca273b187be8ce9ba31cf2d90 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtar...@redhat.com>
+Date: Fri, 19 Jan 2018 10:41:02 +0100
+Subject: [PATCH] ofz#4860 fix past-the-end read from array
+
+---
+ icu4c/source/common/locmap.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/icu4c/source/common/locmap.cpp b/icu4c/source/common/locmap.cpp
+index cbb2b810a..6d62d8310 100644
+--- a/icu4c/source/common/locmap.cpp
b/icu4c/source/common/locmap.cpp
+@@ -1015,7 +1015,7 @@ static const char*
+ getPosixID(const ILcidPosixMap *this_0, uint32_t hostID)
+ {
+ uint32_t i;
+-for (i = 0; i <= this_0->numRegions; i++)
++for (i = 0; i < this_0->numRegions; i++)
+ {
+ if (this_0->regionMaps[i].hostID == hostID)
+ {
+--
+2.14.3
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Gsoc request for guidance
Hello, On Sat, 2018-03-03 at 17:26 +, Fady Saeed wrote: > Hello, I’m Fady Saeed. I’m Studying Computer & System Engineering at > Faculty of Engineering (3rd year) > > I read GSoc projects idea list and it was really interesting and I > want to contribute but I didn’t know where to start so if you can > send me instructions how can I build the project on windows machine https://wiki.documentfoundation.org/Development/BuildingOnWindows is not that hard to find. It's just two clicks from the GSoC ideas page... D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - external/libmspub
external/libmspub/0001-tdf-116018-close-shape-group-correctly.patch.1 | 30
++
external/libmspub/UnpackedTarball_libmspub.mk |1
2 files changed, 31 insertions(+)
New commits:
commit 265b67c1737d25ebaf302fb59c1dfe59dfb4f449
Author: David Tardon <dtar...@redhat.com>
Date: Wed Feb 28 14:25:44 2018 +0100
tdf#116018 fix mising shapes in .pub import
Change-Id: I58447c13bf693ef0bf92922599f4318598f8b288
Reviewed-on: https://gerrit.libreoffice.org/50524
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git
a/external/libmspub/0001-tdf-116018-close-shape-group-correctly.patch.1
b/external/libmspub/0001-tdf-116018-close-shape-group-correctly.patch.1
new file mode 100644
index ..19948836bc8c
--- /dev/null
+++ b/external/libmspub/0001-tdf-116018-close-shape-group-correctly.patch.1
@@ -0,0 +1,30 @@
+From a2e4fb779cff37a2cfc6ddf747d7715c545578a6 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtar...@redhat.com>
+Date: Wed, 28 Feb 2018 13:40:08 +0100
+Subject: [PATCH] tdf#116018 close shape group correctly
+
+Regression since commit bbe7f806b95ef427153ba18bff80e674b1704ae5 .
+
+Change-Id: Ib6d3f58373c7cb0e1ba7a7a720187cc68d9bc7b1
+---
+ src/lib/MSPUBCollector.cpp | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
+index fae688d..405470e 100644
+--- a/src/lib/MSPUBCollector.cpp
b/src/lib/MSPUBCollector.cpp
+@@ -558,9 +558,7 @@ bool MSPUBCollector::endGroup()
+ {
+ return false;
+ }
+- auto parent = m_currentShapeGroup->getParent();
+- if (parent)
+-m_currentShapeGroup = parent;
++ m_currentShapeGroup = m_currentShapeGroup->getParent();
+ return true;
+ }
+
+--
+2.14.3
+
diff --git a/external/libmspub/UnpackedTarball_libmspub.mk
b/external/libmspub/UnpackedTarball_libmspub.mk
index 5ea3053d6f69..ecf1066e2eb3 100644
--- a/external/libmspub/UnpackedTarball_libmspub.mk
+++ b/external/libmspub/UnpackedTarball_libmspub.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmspub,0))
$(eval $(call gb_UnpackedTarball_add_patches,libmspub,\
external/libmspub/ubsan.patch \
+external/libmspub/0001-tdf-116018-close-shape-group-correctly.patch.1 \
))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libmspub))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Resources on writing import/export file filters for Writer
Hi, On Fri, 2018-03-02 at 00:16 -0700, Jens Tröger wrote: > Thank you Miklos! > > Fridrich's blog was interesting, and mentions export filters on > occasion. It > hasn't given much detail though on how to actually write a XFilter > based > implementation which is what seems most sensible. > > Perhaps somebody can point me at the source code of existing (simple) > export > filters? E.g., writerperfect/source/writer/EPUBExportFilter.cxx . D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 38368a9ec30d1979f03f4b7035a1c5ecb9ac24e6 Author: David Tardon <dtar...@redhat.com> Date: Wed Feb 28 18:00:16 2018 +0100 upload libmspub 0.1.4 Change-Id: Id47f27944ce07aa51e108b5c09a087b65d60165a Reviewed-on: https://gerrit.libreoffice.org/50523 Reviewed-by: David Tardon <dtar...@redhat.com> Tested-by: Jenkins <c...@libreoffice.org> diff --git a/download.lst b/download.lst index 3c29cf127c6e..641a397c9b15 100644 --- a/download.lst +++ b/download.lst @@ -168,8 +168,8 @@ export MDDS_SHA256SUM := dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1 export MDDS_TARBALL := mdds-1.3.1.tar.bz2 export MDNSRESPONDER_SHA256SUM := 4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0 export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz -export MSPUB_SHA256SUM := f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97 -export MSPUB_TARBALL := libmspub-0.1.3.tar.xz +export MSPUB_SHA256SUM := ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba +export MSPUB_TARBALL := libmspub-0.1.4.tar.xz export MWAW_SHA256SUM := db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea export MWAW_VERSION_MICRO := 13 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
