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

[David Tardon]

 download.lst                                                  |    8 +--
 external/libodfgen/0001-use-correct-header-for-std-swap.patch |   26 ----------
 external/libodfgen/UnpackedTarball_libodfgen.mk               |    6 --
 3 files changed, 4 insertions(+), 36 deletions(-)

New commits:
commit 8f294bba6f6dafce989c146e90251e61e23801dc
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Dec 4 10:02:45 2013 +0100

    upload libetonyek-0.0.3
    
    Change-Id: I626345b34332d7797f1df412545d8d718e9c634c
    (cherry picked from commit a53dafbc9628bb243cee1714bfea59272ae57663)
    Reviewed-on: https://gerrit.libreoffice.org/7970
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/download.lst b/download.lst
index 249b7d7..f59a190 100644
--- a/download.lst
+++ b/download.lst
@@ -4,8 +4,8 @@ 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
-ETONYEK_MD5SUM := 040e0d7ce0cc0eb3a016964699d54a6c
-export ETONYEK_TARBALL := libetonyek-0.0.1.tar.bz2
+ETONYEK_MD5SUM := 9dad826726da4d4ad60084968691f5f4
+export ETONYEK_TARBALL := libetonyek-0.0.3.tar.bz2
 FREEHAND_MD5SUM := 496dd00028afcc19f896b01394769043
 export FREEHAND_TARBALL := libfreehand-0.0.0.tar.bz2
 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
commit c470e0982e72879bd7b96830ba8362baede6f87b
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Dec 4 10:04:48 2013 +0100

    upload libodfgen-0.0.4
    
    Change-Id: I1c0527b01a958fca6e0cb3febb1915762f8a0074
    (cherry picked from commit 79eab004dca8413cf99ea688291083df2d146230)
    Reviewed-on: https://gerrit.libreoffice.org/7972
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/download.lst b/download.lst
index 99e91fd..249b7d7 100644
--- a/download.lst
+++ b/download.lst
@@ -12,8 +12,8 @@ MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
 export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2
 MWAW_MD5SUM := d794625f156a9fb1c53b3f8a8aa13b5e
 export MWAW_TARBALL := libmwaw-0.2.0.tar.bz2
-ODFGEN_MD5SUM := 9cafe7f50a3b2c5ebd2dc9c6c509d2b4
-export ODFGEN_TARBALL := libodfgen-0.0.3.tar.bz2
+ODFGEN_MD5SUM := e5483d1f0b71e64c367c1194b54b0f53
+export ODFGEN_TARBALL := libodfgen-0.0.4.tar.bz2
 VISIO_MD5SUM := 82628333418f101a20cd21f980cf9f40
 export VISIO_TARBALL := libvisio-0.0.31.tar.bz2
 FIREBIRD_MD5SUM := 21154d2004e025c8a3666625b0357bb5
diff --git a/external/libodfgen/0001-use-correct-header-for-std-swap.patch b/external/libodfgen/0001-use-correct-header-for-std-swap.patch
deleted file mode 100644
index 13502d9..0000000
--- a/external/libodfgen/0001-use-correct-header-for-std-swap.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9008d84be1eb0b3def0df39b069a309d54aa73ab Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Wed, 30 Oct 2013 19:30:30 +0100
-Subject: [PATCH] use correct header for std::swap
-
----
- src/GraphicFunctions.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/GraphicFunctions.cxx b/src/GraphicFunctions.cxx
-index d8809f9..606c640 100644
---- a/src/GraphicFunctions.cxx
-+++ b/src/GraphicFunctions.cxx
-@@ -24,8 +24,8 @@
-  * Corel Corporation or Corel Corporation Limited."
-  */
- 
-+#include <algorithm>
- #include <math.h>
--#include <utility>
- 
- #include "GraphicFunctions.hxx"
- 
--- 
-1.8.3.1
-
diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk
index 28e589c..1a7f26c 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libodfgen))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,libodfgen,\
-	external/libodfgen/0001-use-correct-header-for-std-swap.patch \
-))
-
 # vim: set noet sw=4 ts=4: