diff options
| author | David Tardon <dtardon@redhat.com> | 2013-10-22 16:08:01 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-30 20:12:56 +0000 |
| commit | 0aa668e8538535d6ee01185b2746d91cb1d849e4 (patch) | |
| tree | 534826cded14246730880c3397a35a8d9964e251 /external/libodfgen | |
| parent | 08ca3e40b0ac19975459589c9bee8ea77331a6c0 (diff) | |
update libodfgen
Change-Id: I9466c07f18b4befaba662386d69426dd6687d2dd
Reviewed-on: https://gerrit.libreoffice.org/6487
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/libodfgen')
| -rw-r--r-- | external/libodfgen/0001-use-correct-header-for-std-swap.patch | 26 | ||||
| -rw-r--r-- | external/libodfgen/ExternalProject_libodfgen.mk | 1 | ||||
| -rw-r--r-- | external/libodfgen/UnpackedTarball_libodfgen.mk | 6 |
3 files changed, 33 insertions, 0 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 new file mode 100644 index 000000000000..13502d975b5c --- /dev/null +++ b/external/libodfgen/0001-use-correct-header-for-std-swap.patch @@ -0,0 +1,26 @@ +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/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk index 8514282c57b4..eea9ad1aeb5d 100644 --- a/external/libodfgen/ExternalProject_libodfgen.mk +++ b/external/libodfgen/ExternalProject_libodfgen.mk @@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,libodfgen,\ $(eval $(call gb_ExternalProject_use_externals,libodfgen,\ boost_headers \ + etonyek \ wpd \ wpg \ )) diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk index 1a7f26cf9a8c..28e589c5506a 100644 --- a/external/libodfgen/UnpackedTarball_libodfgen.mk +++ b/external/libodfgen/UnpackedTarball_libodfgen.mk @@ -11,4 +11,10 @@ $(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: |