diff --git a/README.md b/README.md index 2f8b5a1f2d7023a5021bca244ad18c7938700066..0ce252aa74dc62a6765718fabb8652045828403e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # zlib12-7 #### 介绍 -zlib is a library for data compression, developed by Jean-loup Gailly and Mark Adler. +zlib is a library for data compression, developed by Jean-loup Gailly and Mark Adler.. #### 软件架构 软件架构说明 diff --git a/zlib-1.2.5-minizip-fixuncrypt.patch b/zlib-1.2.5-minizip-fixuncrypt.patch new file mode 100644 index 0000000000000000000000000000000000000000..d113879f5c37d6e422d5545711c4c95c20a5673c --- /dev/null +++ b/zlib-1.2.5-minizip-fixuncrypt.patch @@ -0,0 +1,14 @@ +diff -up zlib-1.2.5/contrib/minizip/unzip.c.fixuncrypt zlib-1.2.5/contrib/minizip/unzip.c +--- zlib-1.2.5/contrib/minizip/unzip.c.fixuncrypt 2011-11-11 12:13:56.335867758 -0500 ++++ zlib-1.2.5/contrib/minizip/unzip.c 2011-11-11 12:14:01.747799372 -0500 +@@ -68,10 +68,6 @@ + #include + #include + +-#ifndef NOUNCRYPT +- #define NOUNCRYPT +-#endif +- + #include "zlib.h" + #include "unzip.h" + diff --git a/zlib.pc.in b/zlib.pc.in deleted file mode 100644 index 27497b748eed04d3d9f80bb7ea968fcffae800f1..0000000000000000000000000000000000000000 --- a/zlib.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -sharedlibdir=${libdir} -includedir=@includedir@ - -Name: zlib -Description: zlib compression library -Version: @VERSION@ - -Requires: -Libs: -L${libdir} -L${sharedlibdir} -lz -Cflags: -I${includedir}