- remaining part is back (lib linking, compat symlink instead of duplicate lib)

[packages/crossmingw32-libpng.git] / libpng-pngminus.patch

diff --git a/libpng-pngminus.patch b/libpng-pngminus.patch
index 09852ee2bdf0901fc9d0298796297b6264678b64..ae0875df8974aea64e9794918ff5dbec5fc13e84 100644 (file)
--- a/libpng-pngminus.patch
+++ b/libpng-pngminus.patch
@@ -1,7 +1,14 @@
-diff -urN libpng-1.2.1.org/contrib/pngminus/makefile.std libpng-1.2.1/contrib/pngminus/makefile.std
---- libpng-1.2.1.org/contrib/pngminus/makefile.std     Wed Mar 13 11:40:24 2002
-+++ libpng-1.2.1/contrib/pngminus/makefile.std Wed Mar 13 11:46:05 2002
-@@ -19,13 +19,13 @@
+--- libpng-1.2.10/contrib/pngminus/makefile.std.orig   2006-04-23 20:45:35.000000000 +0200
++++ libpng-1.2.10/contrib/pngminus/makefile.std        2006-05-20 00:07:36.332062500 +0200
+@@ -12,20 +12,20 @@
+ #PNGLIB = -L$(PNGPATH)/lib -lpng12
+ #PNGLIBS = $(PNGPATH)/lib/libpng12.a
+ PNGINC = -I../..
+-PNGLIB = -L../.. -lpng
++PNGLIB = -L../.. -L../../.libs -lpng
+ PNGLIBS = ../../libpng.a
+ 
+ #ZPATH = /usr/local
  #ZINC = -I$(ZPATH)/include
  #ZLIB = -L$(ZPATH)/lib -lz
  #ZLIBS = $(ZPATH)/lib/libz.a
@@ -20,8 +27,6 @@ diff -urN libpng-1.2.1.org/contrib/pngminus/makefile.std libpng-1.2.1/contrib/pn
  C=.c
  O=.o
  L=.a
---- libpng-1.2.10/contrib/pngminus/makefile.std.orig   2006-05-01 17:54:46.000000000 +0200
-+++ libpng-1.2.10/contrib/pngminus/makefile.std        2006-05-01 17:56:33.000000000 +0200
 @@ -33,8 +33,7 @@
  
  # dependencies