diff options
| -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 | ||||
| -rw-r--r-- | ooo.lst.in | 2 |
4 files changed, 4 insertions, 29 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 diff --git a/ooo.lst.in b/ooo.lst.in index 9d05ae94c9e6..ce4df26cfa64 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -82,7 +82,7 @@ debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz 71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz 5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2 -8d265a592619166f29c4672ea54812b7-libwpd-0.9.2.tar.bz2 +d6447e3ae278800c58ae40b740c861c0-libwpd-0.9.3.tar.bz2 29721a16f25967d59969d5f0ae485b4a-libwps-0.2.2.tar.bz2 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 |