[Libreoffice-commits] core.git: external/libodfgen

[Miklos Vajna]

 external/libodfgen/UnpackedTarball_libodfgen.mk |    4 ++
 external/libodfgen/missing-ifdef.patch          |   43 ++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

New commits:
commit fcf152ea70164f303861c7edcd83ab0766ad600a
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Jan 1 22:10:58 2015 +0100

    error C1083: Cannot open include file: 'config.h': No such file or directory
    
    Change-Id: I8499c79358c598f71585234d7007e981ff4d88e1

diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk
index bb2153f..04f5149 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -13,4 +13,8 @@ $(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 \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/missing-ifdef.patch b/external/libodfgen/missing-ifdef.patch
new file mode 100644
index 0000000..4a53ccf
--- /dev/null
+++ b/external/libodfgen/missing-ifdef.patch
@@ -0,0 +1,43 @@
+From b74fc4236cbc58719cc5f6c7fbb3a2213fefa41a Mon Sep 17 00:00:00 2001
+From: Miklos Vajna <vmiklos at 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>
+ 
+@@ -123,6 +125,7 @@ void OdfGenerator::setDocumentMetaData(const librevenge::RVNGPropertyList &propL
+ 		}
+ 	}
+ 
++#if HAVE_CONFIG_H
+ 	if (generator.empty())
+ 	{
+ 		generator = PACKAGE "/" VERSION;
+@@ -133,6 +136,7 @@ void OdfGenerator::setDocumentMetaData(const librevenge::RVNGPropertyList &propL
+ 		generator += PACKAGE "/" VERSION;
+ 		generator += ")";
+ 	}
++#endif
+ 
+ 	mMetaDataStorage.push_back(new TagOpenElement("meta:generator"));
+ 	mMetaDataStorage.push_back(new CharDataElement(generator.c_str()));
+-- 
+2.1.2
+