From 71530f9cb01ade01505f4a5418fed28af76c8429 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Fri, 10 Feb 2012 10:24:05 +0100 Subject: Uploading a new shiny libcdr-0.0.2 --- libcdr/libcdr-0.0.1.patch | 34 ---------------------------------- libcdr/libcdr-0.0.2.patch | 34 ++++++++++++++++++++++++++++++++++ libcdr/makefile.mk | 6 +++--- 3 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 libcdr/libcdr-0.0.1.patch create mode 100644 libcdr/libcdr-0.0.2.patch (limited to 'libcdr') diff --git a/libcdr/libcdr-0.0.1.patch b/libcdr/libcdr-0.0.1.patch deleted file mode 100644 index 2f9a6d48acb1..000000000000 --- a/libcdr/libcdr-0.0.1.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- 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 --#endif -- --#ifdef HAVE_STDINT_H - #include --#endif -- --#ifdef HAVE_INTTYPES_H - #include --#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/libcdr-0.0.2.patch b/libcdr/libcdr-0.0.2.patch new file mode 100644 index 000000000000..7760ddf057c1 --- /dev/null +++ b/libcdr/libcdr-0.0.2.patch @@ -0,0 +1,34 @@ +--- misc/libcdr-0.0.2/src/lib/libcdr_utils.h ++++ misc/build/libcdr-0.0.2/src/lib/libcdr_utils.h +@@ -41,17 +41,8 @@ + + #else + +-#ifdef HAVE_CONFIG_H +-#include +-#endif +- +-#ifdef HAVE_STDINT_H + #include +-#endif +- +-#ifdef HAVE_INTTYPES_H + #include +-#endif + + #endif + +--- misc/libcdr-0.0.2/src/lib/makefile.mk ++++ misc/build/libcdr-0.0.2/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 f94f3d000654..47122766df10 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.1 -TARFILE_MD5=dbf30c0dd92beee07d184738c242f073 +TARFILE_NAME=libcdr-0.0.2 +TARFILE_MD5=bb94fe29a21444369307f19015d48b82 PATCH_FILES=\ - libcdr-0.0.1.patch + libcdr-0.0.2.patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src$/lib -- cgit