upload libe-book 0.1.1

Change-Id: I48f67b203c3362ff87e41635e1212e0024a982f0
(cherry picked from commit 9496d573340d965dfe180733988a156bb182d39f)

4 files changed, 2 insertions, 152 deletions

diff --git a/download.lst b/download.lst
index 0301eaec446c..b0ee9fe0131b 100644
--- a/download.lst
+++ b/download.lst
@@ -30,8 +30,8 @@ export CT2N_TARBALL := 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.
 export CURL_MD5SUM := e6d1f9d1b59da5062109ffe14e0569a4
 export CURL_TARBALL := curl-7.36.0.tar.bz2
 export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
-export EBOOK_MD5SUM := 3244af3faf9e8334b8c45d1107ba8ca2
-export EBOOK_TARBALL := libe-book-0.1.0.tar.bz2
+export EBOOK_MD5SUM := c25a881d21abc5b4da19205db513cc22
+export EBOOK_TARBALL := libe-book-0.1.1.tar.bz2
 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 export ETONYEK_MD5SUM := 9d4de5e3b0846dc53b9d18908557fb02
 export ETONYEK_TARBALL := libetonyek-0.1.0.tar.bz2
diff --git a/external/libebook/0001-blind-attempt-to-workaround-MSVC-bug.patch b/external/libebook/0001-blind-attempt-to-workaround-MSVC-bug.patch
deleted file mode 100644
index 2ecedf3dd801..000000000000
--- a/external/libebook/0001-blind-attempt-to-workaround-MSVC-bug.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-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/0001-parse-zipped-FictionBook-2-files-again.patch b/external/libebook/0001-parse-zipped-FictionBook-2-files-again.patch
deleted file mode 100644
index d068e798fe8f..000000000000
--- a/external/libebook/0001-parse-zipped-FictionBook-2-files-again.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 5690c18cb2de1bf4f3cce3da8a2132303a0c731f Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Thu, 29 May 2014 13:30:13 +0200
-Subject: [PATCH] parse zipped FictionBook 2 files again
-
----
- src/lib/EBOOKDocument.cpp | 28 +++++++++++++++++++++++++++-
- 1 file changed, 27 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/EBOOKDocument.cpp b/src/lib/EBOOKDocument.cpp
-index 5b8e7ec..c4f9913 100644
---- a/src/lib/EBOOKDocument.cpp
-+++ b/src/lib/EBOOKDocument.cpp
-@@ -427,6 +427,25 @@ EBOOKAPI EBOOKDocument::Confidence EBOOKDocument::isSupported(librevenge::RVNGIn
-       }
-     }
- #endif
-+
-+    // TODO: This needs improvement: zipped FictionBook 2 files can contain images too...
-+    if (1 == input->subStreamCount())
-+    {
-+      const librevenge::RVNGString name(input->subStreamName(0));
-+      const unsigned long size = name.size();
-+      const char *const cName = name.cstr();
-+      if (equal(cName + (size - 4), cName + size, ".fb2"))
-+      {
-+        const scoped_ptr<RVNGInputStream> fb2(input->getSubStreamById(0));
-+        const Type xmlType = detectXML(fb2.get());
-+        if (TYPE_FICTIONBOOK2 == xmlType)
-+        {
-+          if (type)
-+            *type = xmlType;
-+          return CONFIDENCE_EXCELLENT;
-+        }
-+      }
-+    }
-   }
- 
-   Confidence confidence = CONFIDENCE_NONE;
-@@ -533,7 +552,14 @@ EBOOKAPI EBOOKDocument::Result EBOOKDocument::parse(librevenge::RVNGInputStream
- #endif
-   case TYPE_FICTIONBOOK2 :
-   {
--    FB2Parser parser(input_.get());
-+    RVNGInputStreamPtr_t fb2Input(input_);
-+    // TODO: this needs to handle package with images too
-+    if (input_->isStructured())
-+    {
-+      assert(1 == input->subStreamCount());
-+      fb2Input.reset(input->getSubStreamById(0));
-+    }
-+    FB2Parser parser(fb2Input.get());
-     return parser.parse(document) ? RESULT_OK : RESULT_UNKNOWN_ERROR;
-   }
- #if defined ENABLE_EXPERIMENTAL
--- 
-1.9.3
-
diff --git a/external/libebook/UnpackedTarball_libebook.mk b/external/libebook/UnpackedTarball_libebook.mk
index 498698102a34..7dfee2c7550d 100644
--- a/external/libebook/UnpackedTarball_libebook.mk
+++ b/external/libebook/UnpackedTarball_libebook.mk
@@ -13,9 +13,4 @@ $(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 \
-	external/libebook/0001-parse-zipped-FictionBook-2-files-again.patch \
-))
-
 # vim: set noet sw=4 ts=4: