diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-10-04 16:25:45 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-10-04 16:45:59 +0200 |
| commit | f4e71b5aa2b40aa76946a8f93c1d20a0a87ec439 (patch) | |
| tree | 7d0ca4e2b12a67afbf4c83a499247b05ad88d0b2 /libwpg | |
| parent | 73ccf2254adaa6f78a41f625df20d56c6cdc8d02 (diff) | |
Uploading release binary of libwpg 0.2.1
Diffstat (limited to 'libwpg')
| -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 |
3 files changed, 2 insertions, 30 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 |