zlib: Update to 1.2.12

The removed patch hunks are all included in the new release
This commit is contained in:
Christoph Reiter 2022-03-30 21:28:05 +02:00
parent f5fc48f9c1
commit cb8092b6cb
4 changed files with 11 additions and 40 deletions

View File

@ -1,11 +0,0 @@
--- zlib-1.2.11/gzguts.h.orig 2017-01-25 07:59:56.957392500 +0300
+++ zlib-1.2.11/gzguts.h 2017-01-25 08:00:03.311603900 +0300
@@ -39,7 +39,7 @@
# include <io.h>
#endif
-#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined(_WIN32)
# define WIDECHAR
#endif

View File

@ -36,15 +36,6 @@
#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
#define FTELLO_FUNC(stream) ftello(stream)
#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
@@ -97,7 +98,7 @@ void change_file_date(filename,dosdate,t
SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
CloseHandle(hFile);
#else
-#ifdef unix || __APPLE__
+#if defined(unix) || defined(__APPLE__)
struct utimbuf ut;
struct tm newdate;
newdate.tm_sec = tmu_date.tm_sec;
--- origsrc/zlib-1.2.7/contrib/minizip/minizip.c 2012-01-21 15:00:26.000000000 -0500
+++ src/zlib-1.2.7/contrib/minizip/minizip.c 2012-05-03 15:05:29.976938300 -0400
@@ -28,8 +28,9 @@
@ -58,12 +49,3 @@
#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
#define FTELLO_FUNC(stream) ftello(stream)
#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
@@ -94,7 +95,7 @@ uLong filetime(f, tmzip, dt)
return ret;
}
#else
-#ifdef unix || __APPLE__
+#if defined(unix) || defined(__APPLE__)
uLong filetime(f, tmzip, dt)
char *f; /* name of file to get info on */
tm_zip *tmzip; /* return value: access, modific. and creation times */

View File

@ -1,7 +1,7 @@
# Maintainer: Alexey Pavlov <Alexpux@gmail.com>
pkgname=('zlib' 'zlib-devel')
pkgver=1.2.11
pkgver=1.2.12
pkgrel=1
pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
arch=('i686' 'x86_64')
@ -9,17 +9,17 @@ groups=('libraries')
license=('custom')
url="https://www.zlib.net/"
makedepends=('gcc' 'make' 'autotools')
source=(#"https://zlib.net/current/zlib-${pkgver}.tar.gz"
"https://sourceforge.net/projects/libpng/files/zlib/${pkgver}/zlib-${pkgver}.tar.gz"
source=("https://zlib.net/current/zlib-${pkgver}.tar.gz"
#"https://sourceforge.net/projects/libpng/files/zlib/${pkgver}/zlib-${pkgver}.tar.gz"
1.2.7-minizip-cygwin.patch
1.2.7-zlib-symbols.patch
1.2.11-cygwin-no-widechar.patch
zlib-1.2.11-msys2.patch)
sha256sums=('c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1'
'425e2e36e8c788f0fa725c9b713642d5ae2f6629eab8613a2c2886eed2de5c21'
zlib-1.2.11-msys2.patch
"https://patch-diff.githubusercontent.com/raw/madler/zlib/pull/607.patch")
sha256sums=('91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9'
'58daf0d9041ed6687fa17cfa244562a0f8db1ef9924d57b8a427adf40a8ecfb0'
'16e9ce18df14a700dda0572843cdb42b5cb3d398c64706af0acc7cd77c181b7e'
'ba195803acf87b49b2f007bc83015c138a19e666e1e935b8116b4928b88d72eb'
'31d675180f528af0b172bbf09f1e9b2014acc1a0a8a23e0cc172a88eb3eb675f')
'65c946a22df5f7beab8fbf556e69c66269c8c0e251f370378d566afe10defe5d'
'f35eb05334a4f8d7b40b6c5610a6369f654863b5fa1a19c2507888f918025238')
prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
@ -27,8 +27,8 @@ prepare() {
patch -p2 -i ${srcdir}/1.2.7-minizip-cygwin.patch
patch -p2 -i ${srcdir}/1.2.7-zlib-symbols.patch
patch -p1 -i ${srcdir}/1.2.11-cygwin-no-widechar.patch
patch -p1 -i ${srcdir}/zlib-1.2.11-msys2.patch
patch -p1 -i ${srcdir}/607.patch
}
build() {

View File

@ -139,7 +139,7 @@
+++ zlib-1.2.11/Makefile.in 2017-01-17 08:53:10.064299400 +0300
@@ -34,6 +34,9 @@
SHAREDLIB=libz.so
SHAREDLIBV=libz.so.1.2.11
SHAREDLIBV=libz.so.1.2.12
SHAREDLIBM=libz.so.1
+IMPORTLIB=
+SHAREDLIBPOST='(rm -f $(SHAREDLIB) $(SHAREDLIBM); ln -s $@ $(SHAREDLIB) ; ln -s $@ $(SHAREDLIBM) )'