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

[David Tardon]

 download.lst                                    |    4 +-
 external/libodfgen/ExternalPackage_libodfgen.mk |    2 -
 external/libodfgen/UnpackedTarball_libodfgen.mk |    4 --
 external/libodfgen/metadata.patch               |   33 ------------------------
 4 files changed, 3 insertions(+), 40 deletions(-)

New commits:
commit 9fbc8c06a3cb0df6d1208b8916e0e9f31ca8d025
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Jan 1 10:31:24 2015 +0100

    upload libodfgen 0.1.3
    
    Change-Id: Ia28bac4b12f23f3e85e42e323b35d8715a6d5d02

diff --git a/download.lst b/download.lst
index 4fdc234..05d98d3 100644
--- a/download.lst
+++ b/download.lst
@@ -108,8 +108,8 @@ export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
 export NSS_TARBALL := b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz
-export ODFGEN_MD5SUM := b261066a880ba4ad2d79c9291c8037af
-export ODFGEN_TARBALL := libodfgen-0.1.2.tar.bz2
+export ODFGEN_MD5SUM := 47d292edebac7b60c61d5cf307da1d64
+export ODFGEN_TARBALL := libodfgen-0.1.3.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/ExternalPackage_libodfgen.mk b/external/libodfgen/ExternalPackage_libodfgen.mk
index 0c05876..171dfeb 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 edf41b6..bb2153f 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 1b904ed..0000000
--- a/external/libodfgen/metadata.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit fb43d79e12ce132fc127cc0481ff5a6bdbcd1afe
-Author: Miklos Vajna <vmiklos at 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");