Index: libraries/osx/build-osx-libs.sh =================================================================== --- libraries/osx/build-osx-libs.sh +++ libraries/osx/build-osx-libs.sh @@ -21,9 +21,9 @@ # -------------------------------------------------------------- # Library versions for ease of updating: ZLIB_VERSION="zlib-1.2.11" -CURL_VERSION="curl-7.59.0" -ICONV_VERSION="libiconv-1.15" -XML2_VERSION="libxml2-2.9.8" +CURL_VERSION="curl-7.71.0" +ICONV_VERSION="libiconv-1.16" +XML2_VERSION="libxml2-2.9.10" SDL2_VERSION="SDL2-2.0.5" # NOTE: remember to also update LIB_URL below when changing version BOOST_VERSION="boost_1_64_0" @@ -31,20 +31,20 @@ WXWIDGETS_VERSION="wxWidgets-3.0.3.1" # libpng was included as part of X11 but that's removed from Mountain Lion # (also the Snow Leopard version was ancient 1.2) -PNG_VERSION="libpng-1.6.34" -OGG_VERSION="libogg-1.3.3" -VORBIS_VERSION="libvorbis-1.3.6" +PNG_VERSION="libpng-1.6.36" +OGG_VERSION="libogg-1.3.4" +VORBIS_VERSION="libvorbis-1.3.7" # gloox requires GnuTLS, GnuTLS requires Nettle and GMP -GMP_VERSION="gmp-6.1.2" -NETTLE_VERSION="nettle-3.5.1" +GMP_VERSION="gmp-6.2.0" +NETTLE_VERSION="nettle-3.6" # NOTE: remember to also update LIB_URL below when changing version +GLOOX_VERSION="gloox-1.0.24" GNUTLS_VERSION="gnutls-3.6.13" -GLOOX_VERSION="gloox-1.0.22" # OS X only includes part of ICU, and only the dylib # NOTE: remember to also update LIB_URL below when changing version -ICU_VERSION="icu4c-59_2" -ENET_VERSION="enet-1.3.13" -MINIUPNPC_VERSION="miniupnpc-2.0.20180222" +ICU_VERSION="icu4c-67_1" +ENET_VERSION="enet-1.3.17" +MINIUPNPC_VERSION="miniupnpc-2.1" SODIUM_VERSION="libsodium-1.0.18" # -------------------------------------------------------------- # Bundled with the game: @@ -97,12 +97,11 @@ fi # Force using libc++ since it has better C++11 support required by the game # but pre-Mavericks still use libstdc++ by default -# Also enable c++0x for consistency with the game build C_FLAGS="$C_FLAGS -arch $ARCH -fvisibility=hidden" LDFLAGS="$LDFLAGS -arch $ARCH -stdlib=libc++" CFLAGS="$CFLAGS $C_FLAGS" -CXXFLAGS="$CXXFLAGS $C_FLAGS -stdlib=libc++ -std=c++0x" +CXXFLAGS="$CXXFLAGS $C_FLAGS -stdlib=libc++ -std=c++11" OBJCFLAGS="$OBJCFLAGS $C_FLAGS" OBJCXXFLAGS="$OBJCXXFLAGS $C_FLAGS" @@ -762,7 +761,7 @@ LIB_VERSION="${ICU_VERSION}" LIB_ARCHIVE="$LIB_VERSION-src.tgz" LIB_DIRECTORY="icu" -LIB_URL="https://github.com/unicode-org/icu/releases/download/release-59-2/" +LIB_URL="https://github.com/unicode-org/icu/releases/download/release-67-1/" mkdir -p $LIB_DIRECTORY pushd icu > /dev/null Index: libraries/osx/patches/gnutls-disable-tcpfastopen.diff =================================================================== --- libraries/osx/patches/gnutls-disable-tcpfastopen.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/system/fastopen.c 2019-03-15 05:10:27.000000000 -0400 -+++ lib/system/fastopen.c 2019-07-10 07:53:30.000000000 -0400 -@@ -38,7 +38,7 @@ - - /* TCP Fast Open on OSX behaves differently from Linux, so define these helpers */ - #if defined __APPLE__ && defined __MACH__ && defined CONNECT_DATA_IDEMPOTENT && defined CONNECT_RESUME_ON_READ_WRITE --# define TCP_FASTOPEN_OSX -+//# define TCP_FASTOPEN_OSX - #elif defined TCP_FASTOPEN && defined MSG_FASTOPEN - # define TCP_FASTOPEN_LINUX - #endif