libcdr/libcdr-0.0.0.patch | 34 ---------------------------------- libcdr/libcdr-0.0.1.patch | 34 ++++++++++++++++++++++++++++++++++ libcdr/makefile.mk | 6 +++--- ooo.lst.in | 2 +- 4 files changed, 38 insertions(+), 38 deletions(-)
New commits: commit 377beefb047e90fdaabb63ca9feb0f8640ec1117 Author: Fridrich Å trba <[email protected]> Date: Tue Jan 31 15:23:02 2012 +0100 Uploading libcdr-0.0.1 that makes the converter actually do something diff --git a/libcdr/libcdr-0.0.0.patch b/libcdr/libcdr-0.0.0.patch deleted file mode 100644 index 3258740..0000000 --- a/libcdr/libcdr-0.0.0.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- misc/libcdr-0.0.0/src/lib/libcdr_utils.h -+++ misc/build/libcdr-0.0.0/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.0/src/lib/makefile.mk -+++ misc/build/libcdr-0.0.0/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)$/CDRDocument.obj \ - $(SLO)$/CDRInternalStream.obj \ - diff --git a/libcdr/libcdr-0.0.1.patch b/libcdr/libcdr-0.0.1.patch new file mode 100644 index 0000000..2f9a6d4 --- /dev/null +++ b/libcdr/libcdr-0.0.1.patch @@ -0,0 +1,34 @@ +--- misc/libcdr-0.0.1/src/lib/libcdr_utils.h ++++ misc/build/libcdr-0.0.1/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.1/src/lib/makefile.mk ++++ misc/build/libcdr-0.0.1/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)$/CDRDocument.obj \ + $(SLO)$/CDRInternalStream.obj \ + diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk index 8da337f..f94f3d0 100644 --- a/libcdr/makefile.mk +++ b/libcdr/makefile.mk @@ -54,11 +54,11 @@ INCPRE+=$(WPG_CFLAGS) INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg .ENDIF -TARFILE_NAME=libcdr-0.0.0 -TARFILE_MD5=cc8eb870d6a324d36575420efd856319 +TARFILE_NAME=libcdr-0.0.1 +TARFILE_MD5=dbf30c0dd92beee07d184738c242f073 PATCH_FILES=\ - libcdr-0.0.0.patch + libcdr-0.0.1.patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src$/lib diff --git a/ooo.lst.in b/ooo.lst.in index 3f26b25..3a86f82 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -90,7 +90,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz -cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2 +dbf30c0dd92beee07d184738c242f073-libcdr-0.0.1.tar.bz2 @GOOGLE_DOCS_EXTENSION_PACK@ @FREETYPE_TARBALL@ @FONTCONFIG_TARBALL@
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
