[Libreoffice-commits] .: libcdr/libcdr-0.0.4.patch libcdr/libcdr-0.0.5.patch libcdr/makefile.mk libcdr/prj ooo.lst.in

[Fridrich Strba]

 libcdr/libcdr-0.0.4.patch |   20 --------------------
 libcdr/libcdr-0.0.5.patch |   20 ++++++++++++++++++++
 libcdr/makefile.mk        |    4 ++--
 libcdr/prj/d.lst          |    1 +
 ooo.lst.in                |    2 +-
 5 files changed, 24 insertions(+), 23 deletions(-)

New commits:
commit 06427dfad309bec7aad2c60ed7c21ae9c814b403
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Mar 16 15:33:21 2012 +0100

    Uploading libcdr-0.0.5

diff --git a/libcdr/libcdr-0.0.4.patch b/libcdr/libcdr-0.0.4.patch
deleted file mode 100644
index 9e9079d..0000000
--- a/libcdr/libcdr-0.0.4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/libcdr-0.0.4/src/lib/libcdr_utils.h	2012-03-07 13:51:21.000000000 +0100
-+++ misc/build/libcdr-0.0.4/src/lib/libcdr_utils.h	2012-03-08 12:46:38.194534604 +0100
-@@ -54,17 +54,8 @@
- 
- #else
- 
--#ifdef HAVE_CONFIG_H
--#include <config.h>
--#endif
--
--#ifdef HAVE_STDINT_H
- #include <stdint.h>
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
--#endif
- 
- #endif
- 
diff --git a/libcdr/libcdr-0.0.5.patch b/libcdr/libcdr-0.0.5.patch
new file mode 100644
index 0000000..b622bd6
--- /dev/null
+++ b/libcdr/libcdr-0.0.5.patch
@@ -0,0 +1,20 @@
+--- misc/libcdr-0.0.5/src/lib/libcdr_utils.h	2012-03-07 13:51:21.000000000 +0100
++++ misc/build/libcdr-0.0.5/src/lib/libcdr_utils.h	2012-03-08 12:46:38.194534604 +0100
+@@ -54,17 +54,8 @@
+ 
+ #else
+ 
+-#ifdef HAVE_CONFIG_H
+-#include <config.h>
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include <stdint.h>
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+-#endif
+ 
+ #endif
+ 
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
index 30ffd2f..475fb2c 100644
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -59,8 +59,8 @@ INCPRE+=$(LCMS2_CFLAGS)
 INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2
 .ENDIF
 
-TARFILE_NAME=libcdr-0.0.4
-TARFILE_MD5=b99553516040a6f9d5885db56e8ca79f
+TARFILE_NAME=libcdr-0.0.5
+TARFILE_MD5=4def42cfe3527ed7c515bea8cc3f23b8
 
 PATCH_FILES=\
     $(TARFILE_NAME).patch
diff --git a/libcdr/prj/d.lst b/libcdr/prj/d.lst
index f74aa63..e3ec3bd 100644
--- a/libcdr/prj/d.lst
+++ b/libcdr/prj/d.lst
@@ -2,5 +2,6 @@ mkdir: %_DEST%\inc\libcdr
 ..\%__SRC%\misc\build\libcdr*\src\lib\libcdr.h %_DEST%\inc\libcdr
 ..\%__SRC%\misc\build\libcdr*\src\lib\CDRDocument.h %_DEST%\inc\libcdr\
 ..\%__SRC%\misc\build\libcdr*\src\lib\CDRStringVector.h %_DEST%\inc\libcdr\
+..\%__SRC%\misc\build\libcdr*\src\lib\CMXDocument.h %_DEST%\inc\libcdr\
 ..\%__SRC%\lib\*.a %_DEST%\lib\*.a
 ..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/ooo.lst.in b/ooo.lst.in
index a57cc20..5de0e5a 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -90,7 +90,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2
 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
-b99553516040a6f9d5885db56e8ca79f-libcdr-0.0.4.tar.bz2
+4def42cfe3527ed7c515bea8cc3f23b8-libcdr-0.0.5.tar.bz2
 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
 @GOOGLE_DOCS_EXTENSION_PACK@
 @FREETYPE_TARBALL@