[Libreoffice-commits] .: 2 commits - libcdr/libcdr-0.0.3.patch libcdr/libcdr-0.0.3-warning.patch libcdr/libcdr-0.0.4.patch libcdr/makefile.mk scp2/source
Fridrich Strba
fridrich at kemper.freedesktop.org
Fri Mar 9 04:56:39 PST 2012
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 +++++++++++-------
scp2/source/ooo/makefile.mk | 4 ++++
5 files changed, 35 insertions(+), 72 deletions(-)
New commits:
commit 8b0be97f13ea550fc5dae7a7b6a76ddb30218278
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Mar 9 13:56:18 2012 +0100
Define SYSTEM_LCMS2 in scp2 when appropriate
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
index b671288..a78c669 100644
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -60,7 +60,7 @@ INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2
.ENDIF
TARFILE_NAME=libcdr-0.0.4
-TARFILE_MD5=6b39b6b799b0fde2b6045a9acede6d0a
+TARFILE_MD5=b94897199a84055b57fa00af46b059ec
PATCH_FILES=\
$(TARFILE_NAME).patch
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index e7e57db..0987f6f 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -113,6 +113,10 @@ SCPDEFS+=-DSYSTEM_EXPAT
SCPDEFS+=-DSYSTEM_CAIRO
.ENDIF
+.IF "$(SYSTEM_LCMS2)" == "YES"
+SCPDEFS+=-DSYSTEM_LCMS2
+.ENDIF
+
.IF "$(SYSTEM_LIBXML)" == "YES"
SCPDEFS+=-DSYSTEM_LIBXML
.ENDIF
commit 4147de18731c7637ab5654797c21b39069695ff5
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..b671288 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=6b39b6b799b0fde2b6045a9acede6d0a
PATCH_FILES=\
- $(TARFILE_NAME).patch \
- $(TARFILE_NAME)-warning.patch
+ $(TARFILE_NAME).patch
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
More information about the Libreoffice-commits
mailing list