diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libetonyek/0001-fix-windows-build.patch | 30 | ||||
| -rw-r--r-- | external/libetonyek/0001-impl.-XML-format-detection.patch | 65 | ||||
| -rw-r--r-- | external/libetonyek/UnpackedTarball_libetonyek.mk | 8 | ||||
| -rw-r--r-- | external/libetonyek/libetonyek-doubledelete.patch.0 | 18 |
5 files changed, 2 insertions, 123 deletions
diff --git a/download.lst b/download.lst index 28d92aae6542..00431f0bf914 100644 --- a/download.lst +++ b/download.lst @@ -1,7 +1,7 @@ CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112 export CDR_TARBALL := libcdr-0.0.14.tar.bz2 -ETONYEK_MD5SUM := f1753366de8bd37c6fb033a7771fa616 -export ETONYEK_TARBALL := libetonyek-0.0.0.tar.bz2 +ETONYEK_MD5SUM := 040e0d7ce0cc0eb3a016964699d54a6c +export ETONYEK_TARBALL := libetonyek-0.0.1.tar.bz2 FREEHAND_MD5SUM := 496dd00028afcc19f896b01394769043 export FREEHAND_TARBALL := libfreehand-0.0.0.tar.bz2 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e 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; - } - } - |