mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upload new libcdr-0.0.4 release

Browse Source
This commit is contained in:
Fridrich Štrba
2012-03-08 13:05:43 +01:00
parent 24b449b7fc
commit 1390a2ce01
5 changed files with 32 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libcdr/libcdr-0.0.3-warning.patch
View File

@@ -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;

34
libcdr/libcdr-0.0.3.patch
View File

@@ -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 \

20
libcdr/libcdr-0.0.4.patch Normal file
View File

@@ -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

18
libcdr/makefile.mk
View File

@@ -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

2
ooo.lst.in
View File

@@ -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@