<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8d1d4be6b3b1ccea8a2116b4189446e11d53a3f1">https://github.com/macports/macports-ports/commit/8d1d4be6b3b1ccea8a2116b4189446e11d53a3f1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 8d1d4be6b3b zlib: update to 1.2.12
</span>8d1d4be6b3b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8d1d4be6b3b1ccea8a2116b4189446e11d53a3f1
</span>Author: aeiouaeiouaeiouaeiouaeiouaeiou <aeioudev@outlook.com>
AuthorDate: Mon Mar 28 16:33:17 2022 +0300
<span style='display:block; white-space:pre;color:#404040;'> zlib: update to 1.2.12
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * remove minizip patches
</span><span style='display:block; white-space:pre;color:#404040;'> * add patch to fix the missing dylib error
</span>---
archivers/zlib/Portfile | 15 ++++----
.../zlib/files/extra-tokens-at-end-of-ifdef.patch | 24 ------------
.../files/implicit-declaration-of-function.patch | 12 ------
archivers/zlib/files/patch-cc-logic.patch | 43 ++++++++++++++++++++++
4 files changed, 50 insertions(+), 44 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zlib/Portfile b/archivers/zlib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d6661d105d9..ed2761617a1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/zlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/zlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup xcodeversion 1.0
name zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.2.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.2.12
</span> categories archivers
maintainers {ryandesign @ryandesign} openmaintainer
license zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,9 +33,9 @@ if {${os.platform} eq "darwin" && ${os.major} < 11 && ${configure.cxx_stdlib} eq
</span> use_xz yes
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3f3ecd35efa6d41ba7b90e5f6e872e2ee8e42044 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 467960
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f8ab67a6b9f32f774440907309f2e4c3526e0b52 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1288864
</span>
minimum_xcodeversions {8 2.4.1 9 3.1}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,6 +50,8 @@ destroot.destdir prefix=${destroot}${prefix}
</span> if {${name} eq ${subport}} {
revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-cc-logic.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
platform darwin {
foreach {neededfile} "${prefix}/lib/libz.dylib" {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +79,7 @@ if {${name} eq ${subport}} {
</span> }
subport minizip {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
description Minizip zip file manipulation library
long_description ${description}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,9 +88,6 @@ subport minizip {
</span>
depends_lib-append port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles extra-tokens-at-end-of-ifdef.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- implicit-declaration-of-function.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zlib/files/extra-tokens-at-end-of-ifdef.patch b/archivers/zlib/files/extra-tokens-at-end-of-ifdef.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7d03a440fb9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/zlib/files/extra-tokens-at-end-of-ifdef.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-warning: extra tokens at end of #ifdef directive [-Wextra-tokens]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- miniunz.c.orig 2010-07-18 11:04:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ miniunz.c 2020-07-31 20:35:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,7 +97,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CloseHandle(hFile);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef unix || __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(unix) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct utimbuf ut;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct tm newdate;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- newdate.tm_sec = tmu_date.tm_sec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- minizip.c.orig 2012-01-21 14:00:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ minizip.c 2020-07-31 20:34:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -94,7 +94,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef unix || __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(unix) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uLong filetime(f, tmzip, dt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *f; /* name of file to get info on */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tm_zip *tmzip; /* return value: access, modific. and creation times */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zlib/files/implicit-declaration-of-function.patch b/archivers/zlib/files/implicit-declaration-of-function.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6dd167139fb..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/zlib/files/implicit-declaration-of-function.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-implicit declaration of function 'mkdir' is invalid in C99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- miniunz.c.orig 2020-07-31 20:40:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ miniunz.c 2020-07-31 20:40:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,6 +45,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <errno.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <direct.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zlib/files/patch-cc-logic.patch b/archivers/zlib/files/patch-cc-logic.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..39cbe6c95f2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/zlib/files/patch-cc-logic.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 80d086357a55b94a13e43756cf3e131f25eef0e4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sam James <sam@gentoo.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 28 Mar 2022 08:40:45 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix CC logic in configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+In https://github.com/madler/zlib/commit/e9a52aa129efe3834383e415580716a7c4027f8d,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the logic was changed to try check harder for GCC, but it dropped
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the default setting of cc=${CC}. It was throwing away any pre-set CC value as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+a result.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The rest of the script then cascades down a bad path because it's convinced
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+it's not GCC or a GCC-like compiler.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This led to e.g. misdetection of inability to build shared libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+for say, multilib cases (w/ CC being one thing from the environment being used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+for one test (e.g. x86_64-unknown-linux-gnu-gcc -m32 and then 'cc' used for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+shared libs (but missing "-m32"!)). Obviously just one example of how
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the old logic could break.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This restores the old default of 'CC' if nothing overrides it later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in configure.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug: https://bugs.gentoo.org/836308
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Sam James <sam@gentoo.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 52ff4a04e..3fa3e8618 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -174,7 +174,10 @@ if test -z "$CC"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cc=${CROSS_PREFIX}cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cc=${CC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cflags=${CFLAGS-"-O3"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "$cc" in
</span></pre><pre style='margin:0'>
</pre>