diff options
-rw-r--r-- | libwpg/libwpg-0.2.0.patch | 14 | ||||
-rw-r--r-- | libwpg/libwpg-mingw.patch | 11 | ||||
-rw-r--r-- | libwpg/makefile.mk | 7 | ||||
-rw-r--r-- | ooo.lst.in | 2 |
4 files changed, 3 insertions, 31 deletions
diff --git a/libwpg/libwpg-0.2.0.patch b/libwpg/libwpg-0.2.0.patch deleted file mode 100644 index 86567b1e73ae..000000000000 --- a/libwpg/libwpg-0.2.0.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- misc/build/libwpg-0.2.0/src/lib/WPGSVGGenerator.cpp -+++ misc/build/libwpg-0.2.0/src/lib/WPGSVGGenerator.cpp -@@ -30,7 +30,11 @@ - { - std::ostringstream tempStream; - tempStream << value; -+#ifndef __ANDROID__ - std::string decimalPoint(localeconv()->decimal_point); -+#else -+ std::string decimalPoint("."); -+#endif - if ((decimalPoint.size() == 0) || (decimalPoint == ".")) - return tempStream.str(); - std::string stringValue(tempStream.str()); diff --git a/libwpg/libwpg-mingw.patch b/libwpg/libwpg-mingw.patch deleted file mode 100644 index 45b8d688f3fc..000000000000 --- a/libwpg/libwpg-mingw.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/build/libwpg-0.2.0/src/lib/makefile.mk.orig 2011-08-22 07:21:59.000000000 +0200 -+++ misc/build/libwpg-0.2.0/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/libwpg/makefile.mk b/libwpg/makefile.mk index 76021023f59b..ff18fbc3e9cd 100644 --- a/libwpg/makefile.mk +++ b/libwpg/makefile.mk @@ -49,11 +49,8 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream .ENDIF -TARFILE_NAME=libwpg-0.2.0 -TARFILE_MD5=5ba6a61a2f66dfd5fee8cdd4cd262a37 - -PATCH_FILES=$(TARFILE_NAME).patch libwpg-mingw.patch - +TARFILE_NAME=libwpg-0.2.1 +TARFILE_MD5=9d283e02441d8cebdcd1e5d9df227d67 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src/lib diff --git a/ooo.lst.in b/ooo.lst.in index 04f366144b49..4b62e3e65ae1 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -81,7 +81,7 @@ b99fb620b1324b4ce79ee6998b507146-JLanguageTool-1.4.0.tar.bz2 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 +9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2 d6447e3ae278800c58ae40b740c861c0-libwpd-0.9.3.tar.bz2 9717505e864a16173afa681bda4bc910-libwps-0.2.3.tar.bz2 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 |