[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 4 commits - download.lst external/libebook external/libetonyek external/libodfgen external/librevenge
David Tardon
dtardon at redhat.com
Tue Jun 3 00:03:07 PDT 2014
download.lst | 16
external/libebook/0001-blind-attempt-to-workaround-MSVC-bug.patch | 87 -
external/libebook/0001-parse-zipped-FictionBook-2-files-again.patch | 58
external/libebook/UnpackedTarball_libebook.mk | 5
external/libetonyek/0001-fix-v.3-version-string.patch | 26
external/libetonyek/UnpackedTarball_libetonyek.mk | 4
external/libodfgen/0001-properly-export-API-symbols.patch | 170 --
external/libodfgen/ExternalPackage_libodfgen.mk | 2
external/libodfgen/UnpackedTarball_libodfgen.mk | 4
external/librevenge/0001-nested-iterator-classes-need-to-be-exported-too.patch | 53
external/librevenge/0001-properly-export-API-symbols.patch | 752 ----------
external/librevenge/ExternalPackage_librevenge.mk | 2
external/librevenge/UnpackedTarball_librevenge.mk | 5
13 files changed, 10 insertions(+), 1174 deletions(-)
New commits:
commit 314d1059bfdfb3f600d94e40049b3d0f130283be
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jun 3 08:20:57 2014 +0200
upload libetonyek 0.1.1
Change-Id: If71250029229cfc167a2ec5ef0d6aea9bc57018c
(cherry picked from commit e2d53032f4e99ce0ec80c73a4ce073aa28fffc17)
diff --git a/download.lst b/download.lst
index b0ee9fe..aeda567 100644
--- a/download.lst
+++ b/download.lst
@@ -33,8 +33,8 @@ export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
export EBOOK_MD5SUM := c25a881d21abc5b4da19205db513cc22
export EBOOK_TARBALL := libe-book-0.1.1.tar.bz2
export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
-export ETONYEK_MD5SUM := 9d4de5e3b0846dc53b9d18908557fb02
-export ETONYEK_TARBALL := libetonyek-0.1.0.tar.bz2
+export ETONYEK_MD5SUM := 805f941b06448212a988cb65f0691a7a
+export ETONYEK_TARBALL := libetonyek-0.1.1.tar.bz2
export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
export FIREBIRD_MD5SUM := 21154d2004e025c8a3666625b0357bb5
export FIREBIRD_TARBALL := Firebird-2.5.2.26540-0.tar.bz2
diff --git a/external/libetonyek/0001-fix-v.3-version-string.patch b/external/libetonyek/0001-fix-v.3-version-string.patch
deleted file mode 100644
index d344259..0000000
--- a/external/libetonyek/0001-fix-v.3-version-string.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 16b7bf009a06ac48c69f94b778a09151aa20fa53 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Thu, 29 May 2014 17:04:05 +0200
-Subject: [PATCH] fix v.3 version string
-
-Change-Id: I689fd53bedeccb8d1cda5275832f36333fe1d108
----
- src/lib/KEY2Token.gperf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/KEY2Token.gperf b/src/lib/KEY2Token.gperf
-index d1bf501..483ca97 100644
---- a/src/lib/KEY2Token.gperf
-+++ b/src/lib/KEY2Token.gperf
-@@ -25,7 +25,7 @@ struct Token
- 1,_1
- 2004102100,VERSION_STR_2
- 2005092101,COMPATIBLE_VERSION_STR_3,
--2005140600,VERSION_STR_3
-+2005112100,VERSION_STR_3
- 72007061400,VERSION_STR_4
- 92008102400,VERSION_STR_5
- BGBuildChunk,BGBuildChunk
---
-1.9.3
-
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 4655cbb..7a8746c 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -13,8 +13,4 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,1))
-$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
- external/libetonyek/0001-fix-v.3-version-string.patch \
-))
-
# vim: set noet sw=4 ts=4:
commit b440f319070e9ce77902fce6cf30f81331469140
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jun 3 08:19:48 2014 +0200
upload libe-book 0.1.1
Change-Id: I48f67b203c3362ff87e41635e1212e0024a982f0
(cherry picked from commit 9496d573340d965dfe180733988a156bb182d39f)
diff --git a/download.lst b/download.lst
index 0301eae..b0ee9fe 100644
--- a/download.lst
+++ b/download.lst
@@ -30,8 +30,8 @@ export CT2N_TARBALL := 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.
export CURL_MD5SUM := e6d1f9d1b59da5062109ffe14e0569a4
export CURL_TARBALL := curl-7.36.0.tar.bz2
export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
-export EBOOK_MD5SUM := 3244af3faf9e8334b8c45d1107ba8ca2
-export EBOOK_TARBALL := libe-book-0.1.0.tar.bz2
+export EBOOK_MD5SUM := c25a881d21abc5b4da19205db513cc22
+export EBOOK_TARBALL := libe-book-0.1.1.tar.bz2
export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
export ETONYEK_MD5SUM := 9d4de5e3b0846dc53b9d18908557fb02
export ETONYEK_TARBALL := libetonyek-0.1.0.tar.bz2
diff --git a/external/libebook/0001-blind-attempt-to-workaround-MSVC-bug.patch b/external/libebook/0001-blind-attempt-to-workaround-MSVC-bug.patch
deleted file mode 100644
index 2ecedf3..0000000
--- a/external/libebook/0001-blind-attempt-to-workaround-MSVC-bug.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From e9362c25b772c2cfb657b1234d8b636669a1b01b Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Mon, 26 May 2014 16:33:00 +0200
-Subject: [PATCH] blind attempt to workaround MSVC bug
-
-http://msdn.microsoft.com/en-us/library/27zksbks.aspx
----
- src/lib/EBOOKDocument.cpp | 49 ++++++++++++++++++++++++++++-------------------
- 1 file changed, 29 insertions(+), 20 deletions(-)
-
-diff --git a/src/lib/EBOOKDocument.cpp b/src/lib/EBOOKDocument.cpp
-index ea1a223..5b8e7ec 100644
---- a/src/lib/EBOOKDocument.cpp
-+++ b/src/lib/EBOOKDocument.cpp
-@@ -173,6 +173,15 @@ catch (...)
- return EBOOKDocument::TYPE_UNKNOWN;
- }
-
-+extern "C"
-+{
-+
-+ void detectInternalSubset(void *const ctx, const xmlChar *const name, const xmlChar *, const xmlChar *);
-+ void detectExternalSubset(void *const ctx, const xmlChar *const name, const xmlChar *, const xmlChar *);
-+ void detectStartElement(void *const ctx, const xmlChar *const name, const xmlChar **);
-+
-+}
-+
- struct HTMLContext
- {
- xmlSAXHandler handler;
-@@ -196,26 +205,6 @@ void detectHTMLContent(void *const ctx, const xmlChar *const name)
- context->html = EBOOKHTMLToken::html == getHTMLTokenId(char_cast(name));
- }
-
--extern "C"
--{
--
-- void detectInternalSubset(void *const ctx, const xmlChar *const name, const xmlChar *, const xmlChar *)
-- {
-- detectHTMLContent(ctx, name);
-- }
--
-- void detectExternalSubset(void *const ctx, const xmlChar *const name, const xmlChar *, const xmlChar *)
-- {
-- detectHTMLContent(ctx, name);
-- }
--
-- void detectStartElement(void *const ctx, const xmlChar *const name, const xmlChar **)
-- {
-- detectHTMLContent(ctx, name);
-- }
--
--}
--
- HTMLContext::HTMLContext()
- : handler()
- , detected(false)
-@@ -250,6 +239,26 @@ catch (...)
- return false;
- }
-
-+extern "C"
-+{
-+
-+ void detectInternalSubset(void *const ctx, const xmlChar *const name, const xmlChar *, const xmlChar *)
-+ {
-+ detectHTMLContent(ctx, name);
-+ }
-+
-+ void detectExternalSubset(void *const ctx, const xmlChar *const name, const xmlChar *, const xmlChar *)
-+ {
-+ detectHTMLContent(ctx, name);
-+ }
-+
-+ void detectStartElement(void *const ctx, const xmlChar *const name, const xmlChar **)
-+ {
-+ detectHTMLContent(ctx, name);
-+ }
-+
-+}
-+
- template<class Parser>
- bool probe(const RVNGInputStreamPtr_t &input, const EBOOKDocument::Type type, EBOOKDocument::Type *const typeOut, EBOOKDocument::Confidence &confidence) try
- {
---
-1.9.0
-
diff --git a/external/libebook/0001-parse-zipped-FictionBook-2-files-again.patch b/external/libebook/0001-parse-zipped-FictionBook-2-files-again.patch
deleted file mode 100644
index d068e79..0000000
--- a/external/libebook/0001-parse-zipped-FictionBook-2-files-again.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 5690c18cb2de1bf4f3cce3da8a2132303a0c731f Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Thu, 29 May 2014 13:30:13 +0200
-Subject: [PATCH] parse zipped FictionBook 2 files again
-
----
- src/lib/EBOOKDocument.cpp | 28 +++++++++++++++++++++++++++-
- 1 file changed, 27 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/EBOOKDocument.cpp b/src/lib/EBOOKDocument.cpp
-index 5b8e7ec..c4f9913 100644
---- a/src/lib/EBOOKDocument.cpp
-+++ b/src/lib/EBOOKDocument.cpp
-@@ -427,6 +427,25 @@ EBOOKAPI EBOOKDocument::Confidence EBOOKDocument::isSupported(librevenge::RVNGIn
- }
- }
- #endif
-+
-+ // TODO: This needs improvement: zipped FictionBook 2 files can contain images too...
-+ if (1 == input->subStreamCount())
-+ {
-+ const librevenge::RVNGString name(input->subStreamName(0));
-+ const unsigned long size = name.size();
-+ const char *const cName = name.cstr();
-+ if (equal(cName + (size - 4), cName + size, ".fb2"))
-+ {
-+ const scoped_ptr<RVNGInputStream> fb2(input->getSubStreamById(0));
-+ const Type xmlType = detectXML(fb2.get());
-+ if (TYPE_FICTIONBOOK2 == xmlType)
-+ {
-+ if (type)
-+ *type = xmlType;
-+ return CONFIDENCE_EXCELLENT;
-+ }
-+ }
-+ }
- }
-
- Confidence confidence = CONFIDENCE_NONE;
-@@ -533,7 +552,14 @@ EBOOKAPI EBOOKDocument::Result EBOOKDocument::parse(librevenge::RVNGInputStream
- #endif
- case TYPE_FICTIONBOOK2 :
- {
-- FB2Parser parser(input_.get());
-+ RVNGInputStreamPtr_t fb2Input(input_);
-+ // TODO: this needs to handle package with images too
-+ if (input_->isStructured())
-+ {
-+ assert(1 == input->subStreamCount());
-+ fb2Input.reset(input->getSubStreamById(0));
-+ }
-+ FB2Parser parser(fb2Input.get());
- return parser.parse(document) ? RESULT_OK : RESULT_UNKNOWN_ERROR;
- }
- #if defined ENABLE_EXPERIMENTAL
---
-1.9.3
-
diff --git a/external/libebook/UnpackedTarball_libebook.mk b/external/libebook/UnpackedTarball_libebook.mk
index 4986981..7dfee2c 100644
--- a/external/libebook/UnpackedTarball_libebook.mk
+++ b/external/libebook/UnpackedTarball_libebook.mk
@@ -13,9 +13,4 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libebook,$(EBOOK_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libebook,1))
-$(eval $(call gb_UnpackedTarball_add_patches,libebook,\
- external/libebook/0001-blind-attempt-to-workaround-MSVC-bug.patch \
- external/libebook/0001-parse-zipped-FictionBook-2-files-again.patch \
-))
-
# vim: set noet sw=4 ts=4:
commit 5efaea7e973efd0523d4ba9cd827640114ca1d7c
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jun 3 08:16:32 2014 +0200
upload libodfgen 0.1.1
Change-Id: I46079625b9aa6fd4e1c205a381d2c157b51dc7e4
(cherry picked from commit 93e2ae41417d6a6e095122f8cd48f5466c590efa)
diff --git a/download.lst b/download.lst
index dee0422..0301eae 100644
--- a/download.lst
+++ b/download.lst
@@ -104,8 +104,8 @@ export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-
export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
export NSS_TARBALL := 06beb053e257d9e22641339c905c6eba-nss-3.15.3-with-nspr-4.10.2.tar.gz
-export ODFGEN_MD5SUM := 6c708dbcca976ad56115c98f191a0e90
-export ODFGEN_TARBALL := libodfgen-0.1.0.tar.bz2
+export ODFGEN_MD5SUM := c22c83c17cda0754382ada4e116594b7
+export ODFGEN_TARBALL := libodfgen-0.1.1.tar.bz2
export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
diff --git a/external/libodfgen/0001-properly-export-API-symbols.patch b/external/libodfgen/0001-properly-export-API-symbols.patch
deleted file mode 100644
index 91799aa..0000000
--- a/external/libodfgen/0001-properly-export-API-symbols.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 431087afd938b0d9cea2f5c4b88da0746e3758a8 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Sat, 24 May 2014 20:19:17 +0200
-Subject: [PATCH] properly export API symbols
-
----
- inc/libodfgen/Makefile.am | 1 +
- inc/libodfgen/OdfDocumentHandler.hxx | 4 +++-
- inc/libodfgen/OdgGenerator.hxx | 3 ++-
- inc/libodfgen/OdpGenerator.hxx | 3 ++-
- inc/libodfgen/OdsGenerator.hxx | 3 ++-
- inc/libodfgen/OdtGenerator.hxx | 3 ++-
- inc/libodfgen/libodfgen-api.hxx | 38 ++++++++++++++++++++++++++++++++++++
- src/Makefile.am | 5 +++--
- 8 files changed, 53 insertions(+), 7 deletions(-)
- create mode 100644 inc/libodfgen/libodfgen-api.hxx
-
-diff --git a/inc/libodfgen/OdfDocumentHandler.hxx b/inc/libodfgen/OdfDocumentHandler.hxx
-index 79c387b..19e04e3 100644
---- a/inc/libodfgen/OdfDocumentHandler.hxx
-+++ b/inc/libodfgen/OdfDocumentHandler.hxx
-@@ -26,6 +26,8 @@
- #define _ODFDOCUMENTHANDLER_HXX_
- #include <librevenge/librevenge.h>
-
-+#include "libodfgen-api.hxx"
-+
- /** Type of ODF content a generator should produce.
- *
- * @sa OdgGenerator, OdpGenerator, OdtGenerator
-@@ -57,7 +59,7 @@ typedef bool (*OdfEmbeddedImage)(const librevenge::RVNGBinaryData &input, librev
- * saved to a file, printed to the standard output, saved to a file
- * inside a package, or whatever else.
- */
--class OdfDocumentHandler
-+class ODFGENAPI OdfDocumentHandler
- {
- public:
- virtual ~OdfDocumentHandler() {}
-diff --git a/inc/libodfgen/OdgGenerator.hxx b/inc/libodfgen/OdgGenerator.hxx
-index f818e3e..24455d8 100644
---- a/inc/libodfgen/OdgGenerator.hxx
-+++ b/inc/libodfgen/OdgGenerator.hxx
-@@ -27,6 +27,7 @@
-
- #include <librevenge/librevenge.h>
-
-+#include "libodfgen-api.hxx"
- #include "OdfDocumentHandler.hxx"
-
- class OdfGenerator;
-@@ -37,7 +38,7 @@ class OdgGeneratorPrivate;
- * See @c librevenge library for documentation of the
- * librevenge::WPGPaintInterface interface.
- */
--class OdgGenerator : public librevenge::RVNGDrawingInterface
-+class ODFGENAPI OdgGenerator : public librevenge::RVNGDrawingInterface
- {
- public:
- OdgGenerator();
-diff --git a/inc/libodfgen/OdpGenerator.hxx b/inc/libodfgen/OdpGenerator.hxx
-index 71f2562..c61f5ad 100644
---- a/inc/libodfgen/OdpGenerator.hxx
-+++ b/inc/libodfgen/OdpGenerator.hxx
-@@ -27,6 +27,7 @@
-
- #include <librevenge/librevenge.h>
-
-+#include "libodfgen-api.hxx"
- #include "OdfDocumentHandler.hxx"
-
- class OdfGenerator;
-@@ -37,7 +38,7 @@ class OdpGeneratorPrivate;
- * See @c librevenge library for documentation of the
- * librevenge::KEYPresentationInterface interface.
- */
--class OdpGenerator : public librevenge::RVNGPresentationInterface
-+class ODFGENAPI OdpGenerator : public librevenge::RVNGPresentationInterface
- {
- public:
- OdpGenerator();
-diff --git a/inc/libodfgen/OdsGenerator.hxx b/inc/libodfgen/OdsGenerator.hxx
-index f88c207..09e1b18 100644
---- a/inc/libodfgen/OdsGenerator.hxx
-+++ b/inc/libodfgen/OdsGenerator.hxx
-@@ -29,6 +29,7 @@
-
- #include <librevenge/librevenge.h>
-
-+#include "libodfgen-api.hxx"
- #include "OdfDocumentHandler.hxx"
-
- class OdfGenerator;
-@@ -39,7 +40,7 @@ class OdsGeneratorPrivate;
- * See @c libdocumentinterface library for documentation of the librevenge::RVNGSpreadsheetInterface
- * interface.
- */
--class OdsGenerator : public librevenge::RVNGSpreadsheetInterface
-+class ODFGENAPI OdsGenerator : public librevenge::RVNGSpreadsheetInterface
- {
- public:
- OdsGenerator();
-diff --git a/inc/libodfgen/OdtGenerator.hxx b/inc/libodfgen/OdtGenerator.hxx
-index 9c3ff88..e11778c 100644
---- a/inc/libodfgen/OdtGenerator.hxx
-+++ b/inc/libodfgen/OdtGenerator.hxx
-@@ -29,6 +29,7 @@
-
- #include <librevenge/librevenge.h>
-
-+#include "libodfgen-api.hxx"
- #include "OdfDocumentHandler.hxx"
-
- class OdtGeneratorPrivate;
-@@ -39,7 +40,7 @@ class OdfGenerator;
- * See @c librevenge library for documentation of the ::librevenge::RVNGTextInterface
- * interface.
- */
--class OdtGenerator : public librevenge::RVNGTextInterface
-+class ODFGENAPI OdtGenerator : public librevenge::RVNGTextInterface
- {
- public:
- OdtGenerator();
-diff --git a/inc/libodfgen/libodfgen-api.hxx b/inc/libodfgen/libodfgen-api.hxx
-new file mode 100644
-index 0000000..39ffd05
---- /dev/null
-+++ b/inc/libodfgen/libodfgen-api.hxx
-@@ -0,0 +1,38 @@
-+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* libodfgen
-+ * Version: MPL 2.0 / LGPLv2.1+
-+ *
-+ * 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/.
-+ *
-+ * Major Contributor(s):
-+ * Copyright (C) 2013 Fridrich Strba <fridrich.strba at bluewin.ch>
-+ * Copyright (C) 2011 Eilidh McAdam <tibbylickle at gmail.com>
-+ *
-+ * For minor contributions see the git repository.
-+ *
-+ * Alternatively, the contents of this file may be used under the terms
-+ * of the GNU Lesser General Public License Version 2.1 or later
-+ * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
-+ * applicable instead of those above.
-+ *
-+ * For further information visit http://libwpd.sourceforge.net
-+ */
-+
-+#ifndef INCLUDED_LIBODFGEN_LIBODFGEN_API_HXX
-+#define INCLUDED_LIBODFGEN_LIBODFGEN_API_HXX
-+
-+#ifdef DLL_EXPORT
-+#ifdef LIBODFGEN_BUILD
-+#define ODFGENAPI __declspec(dllexport)
-+#else
-+#define ODFGENAPI __declspec(dllimport)
-+#endif
-+#else
-+#define ODFGENAPI
-+#endif
-+
-+#endif // INCLUDED_LIBODFGEN_LIBODFGEN_API_HXX
-+
-+/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
---
-1.9.0
-
diff --git a/external/libodfgen/ExternalPackage_libodfgen.mk b/external/libodfgen/ExternalPackage_libodfgen.mk
index 5ae1839..a6d40f6 100644
--- a/external/libodfgen/ExternalPackage_libodfgen.mk
+++ b/external/libodfgen/ExternalPackage_libodfgen.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen
else ifeq ($(OS),WNT)
$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.dll,src/.libs/libodfgen-0.1.dll))
else ifeq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.so.1,src/.libs/libodfgen-0.1.so.1.0.0))
+$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.so.1,src/.libs/libodfgen-0.1.so.1.0.1))
endif
# vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk
index fc8f6e2..60258a3 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -13,8 +13,4 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,1))
-$(eval $(call gb_UnpackedTarball_add_patches,libodfgen,\
- external/libodfgen/0001-properly-export-API-symbols.patch \
-))
-
# vim: set noet sw=4 ts=4:
commit 7a8637f88afe8ded1165b1c9e05adbc8cd759376
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jun 3 08:14:57 2014 +0200
upload librevenge 0.0.1
Change-Id: I10d457fe34a4e015d9a5e0fe92c27bdd1c7231be
(cherry picked from commit 26f25fdabb6ea90ef30cff724114232becab53dc)
diff --git a/download.lst b/download.lst
index 3e2893c..dee0422 100644
--- a/download.lst
+++ b/download.lst
@@ -121,8 +121,8 @@ export PYTHON_TARBALL := Python-3.3.5.tgz
export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
export REDLAND_TARBALL := 32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
-export REVENGE_MD5SUM := b483b99af21c92c763a1c6a28ebee958
-export REVENGE_TARBALL := librevenge-0.0.0.tar.bz2
+export REVENGE_MD5SUM := 69c367c6b0a360411965a1c409a0b6c1
+export REVENGE_TARBALL := librevenge-0.0.1.tar.bz2
export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
export SERF_MD5SUM := 4f8e76c9c6567aee1d66aba49f76a58b
export SERF_TARBALL := serf-1.2.1.tar.bz2
diff --git a/external/librevenge/0001-nested-iterator-classes-need-to-be-exported-too.patch b/external/librevenge/0001-nested-iterator-classes-need-to-be-exported-too.patch
deleted file mode 100644
index a6055f9..0000000
--- a/external/librevenge/0001-nested-iterator-classes-need-to-be-exported-too.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 03c0fe096ae6e71237d36b88f5f0aa0f62eb09d6 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Mon, 26 May 2014 14:47:57 +0200
-Subject: [PATCH] nested iterator classes need to be exported too
-
----
- inc/librevenge/RVNGPropertyList.h | 2 +-
- inc/librevenge/RVNGPropertyListVector.h | 2 +-
- inc/librevenge/RVNGString.h | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/inc/librevenge/RVNGPropertyList.h b/inc/librevenge/RVNGPropertyList.h
-index c00af07..ac9c10d 100644
---- a/inc/librevenge/RVNGPropertyList.h
-+++ b/inc/librevenge/RVNGPropertyList.h
-@@ -60,7 +60,7 @@ public:
-
- RVNGString getPropString() const;
-
-- class Iter
-+ class REVENGE_API Iter
- {
- public:
- Iter(const RVNGPropertyList &propList);
-diff --git a/inc/librevenge/RVNGPropertyListVector.h b/inc/librevenge/RVNGPropertyListVector.h
-index 850326e..d56f583 100644
---- a/inc/librevenge/RVNGPropertyListVector.h
-+++ b/inc/librevenge/RVNGPropertyListVector.h
-@@ -55,7 +55,7 @@ public:
-
- RVNGString getPropString() const;
-
-- class Iter
-+ class REVENGE_API Iter
- {
- public:
- Iter(const RVNGPropertyListVector &vect);
-diff --git a/inc/librevenge/RVNGString.h b/inc/librevenge/RVNGString.h
-index cbea3bc..429170a 100644
---- a/inc/librevenge/RVNGString.h
-+++ b/inc/librevenge/RVNGString.h
-@@ -118,7 +118,7 @@ public:
- return !operator<=(str);
- }
-
-- class Iter
-+ class REVENGE_API Iter
- {
- public:
- Iter(const RVNGString &str);
---
-1.9.0
-
diff --git a/external/librevenge/0001-properly-export-API-symbols.patch b/external/librevenge/0001-properly-export-API-symbols.patch
deleted file mode 100644
index 64513a0..0000000
--- a/external/librevenge/0001-properly-export-API-symbols.patch
+++ /dev/null
@@ -1,752 +0,0 @@
-From d0df6db52ae8db3b3e9549837e698a091474e727 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Sun, 25 May 2014 08:52:57 +0200
-Subject: [PATCH] properly export API symbols
-
----
- inc/librevenge-generators/Makefile.am | 1 +
- .../RVNGCSVSpreadsheetGenerator.h | 4 ++-
- inc/librevenge-generators/RVNGHTMLTextGenerator.h | 4 ++-
- .../RVNGRawDrawingGenerator.h | 4 ++-
- .../RVNGRawPresentationGenerator.h | 4 ++-
- .../RVNGRawSpreadsheetGenerator.h | 4 ++-
- inc/librevenge-generators/RVNGRawTextGenerator.h | 4 ++-
- .../RVNGSVGPresentationGenerator.h | 4 ++-
- .../RVNGTextDrawingGenerator.h | 4 ++-
- .../RVNGTextPresentationGenerator.h | 9 +++++-
- .../RVNGTextSpreadsheetGenerator.h | 4 ++-
- inc/librevenge-generators/RVNGTextTextGenerator.h | 4 ++-
- .../librevenge-generators-api.h | 36 ++++++++++++++++++++++
- inc/librevenge-stream/Makefile.am | 1 +
- inc/librevenge-stream/RVNGDirectoryStream.h | 4 ++-
- inc/librevenge-stream/RVNGStream.h | 4 ++-
- inc/librevenge-stream/RVNGStreamImplementation.h | 6 ++--
- inc/librevenge-stream/librevenge-stream-api.h | 36 ++++++++++++++++++++++
- inc/librevenge/Makefile.am | 1 +
- inc/librevenge/RVNGBinaryData.h | 5 ++-
- inc/librevenge/RVNGDrawingInterface.h | 4 ++-
- inc/librevenge/RVNGPresentationInterface.h | 4 ++-
- inc/librevenge/RVNGProperty.h | 7 +++--
- inc/librevenge/RVNGPropertyList.h | 5 ++-
- inc/librevenge/RVNGPropertyListVector.h | 4 ++-
- inc/librevenge/RVNGSVGDrawingGenerator.h | 4 ++-
- inc/librevenge/RVNGSpreadsheetInterface.h | 4 ++-
- inc/librevenge/RVNGString.h | 4 ++-
- inc/librevenge/RVNGStringVector.h | 4 ++-
- inc/librevenge/RVNGTextInterface.h | 4 ++-
- inc/librevenge/librevenge-api.h | 36 ++++++++++++++++++++++
- src/lib/Makefile.am | 6 ++++
- 32 files changed, 202 insertions(+), 27 deletions(-)
- create mode 100644 inc/librevenge-generators/librevenge-generators-api.h
- create mode 100644 inc/librevenge-stream/librevenge-stream-api.h
- create mode 100644 inc/librevenge/librevenge-api.h
-
-diff --git a/inc/librevenge-generators/RVNGCSVSpreadsheetGenerator.h b/inc/librevenge-generators/RVNGCSVSpreadsheetGenerator.h
-index 40cce77..084b55c 100644
---- a/inc/librevenge-generators/RVNGCSVSpreadsheetGenerator.h
-+++ b/inc/librevenge-generators/RVNGCSVSpreadsheetGenerator.h
-@@ -21,6 +21,8 @@
- #ifndef RVNGCSVSPREADSHEETGENERATOR_H
- #define RVNGCSVSPREADSHEETGENERATOR_H
-
-+#include "librevenge-generators-api.h"
-+
- #include <librevenge/librevenge.h>
- #include <librevenge-stream/librevenge-stream.h>
-
-@@ -32,7 +34,7 @@ struct RVNGCSVSpreadsheetGeneratorImpl;
- *
- * See \c ::librevenge::RVNGSpreadsheetInterface for documentation of the basic interface.
- */
--class RVNGCSVSpreadsheetGenerator : public RVNGSpreadsheetInterface
-+class REVENGE_GENERATORS_API RVNGCSVSpreadsheetGenerator : public RVNGSpreadsheetInterface
- {
- //! unimplemented copy constructor to prevent copy
- RVNGCSVSpreadsheetGenerator(const RVNGCSVSpreadsheetGenerator &other);
-diff --git a/inc/librevenge-generators/RVNGHTMLTextGenerator.h b/inc/librevenge-generators/RVNGHTMLTextGenerator.h
-index 9bb9b77..6dacfb8 100644
---- a/inc/librevenge-generators/RVNGHTMLTextGenerator.h
-+++ b/inc/librevenge-generators/RVNGHTMLTextGenerator.h
-@@ -21,6 +21,8 @@
- #ifndef RVNGHTMLTEXTGENERATOR_H
- #define RVNGHTMLTEXTGENERATOR_H
-
-+#include "librevenge-generators-api.h"
-+
- #include <librevenge/librevenge.h>
- #include <librevenge-stream/librevenge-stream.h>
-
-@@ -29,7 +31,7 @@ namespace librevenge
-
- struct RVNGHTMLTextGeneratorImpl;
-
--class RVNGHTMLTextGenerator : public RVNGTextInterface
-+class REVENGE_GENERATORS_API RVNGHTMLTextGenerator : public RVNGTextInterface
- {
- public:
- explicit RVNGHTMLTextGenerator(RVNGString &document);
-diff --git a/inc/librevenge-generators/RVNGRawDrawingGenerator.h b/inc/librevenge-generators/RVNGRawDrawingGenerator.h
-index 2b60cc3..a0a6475 100644
---- a/inc/librevenge-generators/RVNGRawDrawingGenerator.h
-+++ b/inc/librevenge-generators/RVNGRawDrawingGenerator.h
-@@ -22,6 +22,8 @@
- #ifndef RVNGRAWDRAWINGGENERATOR_H
- #define RVNGRAWDRAWINGGENERATOR_H
-
-+#include "librevenge-generators-api.h"
-+
- #include <librevenge-stream/librevenge-stream.h>
- #include <librevenge/librevenge.h>
-
-@@ -30,7 +32,7 @@ namespace librevenge
-
- struct RVNGRawDrawingGeneratorImpl;
-
--class RVNGRawDrawingGenerator : public RVNGDrawingInterface
-+class REVENGE_GENERATORS_API RVNGRawDrawingGenerator : public RVNGDrawingInterface
- {
- // disable copying
- RVNGRawDrawingGenerator(const RVNGRawDrawingGenerator &other);
-diff --git a/inc/librevenge-generators/RVNGRawPresentationGenerator.h b/inc/librevenge-generators/RVNGRawPresentationGenerator.h
-index 8a3f1c9..9438541 100644
---- a/inc/librevenge-generators/RVNGRawPresentationGenerator.h
-+++ b/inc/librevenge-generators/RVNGRawPresentationGenerator.h
-@@ -15,6 +15,8 @@
- #ifndef RVNGRAWPRESENTATIONGENERATOR_H
- #define RVNGRAWPRESENTATIONGENERATOR_H
-
-+#include "librevenge-generators-api.h"
-+
- #include <librevenge/librevenge.h>
- #include <librevenge-stream/librevenge-stream.h>
-
-@@ -23,7 +25,7 @@ namespace librevenge
-
- struct RVNGRawPresentationGeneratorImpl;
-
--class RVNGRawPresentationGenerator : public RVNGPresentationInterface
-+class REVENGE_GENERATORS_API RVNGRawPresentationGenerator : public RVNGPresentationInterface
- {
- // disable copying
- RVNGRawPresentationGenerator(const RVNGRawPresentationGenerator &other);
-diff --git a/inc/librevenge-generators/RVNGRawSpreadsheetGenerator.h b/inc/librevenge-generators/RVNGRawSpreadsheetGenerator.h
-index ff584c7..84be1c1 100644
---- a/inc/librevenge-generators/RVNGRawSpreadsheetGenerator.h
-+++ b/inc/librevenge-generators/RVNGRawSpreadsheetGenerator.h
-@@ -21,6 +21,8 @@
- #ifndef RVNGRAWSPREADSHEETGENERATOR_H
- #define RVNGRAWSPREADSHEETGENERATOR_H
-
-+#include "librevenge-generators-api.h"
-+
- #include <librevenge/librevenge.h>
- #include <librevenge-stream/librevenge-stream.h>
-
-@@ -29,7 +31,7 @@ namespace librevenge
-
- struct RVNGRawSpreadsheetGeneratorImpl;
-
--class RVNGRawSpreadsheetGenerator : public RVNGSpreadsheetInterface
-+class REVENGE_GENERATORS_API RVNGRawSpreadsheetGenerator : public RVNGSpreadsheetInterface
- {
- // disable copying
- RVNGRawSpreadsheetGenerator(const RVNGRawSpreadsheetGenerator &other);
-diff --git a/inc/librevenge-generators/RVNGRawTextGenerator.h b/inc/librevenge-generators/RVNGRawTextGenerator.h
-index 2df33d4..7781b07 100644
---- a/inc/librevenge-generators/RVNGRawTextGenerator.h
-+++ b/inc/librevenge-generators/RVNGRawTextGenerator.h
-@@ -21,6 +21,8 @@
- #ifndef RVNGRAWTEXTGENERATOR_H
- #define RVNGRAWTEXTGENERATOR_H
-
-+#include "librevenge-generators-api.h"
-+
- #include <librevenge/librevenge.h>
- #include <librevenge-stream/librevenge-stream.h>
-
-@@ -29,7 +31,7 @@ namespace librevenge
-
- struct RVNGRawTextGeneratorImpl;
-
--class RVNGRawTextGenerator : public RVNGTextInterface
-+class REVENGE_GENERATORS_API RVNGRawTextGenerator : public RVNGTextInterface
- {
- // disable copying
- RVNGRawTextGenerator(const RVNGRawTextGenerator &other);
-diff --git a/inc/librevenge-generators/RVNGSVGPresentationGenerator.h b/inc/librevenge-generators/RVNGSVGPresentationGenerator.h
-index 996ee35..2e18da1 100644
---- a/inc/librevenge-generators/RVNGSVGPresentationGenerator.h
-+++ b/inc/librevenge-generators/RVNGSVGPresentationGenerator.h
-@@ -15,6 +15,8 @@
- #ifndef RVNGSVGPRESENTATIONGENERATOR_H
- #define RVNGSVGPRESENTATIONGENERATOR_H
-
-+#include "librevenge-generators-api.h"
-+
- #include <librevenge/librevenge.h>
- #include <librevenge-stream/librevenge-stream.h>
-
-@@ -23,7 +25,7 @@ namespace librevenge
-
- struct RVNGSVGPresentationGeneratorImpl;
-
--class RVNGSVGPresentationGenerator : public RVNGPresentationInterface
-+class REVENGE_GENERATORS_API RVNGSVGPresentationGenerator : public RVNGPresentationInterface
- {
- // disable copying
- RVNGSVGPresentationGenerator(const RVNGSVGPresentationGenerator &other);
-diff --git a/inc/librevenge-generators/RVNGTextDrawingGenerator.h b/inc/librevenge-generators/RVNGTextDrawingGenerator.h
-index ba9a9cc..2b3160e 100644
---- a/inc/librevenge-generators/RVNGTextDrawingGenerator.h
-+++ b/inc/librevenge-generators/RVNGTextDrawingGenerator.h
-@@ -15,6 +15,8 @@
- #ifndef RVNGTEXTDRAWINGGENERATOR_H
- #define RVNGTEXTDRAWINGGENERATOR_H
-
-+#include "librevenge-generators-api.h"
-+
- #include <librevenge-stream/librevenge-stream.h>
- #include <librevenge/librevenge.h>
-
-@@ -23,7 +25,7 @@ namespace librevenge
-
- struct RVNGTextDrawingGeneratorImpl;
-
--class RVNGTextDrawingGenerator : public RVNGDrawingInterface
-+class REVENGE_GENERATORS_API RVNGTextDrawingGenerator : public RVNGDrawingInterface
- {
- // disable copying
- RVNGTextDrawingGenerator(const RVNGTextDrawingGenerator &other);
-diff --git a/inc/librevenge-generators/RVNGTextPresentationGenerator.h b/inc/librevenge-generators/RVNGTextPresentationGenerator.h
-index f89691e..9bef369 100644
---- a/inc/librevenge-generators/RVNGTextPresentationGenerator.h
-+++ b/inc/librevenge-generators/RVNGTextPresentationGenerator.h
-@@ -12,6 +12,11 @@
- * applicable instead of those above.
- */
-
-+#ifndef RVNGTEXTPRESENTATIONGENERATOR_H
-+#define RVNGTEXTPRESENTATIONGENERATOR_H
-+
-+#include "librevenge-generators-api.h"
-+
- #include <librevenge/librevenge.h>
- #include <librevenge-stream/librevenge-stream.h>
-
-@@ -20,7 +25,7 @@ namespace librevenge
-
- struct RVNGTextPresentationGeneratorImpl;
-
--class RVNGTextPresentationGenerator : public RVNGPresentationInterface
-+class REVENGE_GENERATORS_API RVNGTextPresentationGenerator : public RVNGPresentationInterface
- {
- // disable copying
- RVNGTextPresentationGenerator(const RVNGTextPresentationGenerator &other);
-@@ -124,4 +129,6 @@ private:
-
- }
-
-+#endif
-+
- /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
-diff --git a/inc/librevenge-generators/RVNGTextSpreadsheetGenerator.h b/inc/librevenge-generators/RVNGTextSpreadsheetGenerator.h
-index e140153..9ac9dc8 100644
---- a/inc/librevenge-generators/RVNGTextSpreadsheetGenerator.h
-+++ b/inc/librevenge-generators/RVNGTextSpreadsheetGenerator.h
-@@ -21,6 +21,8 @@
- #ifndef RVNGTEXTSPREADSHEETGENERATOR_H
- #define RVNGTEXTSPREADSHEETGENERATOR_H
-
-+#include "librevenge-generators-api.h"
-+
- #include <librevenge/librevenge.h>
- #include <librevenge-stream/librevenge-stream.h>
-
-@@ -32,7 +34,7 @@ struct RVNGTextSpreadsheetGeneratorImpl;
- *
- * See \c ::librevenge::RVNGSpreadsheetInterface for documentation of the basic interface.
- */
--class RVNGTextSpreadsheetGenerator : public RVNGSpreadsheetInterface
-+class REVENGE_GENERATORS_API RVNGTextSpreadsheetGenerator : public RVNGSpreadsheetInterface
- {
- //! unimplemented copy constructor to prevent copy
- RVNGTextSpreadsheetGenerator(const RVNGTextSpreadsheetGenerator &other);
-diff --git a/inc/librevenge-generators/RVNGTextTextGenerator.h b/inc/librevenge-generators/RVNGTextTextGenerator.h
-index 87828fd..ec657d5 100644
---- a/inc/librevenge-generators/RVNGTextTextGenerator.h
-+++ b/inc/librevenge-generators/RVNGTextTextGenerator.h
-@@ -21,6 +21,8 @@
- #ifndef RVNGTEXTTEXTGENERATOR_H
- #define RVNGTEXTTEXTGENERATOR_H
-
-+#include "librevenge-generators-api.h"
-+
- #include <librevenge/librevenge.h>
- #include <librevenge-stream/librevenge-stream.h>
-
-@@ -29,7 +31,7 @@ namespace librevenge
-
- struct RVNGTextTextGeneratorImpl;
-
--class RVNGTextTextGenerator : public RVNGTextInterface
-+class REVENGE_GENERATORS_API RVNGTextTextGenerator : public RVNGTextInterface
- {
- // disable copying
- RVNGTextTextGenerator(const RVNGTextTextGenerator &other);
-diff --git a/inc/librevenge-generators/librevenge-generators-api.h b/inc/librevenge-generators/librevenge-generators-api.h
-new file mode 100644
-index 0000000..8d4a5ea
---- /dev/null
-+++ b/inc/librevenge-generators/librevenge-generators-api.h
-@@ -0,0 +1,36 @@
-+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* librevenge
-+ * Version: MPL 2.0 / LGPLv2.1+
-+ *
-+ * 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/.
-+ *
-+ * Major Contributor(s):
-+ * Copyright (C) 2002 William Lachance (wrlach at gmail.com)
-+ * Copyright (C) 2002 Marc Maurer (uwog at uwog.net)
-+ *
-+ * For minor contributions see the git repository.
-+ *
-+ * Alternatively, the contents of this file may be used under the terms
-+ * of the GNU Lesser General Public License Version 2.1 or later
-+ * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
-+ * applicable instead of those above.
-+ */
-+
-+#ifndef INCLUDED_LIBREVENGE_GENERATORS_LIBREVENGE_GENERATORS_API_H
-+#define INCLUDED_LIBREVENGE_GENERATORS_LIBREVENGE_GENERATORS_API_H
-+
-+#ifdef DLL_EXPORT
-+#ifdef LIBREVENGE_GENERATORS_BUILD
-+#define REVENGE_GENERATORS_API __declspec(dllexport)
-+#else
-+#define REVENGE_GENERATORS_API __declspec(dllimport)
-+#endif
-+#else
-+#define REVENGE_GENERATORS_API
-+#endif
-+
-+#endif /* INCLUDED_LIBREVENGE_GENERATORS_LIBREVENGE_GENERATORS_API_H */
-+
-+/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
-diff --git a/inc/librevenge-stream/RVNGDirectoryStream.h b/inc/librevenge-stream/RVNGDirectoryStream.h
-index dee185e..46d2101 100644
---- a/inc/librevenge-stream/RVNGDirectoryStream.h
-+++ b/inc/librevenge-stream/RVNGDirectoryStream.h
-@@ -22,6 +22,8 @@
- #ifndef RVNGDIRECTORYSTREAM_H_INCLUDED
- #define RVNGDIRECTORYSTREAM_H_INCLUDED
-
-+#include "librevenge-stream-api.h"
-+
- #include "RVNGStream.h"
-
- namespace librevenge
-@@ -29,7 +31,7 @@ namespace librevenge
-
- struct RVNGDirectoryStreamImpl;
-
--class RVNGDirectoryStream : public RVNGInputStream
-+class REVENGE_STREAM_API RVNGDirectoryStream : public RVNGInputStream
- {
- // disable copying
- RVNGDirectoryStream(const RVNGDirectoryStream &);
-diff --git a/inc/librevenge-stream/RVNGStream.h b/inc/librevenge-stream/RVNGStream.h
-index 6b1b38e..1b40bef 100644
---- a/inc/librevenge-stream/RVNGStream.h
-+++ b/inc/librevenge-stream/RVNGStream.h
-@@ -20,6 +20,8 @@
- #ifndef RVNGSTREAM_H
- #define RVNGSTREAM_H
-
-+#include "librevenge-stream-api.h"
-+
- namespace librevenge
- {
-
-@@ -30,7 +32,7 @@ enum RVNG_SEEK_TYPE
- RVNG_SEEK_END
- };
-
--class RVNGInputStream
-+class REVENGE_STREAM_API RVNGInputStream
- {
- public:
- RVNGInputStream() {}
-diff --git a/inc/librevenge-stream/RVNGStreamImplementation.h b/inc/librevenge-stream/RVNGStreamImplementation.h
-index 06ff938..f4c1a74 100644
---- a/inc/librevenge-stream/RVNGStreamImplementation.h
-+++ b/inc/librevenge-stream/RVNGStreamImplementation.h
-@@ -20,6 +20,8 @@
- #ifndef RVNGSTREAMIMPLEMENTATION_H
- #define RVNGSTREAMIMPLEMENTATION_H
-
-+#include "librevenge-stream-api.h"
-+
- #include "RVNGStream.h"
-
- namespace librevenge
-@@ -27,7 +29,7 @@ namespace librevenge
-
- class RVNGFileStreamPrivate;
-
--class RVNGFileStream: public RVNGInputStream
-+class REVENGE_STREAM_API RVNGFileStream: public RVNGInputStream
- {
- public:
- explicit RVNGFileStream(const char *filename);
-@@ -53,7 +55,7 @@ private:
-
- class RVNGStringStreamPrivate;
-
--class RVNGStringStream: public RVNGInputStream
-+class REVENGE_STREAM_API RVNGStringStream: public RVNGInputStream
- {
- public:
- RVNGStringStream(const unsigned char *data, const unsigned int dataSize);
-diff --git a/inc/librevenge-stream/librevenge-stream-api.h b/inc/librevenge-stream/librevenge-stream-api.h
-new file mode 100644
-index 0000000..5b544fc
---- /dev/null
-+++ b/inc/librevenge-stream/librevenge-stream-api.h
-@@ -0,0 +1,36 @@
-+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* librevenge
-+ * Version: MPL 2.0 / LGPLv2.1+
-+ *
-+ * 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/.
-+ *
-+ * Major Contributor(s):
-+ * Copyright (C) 2002 William Lachance (wrlach at gmail.com)
-+ * Copyright (C) 2002 Marc Maurer (uwog at uwog.net)
-+ *
-+ * For minor contributions see the git repository.
-+ *
-+ * Alternatively, the contents of this file may be used under the terms
-+ * of the GNU Lesser General Public License Version 2.1 or later
-+ * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
-+ * applicable instead of those above.
-+ */
-+
-+#ifndef INCLUDED_LIBREVENGE_STREAM_LIBREVENGE_STREAM_API_H
-+#define INCLUDED_LIBREVENGE_STREAM_LIBREVENGE_STREAM_API_H
-+
-+#ifdef DLL_EXPORT
-+#ifdef LIBREVENGE_STREAM_BUILD
-+#define REVENGE_STREAM_API __declspec(dllexport)
-+#else
-+#define REVENGE_STREAM_API __declspec(dllimport)
-+#endif
-+#else
-+#define REVENGE_STREAM_API
-+#endif
-+
-+#endif /* INCLUDED_LIBREVENGE_STREAM_LIBREVENGE_STREAM_API_H */
-+
-+/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
-diff --git a/inc/librevenge/RVNGBinaryData.h b/inc/librevenge/RVNGBinaryData.h
-index c09b26a..825f4dc 100644
---- a/inc/librevenge/RVNGBinaryData.h
-+++ b/inc/librevenge/RVNGBinaryData.h
-@@ -20,7 +20,10 @@
- #ifndef RVNGBINARYDATA_H
- #define RVNGBINARYDATA_H
-
-+#include "librevenge-api.h"
-+
- #include <librevenge-stream/librevenge-stream.h>
-+
- #include "RVNGString.h"
-
- namespace librevenge
-@@ -28,7 +31,7 @@ namespace librevenge
-
- struct RVNGBinaryDataImpl;
-
--class RVNGBinaryData
-+class REVENGE_API RVNGBinaryData
- {
- public:
- RVNGBinaryData();
-diff --git a/inc/librevenge/RVNGDrawingInterface.h b/inc/librevenge/RVNGDrawingInterface.h
-index 0030e49..3b87cda 100644
---- a/inc/librevenge/RVNGDrawingInterface.h
-+++ b/inc/librevenge/RVNGDrawingInterface.h
-@@ -21,6 +21,8 @@
- #ifndef RVNGDRAWINGINTERFACE_H
- #define RVNGDRAWINGINTERFACE_H
-
-+#include "librevenge-api.h"
-+
- #include "RVNGPropertyList.h"
- #include "RVNGPropertyListVector.h"
- #include "RVNGBinaryData.h"
-@@ -28,7 +30,7 @@
- namespace librevenge
- {
-
--class RVNGDrawingInterface
-+class REVENGE_API RVNGDrawingInterface
- {
- public:
- virtual ~RVNGDrawingInterface() {}
-diff --git a/inc/librevenge/RVNGPresentationInterface.h b/inc/librevenge/RVNGPresentationInterface.h
-index 2142082..32fec64 100644
---- a/inc/librevenge/RVNGPresentationInterface.h
-+++ b/inc/librevenge/RVNGPresentationInterface.h
-@@ -15,6 +15,8 @@
- #ifndef RVNGPRESENTATIONINTERFACE_H
- #define RVNGPRESENTATIONINTERFACE_H
-
-+#include "librevenge-api.h"
-+
- #include "RVNGPropertyList.h"
- #include "RVNGPropertyListVector.h"
-
-@@ -23,7 +25,7 @@ namespace librevenge
-
- /** Interface for import of presentations.
- */
--class RVNGPresentationInterface
-+class REVENGE_API RVNGPresentationInterface
- {
- public:
- virtual ~RVNGPresentationInterface() {}
-diff --git a/inc/librevenge/RVNGProperty.h b/inc/librevenge/RVNGProperty.h
-index 46c94fa..df56c2c 100644
---- a/inc/librevenge/RVNGProperty.h
-+++ b/inc/librevenge/RVNGProperty.h
-@@ -19,6 +19,9 @@
-
- #ifndef RVNGPROPERTY_H
- #define RVNGPROPERTY_H
-+
-+#include "librevenge-api.h"
-+
- #include "RVNGString.h"
-
- namespace librevenge
-@@ -26,7 +29,7 @@ namespace librevenge
-
- enum RVNGUnit { RVNG_INCH, RVNG_PERCENT, RVNG_POINT, RVNG_TWIP, RVNG_GENERIC, RVNG_UNIT_ERROR };
-
--class RVNGProperty
-+class REVENGE_API RVNGProperty
- {
- public:
- virtual ~RVNGProperty();
-@@ -38,7 +41,7 @@ public:
- virtual RVNGProperty *clone() const = 0;
- };
-
--class RVNGPropertyFactory
-+class REVENGE_API RVNGPropertyFactory
- {
- public:
- static RVNGProperty *newStringProp(const RVNGString &str);
-diff --git a/inc/librevenge/RVNGPropertyList.h b/inc/librevenge/RVNGPropertyList.h
-index 8d08bc9..c00af07 100644
---- a/inc/librevenge/RVNGPropertyList.h
-+++ b/inc/librevenge/RVNGPropertyList.h
-@@ -20,6 +20,9 @@
-
- #ifndef RVNGPROPERTYLIST_H
- #define RVNGPROPERTYLIST_H
-+
-+#include "librevenge-api.h"
-+
- #include "RVNGProperty.h"
-
- namespace librevenge
-@@ -32,7 +35,7 @@ class RVNGPropertyListImpl;
- class RVNGPropertyListIterImpl;
- class RVNGPropertyListVector;
-
--class RVNGPropertyList
-+class REVENGE_API RVNGPropertyList
- {
- public:
- RVNGPropertyList();
-diff --git a/inc/librevenge/RVNGPropertyListVector.h b/inc/librevenge/RVNGPropertyListVector.h
-index 33c4f22..850326e 100644
---- a/inc/librevenge/RVNGPropertyListVector.h
-+++ b/inc/librevenge/RVNGPropertyListVector.h
-@@ -21,6 +21,8 @@
- #ifndef RVNGPROPERTYLISTVECTOR_H
- #define RVNGPROPERTYLISTVECTOR_H
-
-+#include "librevenge-api.h"
-+
- #include "RVNGPropertyList.h"
-
- namespace librevenge
-@@ -29,7 +31,7 @@ namespace librevenge
- class RVNGPropertyListVectorImpl;
- class RVNGPropertyListVectorIterImpl;
-
--class RVNGPropertyListVector : public RVNGProperty
-+class REVENGE_API RVNGPropertyListVector : public RVNGProperty
- {
- public:
- RVNGPropertyListVector(const RVNGPropertyListVector &);
-diff --git a/inc/librevenge/RVNGSVGDrawingGenerator.h b/inc/librevenge/RVNGSVGDrawingGenerator.h
-index 4a90a99..9bfce26 100644
---- a/inc/librevenge/RVNGSVGDrawingGenerator.h
-+++ b/inc/librevenge/RVNGSVGDrawingGenerator.h
-@@ -21,6 +21,8 @@
- #ifndef RVNGSVGDRAWINGGENERATOR_H
- #define RVNGSVGDRAWINGGENERATOR_H
-
-+#include "librevenge-api.h"
-+
- #include "RVNGDrawingInterface.h"
- #include "RVNGStringVector.h"
-
-@@ -29,7 +31,7 @@ namespace librevenge
-
- struct RVNGSVGDrawingGeneratorPrivate;
-
--class RVNGSVGDrawingGenerator : public RVNGDrawingInterface
-+class REVENGE_API RVNGSVGDrawingGenerator : public RVNGDrawingInterface
- {
- public:
- RVNGSVGDrawingGenerator(RVNGStringVector &vec, const RVNGString &nmspace);
-diff --git a/inc/librevenge/RVNGSpreadsheetInterface.h b/inc/librevenge/RVNGSpreadsheetInterface.h
-index 28093b1..c839eec 100644
---- a/inc/librevenge/RVNGSpreadsheetInterface.h
-+++ b/inc/librevenge/RVNGSpreadsheetInterface.h
-@@ -22,6 +22,8 @@
- #ifndef RVNGSPREADSHEETINTERFACE_H
- #define RVNGSPREADSHEETINTERFACE_H
-
-+#include "librevenge-api.h"
-+
- #include "RVNGString.h"
- #include "RVNGPropertyList.h"
- #include "RVNGPropertyListVector.h"
-@@ -46,7 +48,7 @@ definitions listed here.
- if neededlibrevenge:name the numbering style name
- */
-
--class RVNGSpreadsheetInterface
-+class REVENGE_API RVNGSpreadsheetInterface
- {
- public:
-
-diff --git a/inc/librevenge/RVNGString.h b/inc/librevenge/RVNGString.h
-index 79f7494..cbea3bc 100644
---- a/inc/librevenge/RVNGString.h
-+++ b/inc/librevenge/RVNGString.h
-@@ -21,12 +21,14 @@
- #ifndef RVNGSTRING_H
- #define RVNGSTRING_H
-
-+#include "librevenge-api.h"
-+
- namespace librevenge
- {
-
- class RVNGStringImpl;
-
--class RVNGString
-+class REVENGE_API RVNGString
- {
- public:
- RVNGString();
-diff --git a/inc/librevenge/RVNGStringVector.h b/inc/librevenge/RVNGStringVector.h
-index 4a83609..912159a 100644
---- a/inc/librevenge/RVNGStringVector.h
-+++ b/inc/librevenge/RVNGStringVector.h
-@@ -20,6 +20,8 @@
- #ifndef RVNGSTRINGVECTOR_H
- #define RVNGSTRINGVECTOR_H
-
-+#include "librevenge-api.h"
-+
- #include "RVNGString.h"
-
- namespace librevenge
-@@ -27,7 +29,7 @@ namespace librevenge
-
- class RVNGStringVectorImpl;
-
--class RVNGStringVector
-+class REVENGE_API RVNGStringVector
- {
- public:
- RVNGStringVector();
-diff --git a/inc/librevenge/RVNGTextInterface.h b/inc/librevenge/RVNGTextInterface.h
-index 8c1c6d4..843b13e 100644
---- a/inc/librevenge/RVNGTextInterface.h
-+++ b/inc/librevenge/RVNGTextInterface.h
-@@ -22,6 +22,8 @@
- #ifndef RVNGTEXTINTERFACE_H
- #define RVNGTEXTINTERFACE_H
-
-+#include "librevenge-api.h"
-+
- #include "RVNGPropertyList.h"
- #include "RVNGPropertyListVector.h"
-
-@@ -36,7 +38,7 @@ definitions listed here.
-
- class RVNGInputStream;
-
--class RVNGTextInterface
-+class REVENGE_API RVNGTextInterface
- {
- public:
- virtual ~RVNGTextInterface() {}
-diff --git a/inc/librevenge/librevenge-api.h b/inc/librevenge/librevenge-api.h
-new file mode 100644
-index 0000000..708c8a1
---- /dev/null
-+++ b/inc/librevenge/librevenge-api.h
-@@ -0,0 +1,36 @@
-+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* librevenge
-+ * Version: MPL 2.0 / LGPLv2.1+
-+ *
-+ * 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/.
-+ *
-+ * Major Contributor(s):
-+ * Copyright (C) 2002 William Lachance (wrlach at gmail.com)
-+ * Copyright (C) 2002 Marc Maurer (uwog at uwog.net)
-+ *
-+ * For minor contributions see the git repository.
-+ *
-+ * Alternatively, the contents of this file may be used under the terms
-+ * of the GNU Lesser General Public License Version 2.1 or later
-+ * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
-+ * applicable instead of those above.
-+ */
-+
-+#ifndef INCLUDED_LIBREVENGE_LIBREVENGE_API_H
-+#define INCLUDED_LIBREVENGE_LIBREVENGE_API_H
-+
-+#ifdef DLL_EXPORT
-+#ifdef LIBREVENGE_BUILD
-+#define REVENGE_API __declspec(dllexport)
-+#else
-+#define REVENGE_API __declspec(dllimport)
-+#endif
-+#else
-+#define REVENGE_API
-+#endif
-+
-+#endif /* INCLUDED_LIBREVENGE_LIBREVENGE_API_H */
-+
-+/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
---
-1.9.0
-
diff --git a/external/librevenge/ExternalPackage_librevenge.mk b/external/librevenge/ExternalPackage_librevenge.mk
index d65fdca..9b868ca 100644
--- a/external/librevenge/ExternalPackage_librevenge.mk
+++ b/external/librevenge/ExternalPackage_librevenge.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/libreven
else ifeq ($(OS),WNT)
$(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.dll,src/lib/.libs/librevenge-0.0.dll))
else ifeq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.so.0,src/lib/.libs/librevenge-0.0.so.0.0.0))
+$(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.so.0,src/lib/.libs/librevenge-0.0.so.0.0.1))
endif
# vim: set noet sw=4 ts=4:
diff --git a/external/librevenge/UnpackedTarball_librevenge.mk b/external/librevenge/UnpackedTarball_librevenge.mk
index 4fef678..470f58f 100644
--- a/external/librevenge/UnpackedTarball_librevenge.mk
+++ b/external/librevenge/UnpackedTarball_librevenge.mk
@@ -13,9 +13,4 @@ $(eval $(call gb_UnpackedTarball_set_tarball,librevenge,$(REVENGE_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,librevenge,1))
-$(eval $(call gb_UnpackedTarball_add_patches,librevenge,\
- external/librevenge/0001-properly-export-API-symbols.patch \
- external/librevenge/0001-nested-iterator-classes-need-to-be-exported-too.patch \
-))
-
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list