diff options
Diffstat (limited to 'dev-tcltk/tkimg/files/tkimg-1.4.7-zlib.patch')
-rw-r--r-- | dev-tcltk/tkimg/files/tkimg-1.4.7-zlib.patch | 90 |
1 files changed, 90 insertions, 0 deletions
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.7-zlib.patch b/dev-tcltk/tkimg/files/tkimg-1.4.7-zlib.patch new file mode 100644 index 000000000000..3d4845835ff7 --- /dev/null +++ b/dev-tcltk/tkimg/files/tkimg-1.4.7-zlib.patch @@ -0,0 +1,90 @@ + zlib/Makefile.in | 2 +- + zlib/configure.in | 5 -- + zlib/zlibtcl.decls | 2 +- + zlib/zlibtclDecls.h | 10 +-- + 5 files changed, 8 insertions(+), 184 deletions(-) + +diff --git a/zlib/Makefile.in b/zlib/Makefile.in +index e70ec66..c8bf0f3 100644 +--- a/zlib/Makefile.in ++++ b/zlib/Makefile.in +@@ -107,7 +107,7 @@ RANLIB = @RANLIB@ + RANLIB_STUB = @RANLIB_STUB@ + SHLIB_CFLAGS = @SHLIB_CFLAGS@ + SHLIB_LD = @SHLIB_LD@ +-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ ++SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -lz + STLIB_LD = @STLIB_LD@ + TCL_DEFS = @TCL_DEFS@ + TCL_BIN_DIR = @TCL_BIN_DIR@ +diff --git a/zlib/configure.in b/zlib/configure.in +index 6b1e310..f51befa 100644 +--- a/zlib/configure.in ++++ b/zlib/configure.in +@@ -51,11 +51,6 @@ TEA_SETUP_COMPILER + #----------------------------------------------------------------------- + + TEA_ADD_SOURCES([zlibtcl.c zlibtclStubInit.c]) +-TEA_ADD_SOURCES([../compat/zlib/adler32.c ../compat/zlib/compress.c ../compat/zlib/crc32.c]) +-TEA_ADD_SOURCES([../compat/zlib/deflate.c ../compat/zlib/gzclose.c ../compat/zlib/gzlib.c]) +-TEA_ADD_SOURCES([../compat/zlib/gzread.c ../compat/zlib/gzwrite.c ../compat/zlib/infback.c]) +-TEA_ADD_SOURCES([../compat/zlib/inffast.c ../compat/zlib/inflate.c ../compat/zlib/inftrees.c]) +-TEA_ADD_SOURCES([../compat/zlib/trees.c ../compat/zlib/uncompr.c ../compat/zlib/zutil.c]) + + TEA_ADD_HEADERS([zlibtcl.h zlibtclDecls.h]) + +diff --git a/zlib/zlibtcl.decls b/zlib/zlibtcl.decls +index c4bf22e..b9fb804 100644 +--- a/zlib/zlibtcl.decls ++++ b/zlib/zlibtcl.decls +@@ -138,7 +138,7 @@ declare 38 { + int gzputc(gzFile file, int c) + } + declare 39 { +- int gzgetc(gzFile file) ++ int gzgetc_(gzFile file) + } + declare 40 { + int gzflush(gzFile file, int flush) +diff --git a/zlib/zlibtclDecls.h b/zlib/zlibtclDecls.h +index 2f7ecb2..6393821 100644 +--- a/zlib/zlibtclDecls.h ++++ b/zlib/zlibtclDecls.h +@@ -28,7 +28,7 @@ + EXTERN int Zlibtcl_Init(Tcl_Interp *interp); + EXTERN int Zlibtcl_SafeInit(Tcl_Interp *interp); + +-#include "../compat/zlib/zlib.h" ++#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/zlib.h" + + /* !BEGIN!: Do not edit below this line. */ + +@@ -120,7 +120,7 @@ ZEXTERN char * gzgets(gzFile file, char *buf, int len); + /* 38 */ + ZEXTERN int gzputc(gzFile file, int c); + /* 39 */ +-ZEXTERN int gzgetc(gzFile file); ++ZEXTERN int gzgetc_(gzFile file); + /* 40 */ + ZEXTERN int gzflush(gzFile file, int flush); + /* 41 */ +@@ -179,7 +179,7 @@ typedef struct ZlibtclStubs { + int (*gzputsPtr) (gzFile file, const char *s); /* 36 */ + char * (*gzgetsPtr) (gzFile file, char *buf, int len); /* 37 */ + int (*gzputcPtr) (gzFile file, int c); /* 38 */ +- int (*gzgetcPtr) (gzFile file); /* 39 */ ++ int (*gzgetc_Ptr) (gzFile file); /* 39 */ + int (*gzflushPtr) (gzFile file, int flush); /* 40 */ + z_off_t (*gzseekPtr) (gzFile file, z_off_t offset, int whence); /* 41 */ + int (*gzrewindPtr) (gzFile file); /* 42 */ +@@ -273,8 +273,8 @@ ZEXTERN const ZlibtclStubs *zlibtclStubsPtr; + (zlibtclStubsPtr->gzgetsPtr) /* 37 */ + #define gzputc \ + (zlibtclStubsPtr->gzputcPtr) /* 38 */ +-#define gzgetc \ +- (zlibtclStubsPtr->gzgetcPtr) /* 39 */ ++#define gzgetc_ \ ++ (zlibtclStubsPtr->gzgetc_Ptr) /* 39 */ + #define gzflush \ + (zlibtclStubsPtr->gzflushPtr) /* 40 */ + #define gzseek \ |