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

[David Tardon]

 download.lst                                    |    3 ++-
 external/libodfgen/ExternalPackage_libodfgen.mk |    2 +-
 external/libodfgen/Library_odfgen.mk            |    2 ++
 external/libodfgen/missing-ifdef.patch          |   16 ----------------
 4 files changed, 5 insertions(+), 18 deletions(-)

New commits:
commit 4457453864d54c1b951292709432a9b255161a0d
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Jan 1 23:06:31 2015 +0100

    updates should not require touching ExternalPackage*
    
    Change-Id: Ic23c434770159ddea1f05ac0ef49572b387ebb54

diff --git a/external/libodfgen/ExternalPackage_libodfgen.mk b/external/libodfgen/ExternalPackage_libodfgen.mk
index 171dfeb..1708430 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.3))
+$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.so.1,src/.libs/libodfgen-0.1.so.1.0.$(ODFGEN_VERSION_MICRO)))
 endif
 
 # vim: set noet sw=4 ts=4:
commit d2d941ceec8c02f2c062558bd573d49d988a0fcc
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Jan 1 23:02:29 2015 +0100

    define all needed macros for libodfgen build on windows
    
    Change-Id: Ic05027fafc9bed8d37306be9c7da63e53d1c6196

diff --git a/download.lst b/download.lst
index 05d98d3..f439eb4 100644
--- a/download.lst
+++ b/download.lst
@@ -109,7 +109,8 @@ 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 := 47d292edebac7b60c61d5cf307da1d64
-export ODFGEN_TARBALL := libodfgen-0.1.3.tar.bz2
+export ODFGEN_VERSION_MICRO := 3
+export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).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/Library_odfgen.mk b/external/libodfgen/Library_odfgen.mk
index dfdd5df..161415c 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/missing-ifdef.patch b/external/libodfgen/missing-ifdef.patch
index 4a53ccf..9a3edc6 100644
--- a/external/libodfgen/missing-ifdef.patch
+++ b/external/libodfgen/missing-ifdef.patch
@@ -22,22 +22,6 @@ index 0534528..c9ace1d 100644
  
  #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