upload libodfgen 0.1.3

(cherry picked from commit 9fbc8c06a3cb0df6d1208b8916e0e9f31ca8d025)

error C1083: Cannot open include file: 'config.h': No such file or directory

(cherry picked from commit fcf152ea70164f303861c7edcd83ab0766ad600a)

define all needed macros for libodfgen build on windows

(cherry picked from commit d2d941ceec8c02f2c062558bd573d49d988a0fcc)

Library_odfgen: missing quotes

(cherry picked from commit e4c2340c4e0c048af4c77d17380cccf7f2985b5d)

Change-Id: I4137a362b0f163b82d1212d3833f8037ed4a773f
Reviewed-on: https://gerrit.libreoffice.org/13720
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

5 files changed, 31 insertions, 35 deletions

diff --git a/external/libodfgen/ExternalPackage_libodfgen.mk b/external/libodfgen/ExternalPackage_libodfgen.mk
index 0c05876afe1e..171dfebc2fa9 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.2))
+$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.so.1,src/.libs/libodfgen-0.1.so.1.0.3))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/Library_odfgen.mk b/external/libodfgen/Library_odfgen.mk
index dfdd5df648c7..4cae5b01601c 100644
--- a/external/libodfgen/Library_odfgen.mk
+++ b/external/libodfgen/Library_odfgen.mk
@@ -28,6 +28,8 @@ $(eval $(call gb_Library_add_defs,odfgen,\
 	-DDLL_EXPORT \
 	-DLIBODFGEN_BUILD \
 	-DNDEBUG \
+	-DPACKAGE=\"libodfgen\" \
+	-DVERSION=\"0.1.$(ODFGEN_VERSION_MICRO)\" \
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,odfgen,\
diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk
index edf41b6148eb..04f5149ec58b 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -14,7 +14,7 @@ $(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/metadata.patch \
+	external/libodfgen/missing-ifdef.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/metadata.patch b/external/libodfgen/metadata.patch
deleted file mode 100644
index 1b904ed8cfd8..000000000000
--- a/external/libodfgen/metadata.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit fb43d79e12ce132fc127cc0481ff5a6bdbcd1afe
-Author: Miklos Vajna <vmiklos@collabora.co.uk>
-Date:   Tue Nov 25 11:26:34 2014 +0100
-
-    Od[gp]Generator: declare meta namespace
-    
-    Other generators had it already, and without this, it's not possible to
-    declare creation date.
-
-diff --git src/OdgGenerator.cxx src/OdgGenerator.cxx
-index 6a2b1a4..ca4d4f0 100644
---- src/OdgGenerator.cxx
-+++ src/OdgGenerator.cxx
-@@ -283,6 +283,7 @@ bool OdgGeneratorPrivate::writeTargetDocument(OdfDocumentHandler *pHandler, OdfS
- 	docContentPropList.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0");
- 	docContentPropList.addAttribute("xmlns:table", "urn:oasis:names:tc:opendocument:xmlns:table:1.0");
- 	docContentPropList.addAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink");
-+	docContentPropList.addAttribute("xmlns:meta", "urn:oasis:names:tc:opendocument:xmlns:meta:1.0");
- 	docContentPropList.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/");
- 	docContentPropList.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
- 	docContentPropList.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
-diff --git a/src/OdpGenerator.cxx b/src/OdpGenerator.cxx
-index 4345c40..8ba4dc0 100644
---- src/OdpGenerator.cxx
-+++ src/OdpGenerator.cxx
-@@ -444,6 +444,7 @@ bool OdpGeneratorPrivate::writeTargetDocument(OdfDocumentHandler *pHandler, OdfS
- 	docContentPropList.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
- 	docContentPropList.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0");
- 	docContentPropList.addAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink");
-+	docContentPropList.addAttribute("xmlns:meta", "urn:oasis:names:tc:opendocument:xmlns:meta:1.0");
- 	// WARNING: this is not ODF!
- 	docContentPropList.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office");
- 	docContentPropList.addAttribute("xmlns:officeooo", "http://openoffice.org/2009/office");
diff --git a/external/libodfgen/missing-ifdef.patch b/external/libodfgen/missing-ifdef.patch
new file mode 100644
index 000000000000..9a3edc60eacc
--- /dev/null
+++ b/external/libodfgen/missing-ifdef.patch
@@ -0,0 +1,27 @@
+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
+