diff options
| author | David Tardon <dtardon@redhat.com> | 2015-08-25 12:24:54 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-08-25 14:16:58 +0200 |
| commit | 737e2061cc2364a0f9b3a268cdaebba7773886ce (patch) | |
| tree | 568d2acb8f4b46989ab8affedbd1d0e4f18e57c3 /external | |
| parent | dea1d492db761cc0c0301d3a6d3aa9cd970a8ab9 (diff) | |
upload libwps 0.4.1
Change-Id: I53dc6d358952a046a4c1f03246441742dfa3d685
Diffstat (limited to 'external')
3 files changed, 0 insertions, 63 deletions
diff --git a/external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch b/external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch deleted file mode 100644 index d5a6f5473d40..000000000000 --- a/external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 45a3dd5393e07340d5a63d8a8735789d73a61b17 Mon Sep 17 00:00:00 2001 -From: osnola <alonso@loria.fr> -Date: Mon, 18 May 2015 08:27:59 +0200 -Subject: [PATCH] QuattroPro parser: correct a mistake when reading negative - cell's position - ---- - src/lib/QuattroSpreadsheet.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/QuattroSpreadsheet.cpp b/src/lib/QuattroSpreadsheet.cpp -index cb0f4f5..ce5e20a 100644 ---- a/src/lib/QuattroSpreadsheet.cpp -+++ b/src/lib/QuattroSpreadsheet.cpp -@@ -1668,7 +1668,7 @@ bool QuattroSpreadsheet::readCell - else - { - val &= 0x3FFF; -- if (val & 0x2000) val = val - 0x4000; -+ if (val>0x1000) val = val - 0x2000; - } - if (dim==2) - val += sheetId; --- -2.3.2 (Apple Git-55) - diff --git a/external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch b/external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch deleted file mode 100644 index 01109dc72215..000000000000 --- a/external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 94af34d42129bad72fd7ce50dc6901287509703e Mon Sep 17 00:00:00 2001 -From: David Tardon <dtardon@redhat.com> -Date: Mon, 18 May 2015 18:50:25 +0200 -Subject: [PATCH] error C2065: M_PI : undeclared identifier - ---- - src/lib/libwps_internal.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/lib/libwps_internal.h b/src/lib/libwps_internal.h -index fb9016d..02a87bc 100644 ---- a/src/lib/libwps_internal.h -+++ b/src/lib/libwps_internal.h -@@ -28,6 +28,7 @@ - #include <stdio.h> - #endif - -+#include <cmath> - #include <iostream> - #include <map> - #include <string> -@@ -36,6 +37,10 @@ - #include <librevenge-stream/librevenge-stream.h> - #include <librevenge/librevenge.h> - -+#ifndef M_PI -+#define M_PI 3.14159265358979323846 -+#endif -+ - #if defined(_MSC_VER) || defined(__DJGPP__) - typedef signed char int8_t; - typedef unsigned char uint8_t; --- -2.4.0 - diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk index 9839f06bdb8d..c990efc83e25 100644 --- a/external/libwps/UnpackedTarball_libwps.mk +++ b/external/libwps/UnpackedTarball_libwps.mk @@ -14,8 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1)) $(eval $(call gb_UnpackedTarball_add_patches,libwps,\ - external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch \ - external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch \ $(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \ )) |