From 9fbc8c06a3cb0df6d1208b8916e0e9f31ca8d025 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 1 Jan 2015 10:31:24 +0100
Subject: upload libodfgen 0.1.3

Change-Id: Ia28bac4b12f23f3e85e42e323b35d8715a6d5d02
---
 external/libodfgen/ExternalPackage_libodfgen.mk |  2 +-
 external/libodfgen/UnpackedTarball_libodfgen.mk |  4 ---
 external/libodfgen/metadata.patch               | 33 -------------------------
 3 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 external/libodfgen/metadata.patch

(limited to 'external/libodfgen')

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/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk
index edf41b6148eb..bb2153f5790a 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,0))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
-    external/libodfgen/metadata.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");
-- 
cgit