Fix patch

externals/patches/SDL2_ttf-2.20.1.patch

@@ -1,7 +1,7 @@
-From b44c59734ac43d9091ec78d61c278fdcef80948f Mon Sep 17 00:00:00 2001
+From 1a6a70d8b785ff9fec2e4008b8c3c7bd8bd339e0 Mon Sep 17 00:00:00 2001
 From: Mathieu Schroeter <mathieu@schroetersa.ch>
-Date: Wed, 28 Jun 2023 21:32:51 +0200
+Date: Wed, 28 Jun 2023 22:04:46 +0200
-Subject: Rename some functions in order to prevent clash with the linker
+Subject: m
 
 
 diff --git a/external/freetype/src/gzip/crc32.c b/external/freetype/src/gzip/crc32.c
@@ -106,7 +106,7 @@ index 2ddc32d..e232595 100644
      uLong crc2,
      uLong op)
 diff --git a/external/freetype/src/gzip/ftzconf.h b/external/freetype/src/gzip/ftzconf.h
-index 5e1d68a..c025551 100644
+index 5e1d68a..7038954 100644
 --- a/external/freetype/src/gzip/ftzconf.h
 +++ b/external/freetype/src/gzip/ftzconf.h
 @@ -36,9 +36,9 @@
@@ -154,6 +154,25 @@ index 5e1d68a..c025551 100644
  #  define inflate_copyright     z_inflate_copyright
  #  define inflate_fast          z_inflate_fast
  #  define inflate_table         z_inflate_table
+@@ -129,13 +129,13 @@
+ #    define uncompress            z_uncompress
+ #    define uncompress2           z_uncompress2
+ #  endif
+-#  define zError                z_zError
++#  define zError                _z_zError
+ #  ifndef Z_SOLO
+-#    define zcalloc               z_zcalloc
+-#    define zcfree                z_zcfree
++#    define zcalloc               _z_zcalloc
++#    define zcfree                _z_zcfree
+ #  endif
+-#  define zlibCompileFlags      z_zlibCompileFlags
+-#  define zlibVersion           z_zlibVersion
++#  define zlibCompileFlags      _z_zlibCompileFlags
++#  define zlibVersion           _z_zlibVersion
+ 
+ /* all zlib typedefs in zlib.h and zconf.h */
+ #  define Byte                  z_Byte
 @@ -520,7 +520,7 @@ typedef uLong FAR uLongf;
    #pragma map(deflateInit2_,"DEIN2")
    #pragma map(deflateEnd,"DEEND")
@@ -222,7 +241,7 @@ index 5bf5b81..112483b 100644
      int check)
  {
 diff --git a/external/freetype/src/gzip/patches/freetype-zlib.diff b/external/freetype/src/gzip/patches/freetype-zlib.diff
-index 20d8429..d45de43 100644
+index 20d8429..c48c8a2 100644
 --- a/external/freetype/src/gzip/patches/freetype-zlib.diff
 +++ b/external/freetype/src/gzip/patches/freetype-zlib.diff
 @@ -80,7 +80,7 @@ index 4375557b4..5bf5b815e 100644
@@ -287,15 +306,35 @@ index 20d8429..d45de43 100644
  @@ -1927,6 +1959,7 @@ ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
                                                     va_list va));
   #  endif
-@@ -349,7 +349,7 @@ index d9a20ae1b..14f0f1a85 100644
+@@ -339,7 +339,7 @@ diff --git a/src/gzip/zutil.h b/src/gzip/zutil.h
+ index d9a20ae1b..14f0f1a85 100644
+ --- a/src/gzip/zutil.h
+ +++ b/src/gzip/zutil.h
+-@@ -188,6 +188,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
++@@ -188,6 +188,8 @@ extern z_const char * const _z_errmsg[10]; /* indexed by 2-zlib_error */
+    #pragma warn -8066
+  #endif
+  
+@@ -348,8 +348,8 @@ index d9a20ae1b..14f0f1a85 100644
+  /* provide prototypes for these when building zlib without LFS */
   #if !defined(_WIN32) && \
       (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
- @@ -195,6 +197,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+-@@ -195,6 +197,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 -     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
++@@ -195,6 +197,8 @@ extern z_const char * const _z_errmsg[10]; /* indexed by 2-zlib_error */
 +     ZEXTERN uLong ZEXPORT _crc32_combine64 OF((uLong, uLong, z_off_t));
   #endif
   
  +#endif  /* !Z_FREETYPE */
+@@ -357,7 +357,7 @@ index d9a20ae1b..14f0f1a85 100644
+          /* common defaults */
+  
+  #ifndef OS_CODE
+-@@ -226,9 +230,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
++@@ -226,9 +230,9 @@ extern z_const char * const _z_errmsg[10]; /* indexed by 2-zlib_error */
+  #    define zmemcmp _fmemcmp
+  #    define zmemzero(dest, len) _fmemset(dest, 0, len)
+  #  else
 diff --git a/external/freetype/src/gzip/zlib.h b/external/freetype/src/gzip/zlib.h
 index d760140..b6097ad 100644
 --- a/external/freetype/src/gzip/zlib.h
@@ -443,10 +482,36 @@ index d760140..b6097ad 100644
  ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
  #if defined(_WIN32) && !defined(Z_SOLO)
  ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
+diff --git a/external/freetype/src/gzip/zutil.c b/external/freetype/src/gzip/zutil.c
+index a19ac2b..3d5004b 100644
+--- a/external/freetype/src/gzip/zutil.c
++++ b/external/freetype/src/gzip/zutil.c
+@@ -10,7 +10,7 @@
+ #  include "gzguts.h"
+ #endif
+ 
+-z_const char * const z_errmsg[10] = {
++z_const char * const _z_errmsg[10] = {
+     (z_const char *)"need dictionary",     /* Z_NEED_DICT       2  */
+     (z_const char *)"stream end",          /* Z_STREAM_END      1  */
+     (z_const char *)"",                    /* Z_OK              0  */
 diff --git a/external/freetype/src/gzip/zutil.h b/external/freetype/src/gzip/zutil.h
-index 14f0f1a..c7c4bf9 100644
+index 14f0f1a..089b0e0 100644
 --- a/external/freetype/src/gzip/zutil.h
 +++ b/external/freetype/src/gzip/zutil.h
+@@ -53,10 +53,10 @@ typedef unsigned long  ulg;
+ #  endif
+ #endif
+ 
+-extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
++extern z_const char * const _z_errmsg[10]; /* indexed by 2-zlib_error */
+ /* (size given to avoid silly warnings with Visual C++) */
+ 
+-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
++#define ERR_MSG(err) _z_errmsg[Z_NEED_DICT-(err)]
+ 
+ #define ERR_RETURN(strm,err) \
+   return (strm->msg = ERR_MSG(err), (err))
 @@ -194,7 +194,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
  #if !defined(_WIN32) && \
      (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)