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

[Fridrich Strba]

 libcdr/libcdr-0.0.3-warning.patch |   31 -------------------------------
 libcdr/libcdr-0.0.3.patch         |   34 ----------------------------------
 libcdr/libcdr-0.0.4.patch         |   20 ++++++++++++++++++++
 libcdr/makefile.mk                |   18 +++++++++++-------
 ooo.lst.in                        |    2 +-
 5 files changed, 32 insertions(+), 73 deletions(-)

New commits:
commit 1390a2ce01b8458a53abf95df9091c64af422cb4
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Mar 8 13:05:43 2012 +0100

    Upload new libcdr-0.0.4 release

diff --git a/libcdr/libcdr-0.0.3-warning.patch b/libcdr/libcdr-0.0.3-warning.patch
deleted file mode 100644
index b98459c..0000000
--- a/libcdr/libcdr-0.0.3-warning.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- misc/libcdr-0.0.3/src/lib/CDRParser.cpp	2012-02-23 07:42:39.000000000 +0100
-+++ misc/build/libcdr-0.0.3/src/lib/CDRParser.cpp	2012-02-23 13:44:27.970033236 +0100
-@@ -215,7 +215,7 @@
-   else if (fourCC == "mcfg")
-     readMcfg(input);
-   else if (fourCC == "bmp ")
--    readBmp(input, length);
-+    readBmp(input);
-   input->seek(recordStart + length, WPX_SEEK_CUR);
- }
- 
-@@ -770,7 +770,7 @@
-   m_collector->collectPolygonTransform(numAngles, nextPoint, rx, ry, cx, cy);
- }
- 
--void libcdr::CDRParser::readBmp(WPXInputStream *input, unsigned length)
-+void libcdr::CDRParser::readBmp(WPXInputStream *input)
- {
-   unsigned imageId = readU32(input);
-   input->seek(50, WPX_SEEK_CUR);
---- misc/libcdr-0.0.3/src/lib/CDRParser.h	2012-02-09 08:36:51.000000000 +0100
-+++ misc/build/libcdr-0.0.3/src/lib/CDRParser.h	2012-02-23 13:45:50.667974573 +0100
-@@ -70,7 +70,7 @@
-   void readPath(WPXInputStream *input);
-   void readPolygonCoords(WPXInputStream *input);
-   void readPolygonTransform(WPXInputStream *input);
--  void readBmp(WPXInputStream *input, unsigned length);
-+  void readBmp(WPXInputStream *input);
- 
-   WPXInputStream *m_input;
-   CDRCollector *m_collector;
diff --git a/libcdr/libcdr-0.0.3.patch b/libcdr/libcdr-0.0.3.patch
deleted file mode 100644
index 53bc613..0000000
--- a/libcdr/libcdr-0.0.3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- misc/libcdr-0.0.3/src/lib/libcdr_utils.h
-+++ misc/build/libcdr-0.0.3/src/lib/libcdr_utils.h
-@@ -41,17 +41,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
- 
---- misc/libcdr-0.0.3/src/lib/makefile.mk
-+++ misc/build/libcdr-0.0.3/src/lib/makefile.mk
-@@ -28,6 +28,10 @@
- INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
- .ENDIF
- 
-+.IF "$(SYSTEM_ZLIB)" != "YES"
-+INCPRE+=-I$(SOLARVER)$/$(INPATH)$/inc$/external/zlib
-+.ENDIF
-+
- SLOFILES= \
-     $(SLO)$/CDRCollector.obj \
-     $(SLO)$/CDRDocument.obj \
-
diff --git a/libcdr/libcdr-0.0.4.patch b/libcdr/libcdr-0.0.4.patch
new file mode 100644
index 0000000..9e9079d
--- /dev/null
+++ b/libcdr/libcdr-0.0.4.patch
@@ -0,0 +1,20 @@
+--- 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/makefile.mk b/libcdr/makefile.mk
index 18e73ed..30ffd2f 100644
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -27,8 +27,8 @@
 
 PRJ=.
 
-PRJNAME=visio
-TARGET=visio
+PRJNAME=cdr
+TARGET=cdr
 
 # --- Settings -----------------------------------------------------
 
@@ -41,7 +41,7 @@ TARGET=visio
     @echo "Using system libcdr..."
 .ENDIF
 
-# libcdr depends on the libwpd and libwpg
+# libcdr depends on the libwpd, libwpg and lcms2
 .IF "$(SYSTEM_LIBWPD)" == "YES"
 INCPRE+=$(WPD_CFLAGS)
 .ELSE
@@ -53,13 +53,17 @@ INCPRE+=$(WPG_CFLAGS)
 .ELSE
 INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
 .ENDIF
+.IF "$(SYSTEM_LCMS2)" == "YES"
+INCPRE+=$(LCMS2_CFLAGS)
+.ELSE
+INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2
+.ENDIF
 
-TARFILE_NAME=libcdr-0.0.3
-TARFILE_MD5=e5f1ef00a113d2edfd88af616934f293
+TARFILE_NAME=libcdr-0.0.4
+TARFILE_MD5=b99553516040a6f9d5885db56e8ca79f
 
 PATCH_FILES=\
-    $(TARFILE_NAME).patch \
-    $(TARFILE_NAME)-warning.patch
+    $(TARFILE_NAME).patch
 
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src$/lib
diff --git a/ooo.lst.in b/ooo.lst.in
index 81ce0a2..a57cc20 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
-e5f1ef00a113d2edfd88af616934f293-libcdr-0.0.3.tar.bz2
+b99553516040a6f9d5885db56e8ca79f-libcdr-0.0.4.tar.bz2
 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
 @GOOGLE_DOCS_EXTENSION_PACK@
 @FREETYPE_TARBALL@