diff options
author | David Tardon <dtardon@redhat.com> | 2014-05-24 14:21:21 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-05-26 18:49:04 +0200 |
commit | 48c9d7ac7ccdad27067efe0d168e96ff48372631 (patch) | |
tree | 82b808b8c597046ed507aa6e2badd21090090190 /external/libebook | |
parent | 2013d184f1cf5928fa4a919d1521c1ae7b053796 (diff) |
rebase all import libs
Change-Id: I9e1fc613816c943f4fb1033185e34e3acf317f1d
Diffstat (limited to 'external/libebook')
-rw-r--r-- | external/libebook/0001-blind-attempt-to-workaround-MSVC-bug.patch | 87 | ||||
-rw-r--r-- | external/libebook/ExternalProject_libebook.mk | 10 | ||||
-rw-r--r-- | external/libebook/UnpackedTarball_libebook.mk | 4 |
3 files changed, 98 insertions, 3 deletions
diff --git a/external/libebook/0001-blind-attempt-to-workaround-MSVC-bug.patch b/external/libebook/0001-blind-attempt-to-workaround-MSVC-bug.patch new file mode 100644 index 000000000000..2ecedf3dd801 --- /dev/null +++ b/external/libebook/0001-blind-attempt-to-workaround-MSVC-bug.patch @@ -0,0 +1,87 @@ +From e9362c25b772c2cfb657b1234d8b636669a1b01b Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Mon, 26 May 2014 16:33:00 +0200 +Subject: [PATCH] blind attempt to workaround MSVC bug + +http://msdn.microsoft.com/en-us/library/27zksbks.aspx +--- + src/lib/EBOOKDocument.cpp | 49 ++++++++++++++++++++++++++++------------------- + 1 file changed, 29 insertions(+), 20 deletions(-) + +diff --git a/src/lib/EBOOKDocument.cpp b/src/lib/EBOOKDocument.cpp +index ea1a223..5b8e7ec 100644 +--- a/src/lib/EBOOKDocument.cpp ++++ b/src/lib/EBOOKDocument.cpp +@@ -173,6 +173,15 @@ catch (...) + return EBOOKDocument::TYPE_UNKNOWN; + } + ++extern "C" ++{ ++ ++ void detectInternalSubset(void *const ctx, const xmlChar *const name, const xmlChar *, const xmlChar *); ++ void detectExternalSubset(void *const ctx, const xmlChar *const name, const xmlChar *, const xmlChar *); ++ void detectStartElement(void *const ctx, const xmlChar *const name, const xmlChar **); ++ ++} ++ + struct HTMLContext + { + xmlSAXHandler handler; +@@ -196,26 +205,6 @@ void detectHTMLContent(void *const ctx, const xmlChar *const name) + context->html = EBOOKHTMLToken::html == getHTMLTokenId(char_cast(name)); + } + +-extern "C" +-{ +- +- void detectInternalSubset(void *const ctx, const xmlChar *const name, const xmlChar *, const xmlChar *) +- { +- detectHTMLContent(ctx, name); +- } +- +- void detectExternalSubset(void *const ctx, const xmlChar *const name, const xmlChar *, const xmlChar *) +- { +- detectHTMLContent(ctx, name); +- } +- +- void detectStartElement(void *const ctx, const xmlChar *const name, const xmlChar **) +- { +- detectHTMLContent(ctx, name); +- } +- +-} +- + HTMLContext::HTMLContext() + : handler() + , detected(false) +@@ -250,6 +239,26 @@ catch (...) + return false; + } + ++extern "C" ++{ ++ ++ void detectInternalSubset(void *const ctx, const xmlChar *const name, const xmlChar *, const xmlChar *) ++ { ++ detectHTMLContent(ctx, name); ++ } ++ ++ void detectExternalSubset(void *const ctx, const xmlChar *const name, const xmlChar *, const xmlChar *) ++ { ++ detectHTMLContent(ctx, name); ++ } ++ ++ void detectStartElement(void *const ctx, const xmlChar *const name, const xmlChar **) ++ { ++ detectHTMLContent(ctx, name); ++ } ++ ++} ++ + template<class Parser> + bool probe(const RVNGInputStreamPtr_t &input, const EBOOKDocument::Type type, EBOOKDocument::Type *const typeOut, EBOOKDocument::Confidence &confidence) try + { +-- +1.9.0 + diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk index b4e2bd6a8378..785aeb714f14 100644 --- a/external/libebook/ExternalProject_libebook.mk +++ b/external/libebook/ExternalProject_libebook.mk @@ -19,10 +19,11 @@ $(eval $(call gb_ExternalProject_use_externals,libebook,\ boost_headers \ icu \ libxml2 \ - wpd \ + revenge \ zlib \ )) +# TODO: remove the generators/stream empty vars on libe-book update $(call gb_ExternalProject_get_state_target,libebook,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ @@ -31,15 +32,18 @@ $(call gb_ExternalProject_get_state_target,libebook,build) : --enable-static \ --disable-shared \ --without-docs \ + --without-tools \ + --disable-tests \ $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \ + $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ --disable-werror \ --disable-weffc \ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \ XML_CFLAGS="$(if $(SYSTEM_LIBXML),$(LIBXML_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \ XML_LIBS="$(LIBXML_LIBS)" \ + REVENGE_GENERATORS_CFLAGS=' ' REVENGE_GENERATORS_LIBS=' ' REVENGE_STREAM_CFLAGS=' ' REVENGE_STREAM_LIBS=' ' \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - && cd src/lib \ - && $(MAKE) $(if $(VERBOSE)$(verbose),V=1) \ + && $(MAKE) \ ) # vim: set noet sw=4 ts=4: diff --git a/external/libebook/UnpackedTarball_libebook.mk b/external/libebook/UnpackedTarball_libebook.mk index 7dfee2c7550d..bcc098a6643e 100644 --- a/external/libebook/UnpackedTarball_libebook.mk +++ b/external/libebook/UnpackedTarball_libebook.mk @@ -13,4 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libebook,$(EBOOK_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libebook,1)) +$(eval $(call gb_UnpackedTarball_add_patches,libebook,\ + external/libebook/0001-blind-attempt-to-workaround-MSVC-bug.patch \ +)) + # vim: set noet sw=4 ts=4: |