[Libreoffice-commits] core.git: configure.ac download.lst external/libstaroffice
David Tardon
dtardon at redhat.com
Wed Feb 22 12:17:45 UTC 2017
configure.ac | 2
download.lst | 6 -
external/libstaroffice/0001-error-C2512-StarObject-no-appropriate-default-constr.patch.1 | 54 ----------
external/libstaroffice/Library_staroffice.mk | 2
external/libstaroffice/UnpackedTarball_libstaroffice.mk | 1
5 files changed, 6 insertions(+), 59 deletions(-)
New commits:
commit ac956e0424c79b59bb5ad433d18b3016bd47b9b2
Author: David Tardon <dtardon at redhat.com>
Date: Wed Feb 22 10:28:43 2017 +0100
upload libstaroffice 0.0.3
Change-Id: I5cb29e5cc8635988e84f0285164cf139ed4a62b0
Reviewed-on: https://gerrit.libreoffice.org/34536
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: David Tardon <dtardon at redhat.com>
diff --git a/configure.ac b/configure.ac
index 0928c15..7715f1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7761,7 +7761,7 @@ libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-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.2])
+libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.3])
dnl ===================================================================
dnl Check for system libcmis
diff --git a/download.lst b/download.lst
index 2d885d3..38d14be 100644
--- a/download.lst
+++ b/download.lst
@@ -163,9 +163,9 @@ export REVENGE_TARBALL := librevenge-0.0.$(REVENGE_VERSION_MICRO).tar.bz2
export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
export SERF_MD5SUM := 4f8e76c9c6567aee1d66aba49f76a58b
export SERF_TARBALL := serf-1.2.1.tar.bz2
-export STAROFFICE_MD5SUM := 4012950240c2bf768c9b29ad376123d7
-export STAROFFICE_VERSION_MICRO := 2
-export STAROFFICE_TARBALL := libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.bz2
+export STAROFFICE_MD5SUM := 1478e222b842fad9eb88ecddee39058d
+export STAROFFICE_VERSION_MICRO := 3
+export STAROFFICE_TARBALL := libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz
export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
export VISIO_MD5SUM := cbee198a78b842b2087f32d33c522818
diff --git a/external/libstaroffice/0001-error-C2512-StarObject-no-appropriate-default-constr.patch.1 b/external/libstaroffice/0001-error-C2512-StarObject-no-appropriate-default-constr.patch.1
deleted file mode 100644
index 1c579b3..0000000
--- a/external/libstaroffice/0001-error-C2512-StarObject-no-appropriate-default-constr.patch.1
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1bbb89aff70e81d47af617bb1407e70545a2f99a Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Wed, 10 Aug 2016 18:52:46 +0200
-Subject: [PATCH] error C2512: 'StarObject' : no appropriate default
- constructor available
-
----
- src/lib/StarObjectChart.cxx | 2 +-
- src/lib/StarObjectDraw.cxx | 2 +-
- src/lib/StarObjectSpreadsheet.cxx | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/StarObjectChart.cxx b/src/lib/StarObjectChart.cxx
-index 3438beb..d9b1604 100644
---- a/src/lib/StarObjectChart.cxx
-+++ b/src/lib/StarObjectChart.cxx
-@@ -71,7 +71,7 @@ struct State {
- ////////////////////////////////////////////////////////////
- // constructor/destructor, ...
- ////////////////////////////////////////////////////////////
--StarObjectChart::StarObjectChart(StarObject const &orig, bool duplicateState) : StarObject::StarObject(orig, duplicateState), m_chartState(new StarObjectChartInternal::State)
-+StarObjectChart::StarObjectChart(StarObject const &orig, bool duplicateState) : StarObject(orig, duplicateState), m_chartState(new StarObjectChartInternal::State)
- {
- }
-
-diff --git a/src/lib/StarObjectDraw.cxx b/src/lib/StarObjectDraw.cxx
-index bb660a9..4e4fdc2 100644
---- a/src/lib/StarObjectDraw.cxx
-+++ b/src/lib/StarObjectDraw.cxx
-@@ -76,7 +76,7 @@ struct State {
- ////////////////////////////////////////////////////////////
- // constructor/destructor, ...
- ////////////////////////////////////////////////////////////
--StarObjectDraw::StarObjectDraw(StarObject const &orig, bool duplicateState) : StarObject::StarObject(orig, duplicateState), m_drawState(new StarObjectDrawInternal::State)
-+StarObjectDraw::StarObjectDraw(StarObject const &orig, bool duplicateState) : StarObject(orig, duplicateState), m_drawState(new StarObjectDrawInternal::State)
- {
- }
-
-diff --git a/src/lib/StarObjectSpreadsheet.cxx b/src/lib/StarObjectSpreadsheet.cxx
-index 58409c8..c8bd71b 100644
---- a/src/lib/StarObjectSpreadsheet.cxx
-+++ b/src/lib/StarObjectSpreadsheet.cxx
-@@ -521,7 +521,7 @@ void SubDocument::parse(STOFFListenerPtr &listener, libstoff::SubDocumentType /*
- ////////////////////////////////////////////////////////////
- // constructor/destructor, ...
- ////////////////////////////////////////////////////////////
--StarObjectSpreadsheet::StarObjectSpreadsheet(StarObject const &orig, bool duplicateState) : StarObject::StarObject(orig, duplicateState), m_spreadsheetState(new StarObjectSpreadsheetInternal::State)
-+StarObjectSpreadsheet::StarObjectSpreadsheet(StarObject const &orig, bool duplicateState) : StarObject(orig, duplicateState), m_spreadsheetState(new StarObjectSpreadsheetInternal::State)
- {
- }
-
---
-2.7.4
-
diff --git a/external/libstaroffice/Library_staroffice.mk b/external/libstaroffice/Library_staroffice.mk
index 0bd8ed7..50f77dc 100644
--- a/external/libstaroffice/Library_staroffice.mk
+++ b/external/libstaroffice/Library_staroffice.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,staroffice,\
UnpackedTarball/libstaroffice/src/lib/STOFFDocument \
UnpackedTarball/libstaroffice/src/lib/STOFFEntry \
UnpackedTarball/libstaroffice/src/lib/STOFFFont \
+ UnpackedTarball/libstaroffice/src/lib/STOFFFrameStyle \
UnpackedTarball/libstaroffice/src/lib/STOFFGraphicDecoder \
UnpackedTarball/libstaroffice/src/lib/STOFFGraphicEncoder \
UnpackedTarball/libstaroffice/src/lib/STOFFGraphicListener \
@@ -80,6 +81,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,staroffice,\
UnpackedTarball/libstaroffice/src/lib/StarEncryption \
UnpackedTarball/libstaroffice/src/lib/StarFileManager \
UnpackedTarball/libstaroffice/src/lib/StarFormatManager \
+ UnpackedTarball/libstaroffice/src/lib/StarFrameAttribute \
UnpackedTarball/libstaroffice/src/lib/StarGraphicAttribute \
UnpackedTarball/libstaroffice/src/lib/StarGraphicStruct \
UnpackedTarball/libstaroffice/src/lib/StarItem \
diff --git a/external/libstaroffice/UnpackedTarball_libstaroffice.mk b/external/libstaroffice/UnpackedTarball_libstaroffice.mk
index 957c118..e85d13a 100644
--- a/external/libstaroffice/UnpackedTarball_libstaroffice.mk
+++ b/external/libstaroffice/UnpackedTarball_libstaroffice.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \
endif
$(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \
- external/libstaroffice/0001-error-C2512-StarObject-no-appropriate-default-constr.patch.1 \
))
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list