[Libreoffice-commits] .: Branch 'libreoffice-3-6' - libcdr/libcdr-0.0.8-msc.patch libcdr/makefile.mk libcdr/README ooo.lst.in

[Libreoffice Gerrit user]

 libcdr/README                 |    2 +-
 libcdr/libcdr-0.0.8-msc.patch |   10 ----------
 libcdr/makefile.mk            |    6 ++----
 ooo.lst.in                    |    2 +-
 4 files changed, 4 insertions(+), 16 deletions(-)

New commits:
commit 1e7340538bfe4374df48e914e47ad5cddf1e309a
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Oct 5 15:41:15 2012 +0200

    New release libcdr 0.0.9, fixes fdo#55522 and partly fdo#54785
    
    Change-Id: I85516bcb97cc066fb25bb74ef253ff6ae6942d10
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/libcdr/README b/libcdr/README
index d3ba94d..9aa5ada 100644
--- a/libcdr/README
+++ b/libcdr/README
@@ -1,3 +1,3 @@
 Library parsing the Corel cdr documents.
 
-I couldn't find an upstream for this library - although I did only try a primitive Google search.
+http://wiki.freedesktop.org/wiki/Software/libcdr
diff --git a/libcdr/libcdr-0.0.8-msc.patch b/libcdr/libcdr-0.0.8-msc.patch
deleted file mode 100644
index 6a44e7d..0000000
--- a/libcdr/libcdr-0.0.8-msc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/libcdr-0.0.8/src/lib/libcdr_utils.h	2012-06-06 13:42:03.000000000 +0200
-+++ misc/build/libcdr-0.0.8/src/lib/libcdr_utils.h	2012-06-11 15:09:43.305289500 +0200
-@@ -50,6 +50,7 @@
- typedef unsigned char uint8_t;
- typedef unsigned short uint16_t;
- typedef unsigned uint32_t;
-+typedef short int16_t;
- typedef int int32_t;
- typedef unsigned __int64 uint64_t;
- 
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
index 771ac46..0a8df79 100755
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -59,10 +59,8 @@ INCPRE+=$(LCMS2_CFLAGS)
 INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2
 .ENDIF
 
-TARFILE_NAME=libcdr-0.0.8
-TARFILE_MD5=ce5a1def34578b75959ac31210f031f6
-
-PATCH_FILES = libcdr-0.0.8-msc.patch
+TARFILE_NAME=libcdr-0.0.9
+TARFILE_MD5=3c0037fb07dea2f0bbae8386fa7c6a9a
 
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src$/lib
diff --git a/ooo.lst.in b/ooo.lst.in
index f4d8db9..02d14b0 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -90,7 +90,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
 0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
-ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
+3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2
 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
 @GOOGLE_DOCS_EXTENSION_PACK@
 @FREETYPE_TARBALL@