diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 | 26 | ||||
| -rw-r--r-- | external/libetonyek/UnpackedTarball_libetonyek.mk | 5 | ||||
| -rw-r--r-- | external/libetonyek/libetonyek-0.0.3-lexical_cast.patch | 56 |
4 files changed, 2 insertions, 89 deletions
diff --git a/download.lst b/download.lst index 12cf0086e2a6..40f9ff2583ce 100644 --- a/download.lst +++ b/download.lst @@ -10,8 +10,8 @@ COINMP_MD5SUM := 1cce53bf4b40ae29790d2c5c9f8b1129 export COINMP_TARBALL := CoinMP-1.7.6.tgz 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 +ETONYEK_MD5SUM := 3c50bc60394d1f2675fbf9bd22581363 +export ETONYEK_TARBALL := libetonyek-0.0.4.tar.bz2 FREEHAND_MD5SUM := 496dd00028afcc19f896b01394769043 export FREEHAND_TARBALL := libfreehand-0.0.0.tar.bz2 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e diff --git a/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 b/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 deleted file mode 100644 index 816039b827c8..000000000000 --- a/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 +++ /dev/null @@ -1,26 +0,0 @@ -From c2065764ae0826409f1dd683e52b7ca65f092972 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch> -Date: Fri, 6 Dec 2013 18:35:28 +0100 -Subject: [PATCH] Comma at the end of emum list - -Change-Id: I1370488e5bf682e23a923f37c09e76081aee7493 ---- - src/lib/KEYEnum.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/KEYEnum.h b/src/lib/KEYEnum.h -index f0e027f..9e5e61f 100644 ---- a/src/lib/KEYEnum.h -+++ b/src/lib/KEYEnum.h -@@ -33,7 +33,7 @@ enum KEYCapitalization - KEY_CAPITALIZATION_NONE, - KEY_CAPITALIZATION_ALL_CAPS, - KEY_CAPITALIZATION_SMALL_CAPS, -- KEY_CAPITALIZATION_TITLE, -+ KEY_CAPITALIZATION_TITLE - }; - - } --- -1.8.4.2 - diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index 0db95962d37b..52e6a9598a26 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -11,9 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libetonyek)) $(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ - external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 \ - external/libetonyek/libetonyek-0.0.3-lexical_cast.patch \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/libetonyek/libetonyek-0.0.3-lexical_cast.patch b/external/libetonyek/libetonyek-0.0.3-lexical_cast.patch deleted file mode 100644 index fbd8bf6c75ac..000000000000 --- a/external/libetonyek/libetonyek-0.0.3-lexical_cast.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/libetonyek-0.0.3/src/lib/KEY2ParserUtils.cpp 2013-12-01 21:44:51.000000000 +0100 -+++ b/libetonyek-0.0.3/src/lib/KEY2ParserUtils.cpp 2013-12-15 06:53:07.474721349 +0100 -@@ -125,7 +125,7 @@ - return KEYSize(size.second, size.first); - } - --bool KEY2ParserUtils::bool_cast(const char *const value) -+bool KEY2ParserUtils::bool_cast(const char *value) - { - KEY2Tokenizer tok; - switch (tok(value)) -@@ -142,6 +142,16 @@ - return false; - } - -+double KEY2ParserUtils::double_cast(const char *value) -+{ -+ return lexical_cast<double, const char *>(value); -+} -+ -+int KEY2ParserUtils::int_cast(const char *value) -+{ -+ return lexical_cast<int, const char *>(value); -+} -+ - double KEY2ParserUtils::deg2rad(double value) - { - // normalize range ---- a/libetonyek-0.0.3/src/lib/KEY2ParserUtils.h 2013-10-30 22:04:38.000000000 +0100 -+++ b/libetonyek-0.0.3/src/lib/KEY2ParserUtils.h 2013-12-15 06:50:40.296884951 +0100 -@@ -81,6 +81,8 @@ - * @returns the boolean value of the string - */ - static bool bool_cast(const char *value); -+ static double double_cast(const char *value); -+ static int int_cast(const char *value); - - static double deg2rad(double value); - ---- a/libetonyek-0.0.3/src/lib/KEY2StyleParser.cpp 2013-12-06 10:36:13.000000000 +0100 -+++ b/libetonyek-0.0.3/src/lib/KEY2StyleParser.cpp 2013-12-15 06:53:45.353451061 +0100 -@@ -62,12 +62,12 @@ - - optional<double> readDouble(const KEYXMLReader &reader) - { -- return readNumber<double>(reader, KEY2Token::f, &lexical_cast<double, const char *>); -+ return readNumber<double>(reader, KEY2Token::f, &KEY2ParserUtils::double_cast); - } - - optional<int> readInt(const KEYXMLReader &reader) - { -- return readNumber<int>(reader, KEY2Token::i, &lexical_cast<int, const char *>); -+ return readNumber<int>(reader, KEY2Token::i, &KEY2ParserUtils::double_cast); - } - - optional<KEYColor> readColor(const KEYXMLReader &reader) |