diff options
| author | David Tardon <dtardon@redhat.com> | 2015-08-31 12:22:32 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-08-31 12:23:22 +0200 |
| commit | 34c8903fb1ae9e38fbddddf840298b707e66c7f0 (patch) | |
| tree | e2b3d86c395c0418041cd5da3715f21945805c25 /external | |
| parent | ad6d83defb33c414885ce6d4bfa85571d463f3c3 (diff) | |
a blind attempt to fix tinderbox failure
Change-Id: I3b33529a37174682e68be897a77b2736133b6ac6
Diffstat (limited to 'external')
| -rw-r--r-- | external/libwps/0001-error-atoi-was-not-declared-in-this-scope.patch | 33 | ||||
| -rw-r--r-- | external/libwps/UnpackedTarball_libwps.mk | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/external/libwps/0001-error-atoi-was-not-declared-in-this-scope.patch b/external/libwps/0001-error-atoi-was-not-declared-in-this-scope.patch new file mode 100644 index 000000000000..0ebf066cb936 --- /dev/null +++ b/external/libwps/0001-error-atoi-was-not-declared-in-this-scope.patch @@ -0,0 +1,33 @@ +From de94f4f83973df18a0cea257656c9cdc0fdd214b Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Mon, 31 Aug 2015 12:19:53 +0200 +Subject: [PATCH] error: 'atoi' was not declared in this scope + +--- + src/lib/WPSOLEParser.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/lib/WPSOLEParser.cpp b/src/lib/WPSOLEParser.cpp +index 9a57341..ac564b4 100644 +--- a/src/lib/WPSOLEParser.cpp ++++ b/src/lib/WPSOLEParser.cpp +@@ -64,6 +64,7 @@ + * ------------------------------------------------------------ + */ + ++#include <cstdlib> + #include <cstring> + #include <map> + #include <sstream> +@@ -296,7 +297,7 @@ bool WPSOLEParser::parse(RVNGInputStreamPtr file) + std::string::size_type idP = pos-1; + while (idP >=1 && dir[idP-1] >= '0' && dir[idP-1] <= '9') + idP--; +- int val = atoi(dir.substr(idP, idP-pos).c_str()); ++ int val = std::atoi(dir.substr(idP, idP-pos).c_str()); + if (id[0] == -1) id[0] = val; + else + { +-- +2.4.3 + diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk index 5fad6b6ba620..ab31b8da87d4 100644 --- a/external/libwps/UnpackedTarball_libwps.mk +++ b/external/libwps/UnpackedTarball_libwps.mk @@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1)) $(eval $(call gb_UnpackedTarball_add_patches,libwps,\ external/libwps/0001-add-missing-include.patch \ + external/libwps/0001-error-atoi-was-not-declared-in-this-scope.patch \ $(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \ )) |