upload libodfgen 0.1.1

Change-Id: I46079625b9aa6fd4e1c205a381d2c157b51dc7e4

4 files changed, 3 insertions, 177 deletions

diff --git a/download.lst b/download.lst
index 8488702f55fe..067b09d5ff2b 100644
--- a/download.lst
+++ b/download.lst
@@ -103,8 +103,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 91799aa82007..000000000000
--- 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@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@bluewin.ch>
-+ * Copyright (C) 2011 Eilidh McAdam <tibbylickle@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 5ae18399e494..a6d40f62a8d1 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 fc8f6e21b650..60258a3a2e3f 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: