[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - download.lst external/libetonyek

[David Tardon]

 download.lst                                                   |    4 -
 external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 |   26 ----------
 external/libetonyek/UnpackedTarball_libetonyek.mk              |    4 -
 3 files changed, 2 insertions(+), 32 deletions(-)

New commits:
commit ccb606beb5b516dc1308b4a8343f941f22acb1e6
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Apr 15 12:24:09 2014 +0200

    upload libetonyek 0.0.4
    
    (cherry picked from commit d24634a6d4046db208428eb999012c03bd9a5c48)
    
    Conflicts:
    	external/libetonyek/UnpackedTarball_libetonyek.mk
    
    Change-Id: I64a35ca0902ba40a4fba3080181147b4facac2ee
    Reviewed-on: https://gerrit.libreoffice.org/9009
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/download.lst b/download.lst
index 6ce3dfc..34df117 100644
--- a/download.lst
+++ b/download.lst
@@ -4,8 +4,8 @@ CDR_MD5SUM := fbcd8619fc6646f41d527c1329102998
 export CDR_TARBALL := libcdr-0.0.15.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
+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 816039b..0000000
--- 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 at 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 d452574..52e6a95 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -11,8 +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 \
-))
-
 # vim: set noet sw=4 ts=4: