[Libreoffice-commits] .: libwps/libwps-0.2.3-build.patch libwps/makefile.mk ooo.lst.in

[Fridrich Strba]

 libwps/libwps-0.2.3-build.patch |   11 -----------
 libwps/makefile.mk              |    7 ++-----
 ooo.lst.in                      |    2 +-
 3 files changed, 3 insertions(+), 17 deletions(-)

New commits:
commit 4585c3953eda4f8d491b362966bc65b4dfce96d6
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Nov 29 10:51:01 2011 +0100

    Uploading new release of libwps

diff --git a/libwps/libwps-0.2.3-build.patch b/libwps/libwps-0.2.3-build.patch
deleted file mode 100644
index 6a83e82..0000000
--- a/libwps/libwps-0.2.3-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/libwps-0.2.3/src/lib/makefile.mk	2011-09-26 15:14:28.000000000 +0200
-+++ misc/build/libwps-0.2.3/src/lib/makefile.mk	2011-10-05 14:49:40.896976226 +0200
-@@ -17,7 +17,7 @@
- .ENDIF
- 
- .IF "$(SYSTEM_LIBWPD)" == "YES"
--INCPRE+=$(LIBWPD_CFLAGS) -I..
-+INCPRE+=$(WPD_CFLAGS) -I..
- .ELSE
- INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
- .ENDIF
diff --git a/libwps/makefile.mk b/libwps/makefile.mk
index 4a7a817..07806eb 100644
--- a/libwps/makefile.mk
+++ b/libwps/makefile.mk
@@ -49,15 +49,12 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
 INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
 .ENDIF
 
-TARFILE_NAME=libwps-0.2.3
-TARFILE_MD5=9717505e864a16173afa681bda4bc910
+TARFILE_NAME=libwps-0.2.4
+TARFILE_MD5=34dd7951abbda99b7a75a09993a37965
 
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src/lib
 
-PATCH_FILES=\
-	libwps-0.2.3-build.patch
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
diff --git a/ooo.lst.in b/ooo.lst.in
index 9274e18..3aa1b2f 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -82,7 +82,7 @@ debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
 71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz
 9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
 d6447e3ae278800c58ae40b740c861c0-libwpd-0.9.3.tar.bz2
-9717505e864a16173afa681bda4bc910-libwps-0.2.3.tar.bz2
+34dd7951abbda99b7a75a09993a37965-libwps-0.2.4.tar.bz2
 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz