summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2014-02-10 14:13:00 +0100
committerFridrich Strba <fridrich@documentfoundation.org>2014-02-10 14:27:36 +0000
commit3b662ee2da7f308189307dd17d3a86aaa5f60d46 (patch)
tree3f30f61c8fd85a11db6ec3962a4cc84ec37f97a0
parent8f294bba6f6dafce989c146e90251e61e23801dc (diff)
upload new libe-book
Change-Id: I69e87ad57513c7349aa0abf38b6054583d367963 (cherry picked from commit 95c54daf9cc3054de1bdc52dd327908716fc4a8c) Reviewed-on: https://gerrit.libreoffice.org/7971 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
-rw-r--r--download.lst4
-rw-r--r--external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch30
-rw-r--r--external/libebook/UnpackedTarball_libebook.mk4
3 files changed, 2 insertions, 36 deletions
diff --git a/download.lst b/download.lst
index f59a190ad5b9..70671bcb922c 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@ ABW_MD5SUM := af3ccc1f1884e68389088d490d596409
export ABW_TARBALL := libabw-0.0.1.tar.bz2
CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
export CDR_TARBALL := libcdr-0.0.14.tar.bz2
-EBOOK_MD5SUM := 3a62e10c57270718cabfdfc4b7b4e095
-export EBOOK_TARBALL := libe-book-0.0.2.tar.bz2
+EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978
+export EBOOK_TARBALL := libe-book-0.0.3.tar.bz2
ETONYEK_MD5SUM := 9dad826726da4d4ad60084968691f5f4
export ETONYEK_TARBALL := libetonyek-0.0.3.tar.bz2
FREEHAND_MD5SUM := 496dd00028afcc19f896b01394769043
diff --git a/external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch b/external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch
deleted file mode 100644
index 21ab72bbc164..000000000000
--- a/external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 30021c75542a008ccf8814fa70d519f00bc69776 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Thu, 28 Nov 2013 09:50:00 +0000
-Subject: [PATCH] Fix crash on abi2010-1.doc example
-
----
- src/lib/FB2Parser.cpp | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/FB2Parser.cpp b/src/lib/FB2Parser.cpp
-index d258c09..3cd3e3c 100644
---- a/src/lib/FB2Parser.cpp
-+++ b/src/lib/FB2Parser.cpp
-@@ -357,8 +357,11 @@ FB2XMLParserContext *processNode(FB2XMLParserContext *const context, const xmlTe
- {
- case XML_READER_TYPE_ELEMENT :
- {
-- const EBOOKToken *name = getFB2Token(xmlTextReaderConstLocalName(reader));
-- const EBOOKToken *ns = getFB2Token(xmlTextReaderConstNamespaceUri(reader));
-+ const xmlChar *name_str = xmlTextReaderConstLocalName(reader);
-+ const xmlChar *ns_str = xmlTextReaderConstNamespaceUri(reader);
-+
-+ const EBOOKToken *name = name_str ? getFB2Token(name_str) : 0;
-+ const EBOOKToken *ns = ns_str ? getFB2Token(ns_str) : 0;
-
- if (!name || !ns)
- // TODO: unknown elements should not be skipped entirely, but
---
-1.8.3.1
-
diff --git a/external/libebook/UnpackedTarball_libebook.mk b/external/libebook/UnpackedTarball_libebook.mk
index 3cf21e608f7e..7dfee2c7550d 100644
--- a/external/libebook/UnpackedTarball_libebook.mk
+++ b/external/libebook/UnpackedTarball_libebook.mk
@@ -13,8 +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-Fix-crash-on-abi2010-1.doc-example.patch \
-))
-
# vim: set noet sw=4 ts=4: