[Libreoffice-commits] core.git: configure.ac download.lst external/libstaroffice solenv/flatpak-manifest.in
David Tardon
dtardon at redhat.com
Thu Apr 26 20:11:18 UTC 2018
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 <dtardon at 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 <ci at libreoffice.org>
Reviewed-by: David Tardon <dtardon at 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 000000000000..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 <dtardon at 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 <algorithm>
+ #include <iomanip>
+ #include <iostream>
+ #include <map>
+--
+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..000000000000
--- 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 <dtardon at 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<StarObjectModel> model(new StarObjectModel(*this, true));
---
-2.14.3
-
diff --git a/external/libstaroffice/Library_staroffice.mk b/external/libstaroffice/Library_staroffice.mk
index afa8a032518f..6ff99fb46eb1 100644
--- a/external/libstaroffice/Library_staroffice.mk
+++ b/external/libstaroffice/Library_staroffice.mk
@@ -63,6 +63,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,staroffice,\
UnpackedTarball/libstaroffice/src/lib/STOFFSpreadsheetDecoder \
UnpackedTarball/libstaroffice/src/lib/STOFFSpreadsheetEncoder \
UnpackedTarball/libstaroffice/src/lib/STOFFSpreadsheetListener \
+ UnpackedTarball/libstaroffice/src/lib/STOFFStarMathToMMLConverter \
UnpackedTarball/libstaroffice/src/lib/STOFFStringStream \
UnpackedTarball/libstaroffice/src/lib/STOFFSubDocument \
UnpackedTarball/libstaroffice/src/lib/STOFFTable \
@@ -92,6 +93,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,staroffice,\
UnpackedTarball/libstaroffice/src/lib/StarObject \
UnpackedTarball/libstaroffice/src/lib/StarObjectChart \
UnpackedTarball/libstaroffice/src/lib/StarObjectDraw \
+ UnpackedTarball/libstaroffice/src/lib/StarObjectMath \
UnpackedTarball/libstaroffice/src/lib/StarObjectModel \
UnpackedTarball/libstaroffice/src/lib/StarObjectNumericRuler \
UnpackedTarball/libstaroffice/src/lib/StarObjectPageStyle \
diff --git a/external/libstaroffice/UnpackedTarball_libstaroffice.mk b/external/libstaroffice/UnpackedTarball_libstaroffice.mk
index 781634ab9fb3..fdf668d196dc 100644
--- a/external/libstaroffice/UnpackedTarball_libstaroffice.mk
+++ b/external/libstaroffice/UnpackedTarball_libstaroffice.mk
@@ -37,8 +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 \
+$(eval $(call gb_UnpackedTarball_add_patches,libstaroffice,\
+ external/libstaroffice/0001-add-missing-include-for-std-max.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index c3302fbe5d72..6222a34e3074 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -308,10 +308,10 @@
"dest-filename": "external/tarballs/librevenge-0.0.4.tar.bz2"
},
{
- "url": "https://dev-www.libreoffice.org/src/libstaroffice-0.0.5.tar.xz",
- "sha256": "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982",
+ "url": "https://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz",
+ "sha256": "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4",
"type": "file",
- "dest-filename": "external/tarballs/libstaroffice-0.0.5.tar.xz"
+ "dest-filename": "external/tarballs/libstaroffice-0.0.6.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/ltm-1.0.zip",
More information about the Libreoffice-commits
mailing list