Changeset 27667

Timestamp:
Jun 6, 2023, 9:07:50 AM (14 months ago)
Author:
wraitii
Message:

Fix game crash when communicating with the lobby on macOS 13

Summary:
On macOS Ventura (at least version 13.2.1 and above), the game crashes instantly when clicking on buttons communicating with the lobby.

This issue is solved by upgrading nettle to 3.9 and GNUTLS to 3.8.

Patch by: froissant

Accepted By: wraitii

Trac Tickets: #6807

Differential Revision: ​https://code.wildfiregames.com/D5018

Location:
ps/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • ps/trunk/binaries/data/mods/public/gui/credits/texts/programming.json

    r27647 r27667  
    108108                { "nick": "Freagarach" },
    109109                { "nick": "freenity", "name": "Anton Galitch" },
     110
    110111                { "nick": "Gallaecio", "name": "Adrián Chaves" },
    111112                { "nick": "gbish (aka Iny)", "name": "Grant Bishop" },

  • ps/trunk/libraries/osx/build-osx-libs.sh

    r27541 r27667  
    3838# gloox requires GnuTLS, GnuTLS requires Nettle and GMP
    3939GMP_VERSION="gmp-6.2.1"
    40 NETTLE_VERSION="nettle-3.6"
     40NETTLE_VERSION="nettle-3."
    4141# NOTE: remember to also update LIB_URL below when changing version
    4242GLOOX_VERSION="gloox-1.0.24"
    43 GNUTLS_VERSION="gnutls-3.6.15"
     43GNUTLS_VERSION="gnutls-3."
    4444# OS X only includes part of ICU, and only the dylib
    4545# NOTE: remember to also update LIB_URL below when changing version
    … …  
    739739LIB_ARCHIVE="$LIB_VERSION.tar.xz"
    740740LIB_DIRECTORY="$LIB_VERSION"
    741 LIB_URL="https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/"
     741LIB_URL="https://www.gnupg.org/ftp/gcrypt/gnutls/v3./"
    742742
    743743mkdir -p gnutls
    … …  
    776776          --with-included-libtasn1 \
    777777          --without-p11-kit \
     778
    778779          --disable-tests \
    779780          --disable-guile \

  • ps/trunk/libraries/osx/patches/03-undo-libtasn1-cisdigit.patch

    r24258 r27667  
    55 #include <limits.h>
    66 #include <intprops.h>
    7 -#include <c-ctype.h>
     7-#include
    88 
    99 #ifdef DEBUG
    1010 # define warn() fprintf(stderr, "%s: %d\n", __func__, __LINE__)
    11 @@ -353,7 +352,7 @@
    12        p = &der[len_len];
    13        for (i=0;i<(unsigned)(str_len-1);i++)
    14           {
    15 -           if (c_isdigit(p[i]) == 0)
    16 +           if (isdigit(p[i]) == 0)
    17               {
    18                 if (type == ASN1_ETYPE_GENERALIZED_TIME)
    19                   {
     11@@ -35,7 @@
     12      p = &der[len_len];
     13      i++)
     14{
     15-(p[i]) == 0)
     16+(p[i]) == 0)
     17    {
     18      if (type == ASN1_ETYPE_GENERALIZED_TIME)
     19{
    2020--- a/lib/minitasn1/element.c
    2121+++ b/lib/minitasn1/element.c
    … …  
    106106+++ b/lib/minitasn1/int.h
    107107@@ -29,6 +29,7 @@
    108  #include <string.h>
    109  #include <stdlib.h>
    110  #include <stdio.h>
    111 +#include <ctype.h>
    112  #include <stdint.h>
    113  
    114  #ifdef HAVE_SYS_TYPES_H
     108 #include <string.h>
     109 #include <stdlib.h>
     110 #include <stdio.h>
     111+#include <ctype.h>
     112 #include <stdint.h>
     113
     114 #ifdef HAVE_SYS_TYPES_H
    115115--- a/lib/minitasn1/parser_aux.c
    116116+++ b/lib/minitasn1/parser_aux.c
Note: See TracChangeset for help on using the changeset viewer.