summaryrefslogtreecommitdiff
path: root/Build/source/libs/zlib/TLpatches
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/zlib/TLpatches')
-rw-r--r--Build/source/libs/zlib/TLpatches/ChangeLog5
-rw-r--r--Build/source/libs/zlib/TLpatches/TL-Changes72
-rw-r--r--Build/source/libs/zlib/TLpatches/patch-01-not-define-WIDECHAR-for-cygwin12
3 files changed, 7 insertions, 82 deletions
diff --git a/Build/source/libs/zlib/TLpatches/ChangeLog b/Build/source/libs/zlib/TLpatches/ChangeLog
index 15dd50372f0..e1b6d881c75 100644
--- a/Build/source/libs/zlib/TLpatches/ChangeLog
+++ b/Build/source/libs/zlib/TLpatches/ChangeLog
@@ -1,3 +1,8 @@
+2022-04-05 Akira Kakuto <kakuto@jcom.zaq.ne.jp>
+
+ Import zlib-1.2.12.
+ * Remove patch-01-not-define-WIDECHAR-for-cygwin
+
2017-01-15 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
Import zlib-1.2.11.
diff --git a/Build/source/libs/zlib/TLpatches/TL-Changes b/Build/source/libs/zlib/TLpatches/TL-Changes
index f31d2bbedde..13b3fd01bfa 100644
--- a/Build/source/libs/zlib/TLpatches/TL-Changes
+++ b/Build/source/libs/zlib/TLpatches/TL-Changes
@@ -1,75 +1,7 @@
-Changes applied to the zlib-1.2.11/ tree as obtained from:
- http://zlib.net/zlib-1.2.11.tar.xz
+Changes applied to the zlib-1.2.12/ tree as obtained from:
+ http://zlib.net/zlib-1.2.12.tar.xz
Removed:
Makefile
zconf.h
doc/rfc*
-
-Converted Dos/Win line ends to native:
- contrib/dotzlib/DotZLib/AssemblyInfo.cs
- contrib/dotzlib/DotZLib/ChecksumImpl.cs
- contrib/dotzlib/DotZLib/CircularBuffer.cs
- contrib/dotzlib/DotZLib/CodecBase.cs
- contrib/dotzlib/DotZLib/Deflater.cs
- contrib/dotzlib/DotZLib/DotZLib.cs
- contrib/dotzlib/DotZLib/DotZLib.csproj
- contrib/dotzlib/DotZLib/GZipStream.cs
- contrib/dotzlib/DotZLib/Inflater.cs
- contrib/dotzlib/DotZLib/UnitTests.cs
- contrib/dotzlib/DotZLib.build
- contrib/dotzlib/DotZLib.sln
- contrib/dotzlib/LICENSE_1_0.txt
- contrib/dotzlib/readme.txt
- contrib/gcc_gvmat64/gvmat64.S
- contrib/masmx64/bld_ml64.bat
- contrib/masmx64/gvmat64.asm
- contrib/masmx64/inffas8664.c
- contrib/masmx64/inffasx64.asm
- contrib/masmx64/readme.txt
- contrib/masmx86/bld_ml32.bat
- contrib/masmx86/inffas32.asm
- contrib/masmx86/match686.asm
- contrib/masmx86/readme.txt
- contrib/testzlib/testzlib.c
- contrib/testzlib/testzlib.txt
- contrib/vstudio/readme.txt
- contrib/vstudio/vc10/miniunz.vcxproj
- contrib/vstudio/vc10/miniunz.vcxproj.filters
- contrib/vstudio/vc10/minizip.vcxproj
- contrib/vstudio/vc10/minizip.vcxproj.filters
- contrib/vstudio/vc10/testzlib.vcxproj
- contrib/vstudio/vc10/testzlib.vcxproj.filters
- contrib/vstudio/vc10/testzlibdll.vcxproj
- contrib/vstudio/vc10/testzlibdll.vcxproj.filters
- contrib/vstudio/vc10/zlib.rc
- contrib/vstudio/vc10/zlibstat.vcxproj
- contrib/vstudio/vc10/zlibstat.vcxproj.filters
- contrib/vstudio/vc10/zlibvc.def
- contrib/vstudio/vc10/zlibvc.sln
- contrib/vstudio/vc10/zlibvc.vcxproj
- contrib/vstudio/vc10/zlibvc.vcxproj.filters
- contrib/vstudio/vc11/miniunz.vcxproj
- contrib/vstudio/vc11/minizip.vcxproj
- contrib/vstudio/vc11/testzlib.vcxproj
- contrib/vstudio/vc11/testzlibdll.vcxproj
- contrib/vstudio/vc11/zlib.rc
- contrib/vstudio/vc11/zlibstat.vcxproj
- contrib/vstudio/vc11/zlibvc.def
- contrib/vstudio/vc11/zlibvc.sln
- contrib/vstudio/vc11/zlibvc.vcxproj
- contrib/vstudio/vc9/miniunz.vcproj
- contrib/vstudio/vc9/minizip.vcproj
- contrib/vstudio/vc9/testzlib.vcproj
- contrib/vstudio/vc9/testzlibdll.vcproj
- contrib/vstudio/vc9/zlib.rc
- contrib/vstudio/vc9/zlibstat.vcproj
- contrib/vstudio/vc9/zlibvc.def
- contrib/vstudio/vc9/zlibvc.sln
- contrib/vstudio/vc9/zlibvc.vcproj
-
-Added newline at end of file:
- contrib/dotzlib/DotZLib/ChecksumImpl.cs
- contrib/dotzlib/LICENSE_1_0.txt
- contrib/testzlib/testzlib.txt
-
diff --git a/Build/source/libs/zlib/TLpatches/patch-01-not-define-WIDECHAR-for-cygwin b/Build/source/libs/zlib/TLpatches/patch-01-not-define-WIDECHAR-for-cygwin
deleted file mode 100644
index 87e08bcd382..00000000000
--- a/Build/source/libs/zlib/TLpatches/patch-01-not-define-WIDECHAR-for-cygwin
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur zlib-1.2.11.orig/gzguts.h zlib-1.2.11/gzguts.h
---- zlib-1.2.11.orig/gzguts.h Sun Jan 01 16:37:10 2017
-+++ zlib-1.2.11/gzguts.h Mon Jan 16 07:53:25 2017
-@@ -39,7 +39,7 @@
- # include <io.h>
- #endif
-
--#if defined(_WIN32) || defined(__CYGWIN__)
-+#if defined(_WIN32)
- # define WIDECHAR
- #endif
-