diff options
| author | David Tardon <dtardon@redhat.com> | 2013-12-04 10:04:48 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-12-04 10:04:48 +0100 |
| commit | 79eab004dca8413cf99ea688291083df2d146230 (patch) | |
| tree | bcb8ed7351032e52784ba85c4f5e89fc596d5fbb | |
| parent | 5ae5901ccb608ed34ae1ed578aa66b3be33cbae4 (diff) | |
upload libodfgen-0.0.4
Change-Id: I1c0527b01a958fca6e0cb3febb1915762f8a0074
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libodfgen/0001-use-correct-header-for-std-swap.patch | 26 | ||||
| -rw-r--r-- | external/libodfgen/UnpackedTarball_libodfgen.mk | 6 |
3 files changed, 2 insertions, 34 deletions
diff --git a/download.lst b/download.lst index 21091e50b238..03fe79939ba1 100644 --- a/download.lst +++ b/download.lst @@ -10,8 +10,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 13502d975b5c..000000000000 --- 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@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 28e589c5506a..1a7f26cf9a8c 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: |