Latest ZLIB patch does not apply correctly

[cedrik-fuoco-adsk]

Discussed in https://github.com/AcademySoftwareFoundation/OpenRV/discussions/458

${LDCMD:-cc} -arch x86_64 -O3 -Wall -L. -Wl,-search_paths_first  \
        -o apps/openssl apps/asn1pars.o apps/ca.o apps/ciphers.o apps/cms.o apps/crl.o apps/crl2p7.o apps/dgst.o apps/dhparam.o apps/dsa.o apps/dsaparam.o apps/ec.o apps/ecparam.o apps/enc.o apps/engine.o apps/errstr.o apps/gendsa.o apps/genpkey.o apps/genrsa.o apps/nseq.o apps/ocsp.o apps/openssl.o apps/passwd.o apps/pkcs12.o apps/pkcs7.o apps/pkcs8.o apps/pkey.o apps/pkeyparam.o apps/pkeyutl.o apps/prime.o apps/rand.o apps/rehash.o apps/req.o apps/rsa.o apps/rsautl.o apps/s_client.o apps/s_server.o apps/s_time.o apps/sess_id.o apps/smime.o apps/speed.o apps/spkac.o apps/srp.o apps/storeutl.o apps/ts.o apps/verify.o apps/version.o apps/x509.o \
         apps/libapps.a -lssl -lcrypto  
rm -f fuzz/server-test
rm -f test/asynciotest
${LDCMD:-cc} -arch x86_64 -O3 -Wall -L. -Wl,-search_paths_first  \
        -o fuzz/asn1-test fuzz/asn1.o fuzz/test-corpus.o \
         -lssl -lcrypto  
rm -f test/bad_dtls_test
${LDCMD:-cc} -arch x86_64 -O3 -Wall -L. -Wl,-search_paths_first  \
        -o fuzz/client-test fuzz/client.o fuzz/test-corpus.o \
         -lssl -lcrypto  
${LDCMD:-cc} -arch x86_64 -O3 -Wall -L. -Wl,-search_paths_first  \
        -o fuzz/server-test fuzz/server.o fuzz/test-corpus.o \
         -lssl -lcrypto  
${LDCMD:-cc} -arch x86_64 -O3 -Wall -L. -Wl,-search_paths_first  \
        -o test/asynciotest test/asynciotest.o test/ssltestlib.o \
         -lssl test/libtestutil.a -lcrypto  
${LDCMD:-cc} -arch x86_64 -O3 -Wall -L. -Wl,-search_paths_first  \
        -o test/bad_dtls_test test/bad_dtls_test.o \
         -lssl test/libtestutil.a -lcrypto  
[1/1906] cd /Users/dest/Des/software/OpenRV/_build/RV_DEPS_ZLIB/src && patch -p1 < /Users/dest/Des/software/OpenRV/cmake/dependencies/patch/zlib_Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch && /opt/homebrew/Cellar/cmake/3.29.2/bin/cmake -E touch /Users/dest/Des/software/OpenRV/_build/cmake/dependencies/RV_DEPS_ZLIB-prefix/src/RV_DEPS_ZLIB-stamp/RV_DEPS_ZLIB-patch
FAILED: cmake/dependencies/RV_DEPS_ZLIB-prefix/src/RV_DEPS_ZLIB-stamp/RV_DEPS_ZLIB-patch /Users/dest/Des/software/OpenRV/_build/cmake/dependencies/RV_DEPS_ZLIB-prefix/src/RV_DEPS_ZLIB-stamp/RV_DEPS_ZLIB-patch 
cd /Users/dest/Des/software/OpenRV/_build/RV_DEPS_ZLIB/src && patch -p1 < /Users/dest/Des/software/OpenRV/cmake/dependencies/patch/zlib_Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch && /opt/homebrew/Cellar/cmake/3.29.2/bin/cmake -E touch /Users/dest/Des/software/OpenRV/_build/cmake/dependencies/RV_DEPS_ZLIB-prefix/src/RV_DEPS_ZLIB-stamp/RV_DEPS_ZLIB-patch
patching file zconf.h.cmakein
1 out of 1 hunks failed--saving rejects to zconf.h.cmakein.rej
patching file zconf.h.in
1 out of 1 hunks failed--saving rejects to zconf.h.in.rej
[19/1906] /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ -DRV_VFX_CY2023 -Dmp4v2_EXPORTS -I/Users/dest/Des/software/OpenRV/src/pub/mp4v2 -g -std=gnu++17 -arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.4.sdk -fPIC -fvisibility=default -DARCH_IA32_64 -DPLATFORM_DARWIN -DTWK_LITTLE_ENDIAN -D__LITTLE_ENDIAN__ -DPLATFORM_APPLE_MACH_BSD -DPLATFORM_OPENGL -DGL_SILENCE_DEPRECATION -D_XOPEN_SOURCE=600 -D_DARWIN_C_SOURCE -DOSX_VERSION=14.4.1 -DMAJOR_VERSION=2 -DMINOR_VERSION=0 -DREVISION_NUMBER=0 -Wall -Wnonportable-include-path -msse -msse2 -msse3 -mmmx -DDEBUG -g -O0 -MD -MT src/pub/mp4v2/CMakeFiles/mp4v2.dir/src/bmff/typebmff.cpp.o -MF src/pub/mp4v2/CMakeFiles/mp4v2.dir/src/bmff/typebmff.cpp.o.d -o src/pub/mp4v2/CMakeFiles/mp4v2.dir/src/bmff/typebmff.cpp.o -c /Users/dest/Des/software/OpenRV/src/pub/mp4v2/src/bmff/typebmff.cpp
ninja: build stopped: subcommand failed.

[cedrik-fuoco-adsk]

Closed by #460