summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-12-04 10:04:48 +0100
committerFridrich Strba <fridrich@documentfoundation.org>2014-02-10 14:23:47 +0000
commitc470e0982e72879bd7b96830ba8362baede6f87b (patch)
treef5a7242553578fd11bb8fcb84ee3dc8a36b84e57 /external
parent89f0535dbf3409468cbbda078720b11fa08f9759 (diff)
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@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'external')
-rw-r--r--external/libodfgen/0001-use-correct-header-for-std-swap.patch26
-rw-r--r--external/libodfgen/UnpackedTarball_libodfgen.mk6
2 files changed, 0 insertions, 32 deletions
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: