Fix [https://core.tcl-lang.org/tcl/tktview/503c4c6f56|503c4c6f56]: Co…

…mpiled code fails to run on older macos. Remove unneeded include (since it's already in tkMacOSXPrivate.h)
tcltk · Jun 8, 2023 · a3eb1ed · a3eb1ed
1 parent 274946b
commit a3eb1ed
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/macosx/tkMacOSXFileTypes.c b/macosx/tkMacOSXFileTypes.c
@@ -25,9 +25,6 @@ without generating deprecation warnings.
 
 #include "tkMacOSXPrivate.h"
 #include "tkMacOSXFileTypes.h"
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 110000
-#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
-#endif
 
 #define CHARS_TO_OSTYPE(string) (OSType) string[0] << 24 | \
                                 (OSType) string[1] << 16 | \

diff --git a/unix/configure b/unix/configure
@@ -9333,7 +9333,7 @@ _ACEOF
 
     LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit -framework QuartzCore"
     if test -d "/System/Library/Frameworks/UniformTypeIdentifiers.framework"; then
-        LIBS="$LIBS -framework UniformTypeIdentifiers"
+        LIBS="$LIBS -weak_framework UniformTypeIdentifiers"
     fi
     EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c'
     TK_WINDOWINGSYSTEM=AQUA

diff --git a/unix/configure.in b/unix/configure.in
@@ -353,7 +353,7 @@ if test $tk_aqua = yes; then
     AC_DEFINE(MAC_OSX_TK, 1, [Are we building TkAqua?])
     LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit -framework QuartzCore"
     if test -d "/System/Library/Frameworks/UniformTypeIdentifiers.framework"; then
-        LIBS="$LIBS -framework UniformTypeIdentifiers"
+        LIBS="$LIBS -weak_framework UniformTypeIdentifiers"
     fi
     EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c'
     TK_WINDOWINGSYSTEM=AQUA