diff options
| author | David Tardon <dtardon@redhat.com> | 2015-01-01 23:02:29 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-01-01 23:02:29 +0100 |
| commit | d2d941ceec8c02f2c062558bd573d49d988a0fcc (patch) | |
| tree | 5e2f166f15fc6a9843a24438963c661d9ff31d28 /external | |
| parent | fcf152ea70164f303861c7edcd83ab0766ad600a (diff) | |
define all needed macros for libodfgen build on windows
Change-Id: Ic05027fafc9bed8d37306be9c7da63e53d1c6196
Diffstat (limited to 'external')
| -rw-r--r-- | external/libodfgen/Library_odfgen.mk | 2 | ||||
| -rw-r--r-- | external/libodfgen/missing-ifdef.patch | 16 |
2 files changed, 2 insertions, 16 deletions
diff --git a/external/libodfgen/Library_odfgen.mk b/external/libodfgen/Library_odfgen.mk index dfdd5df648c7..161415c78f04 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 4a53ccfca084..9a3edc60eacc 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 |