From dcce3f7fd50b05593e77d7ff43735c5694e9422b Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 18 May 2015 08:19:31 +0200
Subject: upload libodfgen 0.1.4

Change-Id: I97dbebbe7ecbfdc2d4ad37ac53d22026d5e67738
---
 external/libodfgen/UnpackedTarball_libodfgen.mk |  5 -----
 external/libodfgen/missing-ifdef.patch          | 27 -------------------------
 external/libodfgen/rtti.patch                   | 11 ----------
 3 files changed, 43 deletions(-)
 delete mode 100644 external/libodfgen/missing-ifdef.patch
 delete mode 100644 external/libodfgen/rtti.patch

(limited to 'external/libodfgen')

diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk
index 1aa716f244c5..85a14b3e961b 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -13,11 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
-	external/libodfgen/missing-ifdef.patch \
-	external/libodfgen/rtti.patch \
-))
-
 ifeq ($(COM_GCC_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
diff --git a/external/libodfgen/missing-ifdef.patch b/external/libodfgen/missing-ifdef.patch
deleted file mode 100644
index 9a3edc60eacc..000000000000
--- a/external/libodfgen/missing-ifdef.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b74fc4236cbc58719cc5f6c7fbb3a2213fefa41a Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos@collabora.co.uk>
-Date: Thu, 1 Jan 2015 20:29:36 +0100
-Subject: [PATCH] error C1083: Cannot open include file: 'config.h': No such
- file or directory
-
----
- src/OdfGenerator.cxx | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/OdfGenerator.cxx b/src/OdfGenerator.cxx
-index 0534528..c9ace1d 100644
---- src/OdfGenerator.cxx
-+++ src/OdfGenerator.cxx
-@@ -24,7 +24,9 @@
-  * Corel Corporation or Corel Corporation Limited."
-  */
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #include <math.h>
- 
--- 
-2.1.2
-
diff --git a/external/libodfgen/rtti.patch b/external/libodfgen/rtti.patch
deleted file mode 100644
index 2de9e947c6a6..000000000000
--- a/external/libodfgen/rtti.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- inc/libodfgen/OdfDocumentHandler.hxx
-+++ inc/libodfgen/OdfDocumentHandler.hxx
-@@ -32,7 +32,7 @@
-   *
-   * @sa OdgGenerator, OdpGenerator, OdtGenerator
-   */
--enum OdfStreamType { ODF_FLAT_XML, ODF_CONTENT_XML, ODF_STYLES_XML, ODF_SETTINGS_XML, ODF_META_XML, ODF_MANIFEST_XML };
-+enum ODFGENAPI OdfStreamType { ODF_FLAT_XML, ODF_CONTENT_XML, ODF_STYLES_XML, ODF_SETTINGS_XML, ODF_META_XML, ODF_MANIFEST_XML };
- 
- class OdfDocumentHandler;
- 
-- 
cgit