diff options
author | David Tardon <dtardon@redhat.com> | 2013-11-04 09:46:41 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-11-04 09:47:06 +0100 |
commit | 79b81a34ccedc0abb6c97f14b28add238c1b3621 (patch) | |
tree | 4ca14cdab09aff25135481a97c914ec92b4d89aa /external/libetonyek | |
parent | fdo#70393: move rhino to a subdir of external (diff) | |
download | core-79b81a34ccedc0abb6c97f14b28add238c1b3621.tar.gz core-79b81a34ccedc0abb6c97f14b28add238c1b3621.zip |
upload new libetonyek
Change-Id: Ic20df004adca80ea0365f392317ec38f92c9fe43
Diffstat (limited to 'external/libetonyek')
4 files changed, 0 insertions, 121 deletions
diff --git a/external/libetonyek/0001-fix-windows-build.patch b/external/libetonyek/0001-fix-windows-build.patch deleted file mode 100644 index 30e6609fafee..000000000000 --- a/external/libetonyek/0001-fix-windows-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -From abde3dc1e9c56f7bf68c91279d80a350beb58784 Mon Sep 17 00:00:00 2001 -From: David Tardon <dtardon@redhat.com> -Date: Wed, 30 Oct 2013 17:57:51 +0100 -Subject: [PATCH] fix windows build - ---- - src/lib/libetonyek_utils.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/lib/libetonyek_utils.h b/src/lib/libetonyek_utils.h -index cd0d621..2b2bf48 100644 ---- a/src/lib/libetonyek_utils.h -+++ b/src/lib/libetonyek_utils.h -@@ -24,11 +24,11 @@ - typedef unsigned char uint8_t; - typedef unsigned short uint16_t; - typedef unsigned uint32_t; --typedef unsigned int64 uint64_t; -+typedef unsigned __int64 uint64_t; - typedef signed char int8_t; - typedef short int16_t; - typedef int int32_t; --typedef int64 int64_t; -+typedef __int64 int64_t; - - #else - --- -1.8.3.1 - diff --git a/external/libetonyek/0001-impl.-XML-format-detection.patch b/external/libetonyek/0001-impl.-XML-format-detection.patch deleted file mode 100644 index 4ab7822fe263..000000000000 --- a/external/libetonyek/0001-impl.-XML-format-detection.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 28a3b93cc8b0050582c54722df5ac372530ff0a4 Mon Sep 17 00:00:00 2001 -From: David Tardon <dtardon@redhat.com> -Date: Fri, 1 Nov 2013 18:29:40 +0100 -Subject: [PATCH] impl. XML format detection - ---- - src/lib/KEYDocument.cpp | 31 ++++++++++++++++++++++++++++--- - 1 file changed, 28 insertions(+), 3 deletions(-) - -diff --git a/src/lib/KEYDocument.cpp b/src/lib/KEYDocument.cpp -index 8ca33ad..a1a5477 100644 ---- a/src/lib/KEYDocument.cpp -+++ b/src/lib/KEYDocument.cpp -@@ -13,10 +13,12 @@ - #include <libetonyek/KEYDocument.h> - - #include "libetonyek_utils.h" -+#include "libetonyek_xml.h" - #include "KEY1Defaults.h" - #include "KEY1Parser.h" - #include "KEY2Defaults.h" - #include "KEY2Parser.h" -+#include "KEY2Token.h" - #include "KEYContentCollector.h" - #include "KEYDefaults.h" - #include "KEYDictionary.h" -@@ -60,9 +62,32 @@ enum Source - - Version detectVersionFromInput(const WPXInputStreamPtr_t &input) - { -- // TODO: do a real detection -- (void) input; -- return VERSION_KEYNOTE_5; -+ if (input->atEOS()) -+ return VERSION_UNKNOWN; -+ -+ const KEY2Tokenizer tokenizer = KEY2Tokenizer(); -+ KEYXMLReader reader(input.get(), tokenizer); -+ -+ if ((KEY2Token::NS_URI_KEY | KEY2Token::presentation) == getId(reader)) -+ { -+ const std::string version = readOnlyAttribute(reader, KEY2Token::version, KEY2Token::NS_URI_KEY); -+ -+ switch (tokenizer(version.c_str())) -+ { -+ case KEY2Token::VERSION_STR_2 : -+ return VERSION_KEYNOTE_2; -+ case KEY2Token::VERSION_STR_3 : -+ return VERSION_KEYNOTE_3; -+ case KEY2Token::VERSION_STR_4 : -+ return VERSION_KEYNOTE_4; -+ case KEY2Token::VERSION_STR_5 : -+ return VERSION_KEYNOTE_5; -+ } -+ } -+ -+ // TODO: test for v.1 and v.6 -+ -+ return VERSION_UNKNOWN; - } - - Version detectVersion(const WPXInputStreamPtr_t &input, Source &source) --- -1.8.3.1 - diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index 52eee68a49fa..52e6a9598a26 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -11,12 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libetonyek)) $(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,1)) - -$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ - external/libetonyek/0001-fix-windows-build.patch \ - external/libetonyek/libetonyek-doubledelete.patch.0 \ - external/libetonyek/0001-impl.-XML-format-detection.patch \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/libetonyek/libetonyek-doubledelete.patch.0 b/external/libetonyek/libetonyek-doubledelete.patch.0 deleted file mode 100644 index a377c443dabe..000000000000 --- a/external/libetonyek/libetonyek-doubledelete.patch.0 +++ /dev/null @@ -1,18 +0,0 @@ ---- src/lib/KEYXMLReader.cpp -+++ src/lib/KEYXMLReader.cpp -@@ -335,6 +335,7 @@ - catch (...) - { - delete m_impl; -+ throw; - } - } - -@@ -350,6 +351,7 @@ - catch (...) - { - delete m_impl; -+ throw; - } - } - |