code patch

tkimg-1.5_pre324-libpng15.patch (text/plain), 2.69 KB, created by Ian Stakenvicius (RETIRED) on 2011-10-08 12:38:05 UTC

--- tools/genStubs.tcl	2010-07-06 05:04:10.000000000 -0400
+++ tools/genStubs.tcl.new	2011-10-07 22:31:11.000000000 -0400
@@ -1019,7 +1019,9 @@
 	append text "#define ${CAPName}_STUBS_REVISION $revision\n"
     }
 
+    append text "\n\n\n#ifndef DONOTUSE_${capName}TCL_${capName}_DECLARATIONS\n"
     emitDeclarations $name text
+    append text "#endif\n"
 
     if {[info exists hooks($name)]} {
 	append text "\ntypedef struct ${capName}StubHooks {\n"
--- libpng/Makefile.in	2011-10-07 22:37:28.000000000 -0400
+++ libpng/Makefile.in.new	2011-10-07 22:37:50.000000000 -0400
@@ -154,7 +154,7 @@
 CPPFLAGS	= @CPPFLAGS@
 LIBS		= @PKG_LIBS@ @LIBS@
 AR		= @AR@
-CFLAGS		= @CFLAGS@ -DPNG_IMPEXP=MODULE_SCOPE -DPNG_EXTERN=MODULE_SCOPE
+CFLAGS		= @CFLAGS@ -DPNG_EXTERN=MODULE_SCOPE
 COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 
 #========================================================================
@@ -169,7 +169,7 @@
 # for the BINARIES that you specified above have already been done.
 #========================================================================
 
-all: binaries libraries doc
+all: genstubs binaries libraries doc
 
 #========================================================================
 # The binaries target builds executable programs, Windows .dll's, unix
--- libpng/pngtclDecls.h	2011-10-07 23:13:35.000000000 -0400
+++ libpng/pngtclDecls.h.new	2011-10-07 23:14:01.000000000 -0400
@@ -16,6 +16,9 @@
 
 #include <tcl.h>
 
+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/png.h"
+#define DONOTUSE_PngtclTCL_Pngtcl_DECLARATIONS 1
+
 #ifdef PNG_IMPEXP
 #   undef TCL_STORAGE_CLASS
 #   define TCL_STORAGE_CLASS DLLEXPORT
@@ -28,7 +30,6 @@
 EXTERN int Pngtcl_Init(Tcl_Interp *interp);
 EXTERN int Pngtcl_SafeInit(Tcl_Interp *interp);
 
-#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/png.h"
 
 /* !BEGIN!: Do not edit below this line. */
 
--- libpng/pngtcl.decls.old	2011-10-07 23:56:31.000000000 -0400
+++ libpng/pngtcl.decls	2011-10-07 23:56:52.000000000 -0400
@@ -554,10 +554,10 @@
     void png_set_invalid(png_structp png_ptr, png_infop info_ptr, int mask)
 }
 declare 174 generic {!PNG_INFO_IMAGE_SUPPORTED} {
-    void png_read_png(png_structp png_ptr, png_infop info_ptr, int transforms, voidp params)
+    void png_read_png(png_structp png_ptr, png_infop info_ptr, int transforms, png_voidp params)
 }
 declare 175 generic {!PNG_INFO_IMAGE_SUPPORTED} {
-    void png_write_png(png_structp png_ptr, png_infop info_ptr, int transforms, voidp params)
+    void png_write_png(png_structp png_ptr, png_infop info_ptr, int transforms, png_voidp params)
 }
 declare 176 generic {!PNG_INTERNAL PNG_USE_GLOBAL_ARRAYS {PNG_NO_EXTERN !PNG_ALWAYS_EXTERN}} {
     png_bytep png_sig_bytes(void)