Kaydet (Commit) dcce3f7f authored tarafından David Tardon's avatar David Tardon

upload libodfgen 0.1.4

Change-Id: I97dbebbe7ecbfdc2d4ad37ac53d22026d5e67738
üst b9517712
...@@ -109,8 +109,8 @@ export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector- ...@@ -109,8 +109,8 @@ export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-
export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.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 NSS_TARBALL := b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz
export ODFGEN_MD5SUM := 47d292edebac7b60c61d5cf307da1d64 export ODFGEN_MD5SUM := 8716be5c22ae8353f9aaa380d74840dc
export ODFGEN_VERSION_MICRO := 3 export ODFGEN_VERSION_MICRO := 4
export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
......
...@@ -13,11 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL))) ...@@ -13,11 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0)) $(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0))
$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
external/libodfgen/missing-ifdef.patch \
external/libodfgen/rtti.patch \
))
ifeq ($(COM_GCC_IS_CLANG),TRUE) ifeq ($(COM_GCC_IS_CLANG),TRUE)
ifneq ($(filter -fsanitize=%,$(CC)),) ifneq ($(filter -fsanitize=%,$(CC)),)
$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \ $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
......
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
--- inc/libodfgen/OdfDocumentHandler.hxx
+++ inc/libodfgen/OdfDocumentHandler.hxx
@@ -32,7 +32,7 @@
*
* @sa OdgGenerator, OdpGenerator, OdtGenerator
*/
-enum OdfStreamType { ODF_FLAT_XML, ODF_CONTENT_XML, ODF_STYLES_XML, ODF_SETTINGS_XML, ODF_META_XML, ODF_MANIFEST_XML };
+enum ODFGENAPI OdfStreamType { ODF_FLAT_XML, ODF_CONTENT_XML, ODF_STYLES_XML, ODF_SETTINGS_XML, ODF_META_XML, ODF_MANIFEST_XML };
class OdfDocumentHandler;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment