diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-09-01 11:45:28 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-09-01 11:46:00 +0200 |
| commit | 62a25cad6304265689ef25fae9973f101d9fb9b7 (patch) | |
| tree | baf10c5cbaf704db0398b8bb1bd06ec906719ccd /libwpd | |
| parent | f2d97ff3bae3993d6c1cae911fe53710fba19d0f (diff) | |
Uploading libwpd-0.9.3
Diffstat (limited to 'libwpd')
| -rw-r--r-- | libwpd/libwpd-0.9.2.patch | 14 | ||||
| -rw-r--r-- | libwpd/libwpd-mingw.patch | 11 | ||||
| -rw-r--r-- | libwpd/makefile.mk | 6 |
3 files changed, 3 insertions, 28 deletions
diff --git a/libwpd/libwpd-0.9.2.patch b/libwpd/libwpd-0.9.2.patch deleted file mode 100644 index 2fc70745354b..000000000000 --- a/libwpd/libwpd-0.9.2.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- misc/build/libwpd-0.9.2/src/lib/libwpd_internal.cpp -+++ misc/build/libwpd-0.9.2/src/lib/libwpd_internal.cpp -@@ -1229,7 +1229,11 @@ - tempString.sprintf("0.0000"); - else - tempString.sprintf("%.4f", value); -+#ifndef __ANDROID__ - std::string decimalPoint(localeconv()->decimal_point); -+#else -+ std::string decimalPoint("."); -+#endif - if ((decimalPoint.size() == 0) || (decimalPoint == ".")) - return tempString; - std::string stringValue(tempString.cstr()); diff --git a/libwpd/libwpd-mingw.patch b/libwpd/libwpd-mingw.patch deleted file mode 100644 index 60c7fa5515b1..000000000000 --- a/libwpd/libwpd-mingw.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/build/libwpd-0.9.2/src/lib/makefile.mk.orig 2011-08-22 07:21:59.000000000 +0200 -+++ misc/build/libwpd-0.9.2/src/lib/makefile.mk 2011-08-22 07:22:08.000000000 +0200 -@@ -9,7 +9,7 @@ LIBTARGET=NO - - .INCLUDE : settings.mk - --.IF "$(GUI)"=="WNT" -+.IF "$(GUI)$(COM)"=="WNTMSC" - CFLAGS+=-GR - .ENDIF - .IF "$(COM)"=="GCC" diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk index 73ef7a21830d..4a902747f0b3 100644 --- a/libwpd/makefile.mk +++ b/libwpd/makefile.mk @@ -41,10 +41,10 @@ TARGET=wpd @echo "Using system libwpd..." .ENDIF -TARFILE_NAME=libwpd-0.9.2 -TARFILE_MD5=8d265a592619166f29c4672ea54812b7 +TARFILE_NAME=libwpd-0.9.3 +TARFILE_MD5=d6447e3ae278800c58ae40b740c861c0 -PATCH_FILES=$(TARFILE_NAME).patch libwpd-mingw.patch +#PATCH_FILES= BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src$/lib |