SOURCES: chmlib-LIBDIR.patch, chmlib-morearchs.patch - update to 0.36

[djurban]

Author: djurban                      Date: Mon Sep 19 12:30:47 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update to 0.36

---- Files affected:
SOURCES:
   chmlib-LIBDIR.patch (1.3 -> 1.4) , chmlib-morearchs.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/chmlib-LIBDIR.patch
diff -u SOURCES/chmlib-LIBDIR.patch:1.3 SOURCES/chmlib-LIBDIR.patch:1.4
--- SOURCES/chmlib-LIBDIR.patch:1.3	Mon Jul  5 22:21:33 2004
+++ SOURCES/chmlib-LIBDIR.patch	Mon Sep 19 14:30:42 2005
@@ -1,5 +1,5 @@
---- chmlib-0.35/Makefile.in.orig	2004-06-29 02:26:20.000000000 +0200
-+++ chmlib-0.35/Makefile.in	2004-07-05 22:16:57.963115624 +0200
+--- chmlib-0.36/Makefile.in.orig	2005-09-09 14:38:57.000000000 +0200
++++ chmlib-0.36/Makefile.in	2005-09-19 14:29:26.000000000 +0200
 @@ -11,6 +11,7 @@
  CFLAGS=@CFLAGS@ @CHM_MT@ @CHM_USE_PREAD@ @CHM_USE_IO64@ @DMALLOC_DISABLE@ 
  LDFLAGS=@LDFLAGS@
@@ -8,7 +8,7 @@
  CC=@CC@
  top_builddir=@top_builddir@
  ifeq ($(top_builddir),)
-@@ -27,28 +28,28 @@
+@@ -28,29 +29,29 @@
  	${LIBTOOL} --mode=compile ${CC} -c -o $@ $^ ${CFLAGS}
  
  src/libchm.la: src/chm_lib.lo src/lzx.lo
@@ -17,30 +17,31 @@
  
  install: src/libchm.la
  	chmod a+r src/libchm.la
+ 	mkdir -p ${INSTALLPREFIX}
 -	${LIBTOOL} --mode=install cp src/libchm.la ${INSTALLPREFIX}/lib
 +	${LIBTOOL} --mode=install cp src/libchm.la ${LIBDIR}
- 	cp src/chm_lib.h ${INSTALLPREFIX}/include
+ 	cp $(srcdir)/src/chm_lib.h ${INSTALLPREFIX}/include
  
  clean:
  	rm -fr src/libchm.la src/*.o src/*.lo .libs src/.libs src/${EXAMPLES}
  
- test_chmLib: src/test_chmLib.c
+ test_chmLib: $(srcdir)/src/test_chmLib.c
 -	${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
 +	${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS}
  
- enum_chmLib: src/enum_chmLib.c
+ enum_chmLib: $(srcdir)/src/enum_chmLib.c
 -	${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
 +	${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS}
  
- enumdir_chmLib: src/enumdir_chmLib.c
+ enumdir_chmLib: $(srcdir)/src/enumdir_chmLib.c
 -	${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
 +	${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS}
  
- extract_chmLib: src/extract_chmLib.c
+ extract_chmLib: $(srcdir)/src/extract_chmLib.c
 -	${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
 +	${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS}
  
- chm_http: src/chm_http.c
+ chm_http: $(srcdir)/src/chm_http.c
 -	${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm -lpthread ${CFLAGS}
 +	${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm -lpthread ${CFLAGS}
  

================================================================
Index: SOURCES/chmlib-morearchs.patch
diff -u SOURCES/chmlib-morearchs.patch:1.2 SOURCES/chmlib-morearchs.patch:1.3
--- SOURCES/chmlib-morearchs.patch:1.2	Mon Jul  5 15:32:10 2004
+++ SOURCES/chmlib-morearchs.patch	Mon Sep 19 14:30:42 2005
@@ -1,7 +1,6 @@
-diff -urN chmlib.orig/src/chm_lib.c chmlib/src/chm_lib.c
---- chmlib.orig/src/chm_lib.c	2004-05-03 23:29:04.000000000 +0200
-+++ chmlib/src/chm_lib.c	2004-07-05 14:38:31.000000000 +0200
-@@ -157,14 +157,15 @@
+--- chmlib-0.36/src/chm_lib.c.orig	2005-09-09 14:42:27.000000000 +0200
++++ chmlib-0.36/src/chm_lib.c	2005-09-19 14:26:33.000000000 +0200
+@@ -160,14 +160,15 @@
  /* Sparc        */
  /* MIPS         */
  /* PPC          */
@@ -21,24 +20,6 @@
 +typedef uint32_t                UInt32;
 +typedef int64_t                 Int64;
 +typedef uint64_t                UInt64;
- #else
  
- /* yielding an error is preferable to yielding incorrect behavior */
-@@ -1123,7 +1124,7 @@
-      *      that is provided for us.
-      */
-     struct chmPmglHeader header;
--    UInt32 hremain;
-+    unsigned long hremain;
-     UChar *end;
-     UChar *cur;
-     UChar *temp;
-@@ -1165,7 +1166,7 @@
-      *      that is provided for us
-      */
-     struct chmPmgiHeader header;
--    UInt32 hremain;
-+    unsigned long hremain;
-     int page=-1;
-     UChar *end;
-     UChar *cur;
+ /* x86-64 */
+ /* Note that these may be appropriate for other 64-bit machines. */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/chmlib-LIBDIR.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SOURCES/chmlib-morearchs.patch?r1=1.2&r2=1.3&f=u