Skip to content

Commit

Permalink
Remove a lot of stuff meant for macOS < 10.9
Browse files Browse the repository at this point in the history
  • Loading branch information
jan.nijtmans committed Oct 14, 2024
1 parent c1b0cc0 commit df141fa
Show file tree
Hide file tree
Showing 21 changed files with 39 additions and 6,478 deletions.
2 changes: 1 addition & 1 deletion changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ writing Tcl scripts containing Tk commands.
## Many improvements to use of platform features and conventions.
- Built-in widgets and themes are scaling-aware.
- Improved support of two-finger gestures, where available
- The `tk windowingsystem` "aqua" needs macOS 10.10 or later
- The `tk windowingsystem` "aqua" needs macOS 10.9 or later

## New commands and options
- `tk sysnotify`: access to the OS notifications system
Expand Down
1 change: 0 additions & 1 deletion generic/tk.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ extern "C" {
* unix/configure.ac (2 LOC Major, 2 LOC minor, 1 LOC patch)
* win/configure.ac (as above)
* README.md (sections 0 and 1)
* macosx/Tk-Common.xcconfig (not patchlevel) 1 LOC
* win/README (not patchlevel)
* unix/README (not patchlevel)
* unix/tk.spec (1 LOC patch)
Expand Down
4 changes: 2 additions & 2 deletions generic/tkColor.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ Tk_AllocColorFromObj(
* This is a stale reference: it refers to a TkColor that's no
* longer in use. Clear the reference.
*/

FreeColorObj(objPtr);
tkColPtr = NULL;
} else if ((Tk_Screen(tkwin) == tkColPtr->screen)
Expand All @@ -129,7 +128,7 @@ Tk_AllocColorFromObj(

/*
* The object didn't point to the TkColor that we wanted. Search the list
* of TkColors with the same name to see if one of the other TkColors is
* of TkColors with the same name to see if one of the saved TkColors is
* the right one.
*/

Expand All @@ -156,6 +155,7 @@ Tk_AllocColorFromObj(
tkColPtr = (TkColor *)Tk_GetColor(interp, tkwin, Tcl_GetString(objPtr));
objPtr->internalRep.twoPtrValue.ptr1 = tkColPtr;
if (tkColPtr != NULL) {
/* The resourceRefCount is incremented by Tk_GetColor. */
tkColPtr->objRefCount++;
}
return (XColor *) tkColPtr;
Expand Down
11 changes: 2 additions & 9 deletions macosx/README
Original file line number Diff line number Diff line change
Expand Up @@ -366,13 +366,6 @@ need to manually change the TCL_SRCROOT and TK_SRCROOT settings by editing your
${USER}.pbxuser file (located inside the Tk.xcodeproj bundle directory) with a
text editor.

- To enable weak-linking, set the MACOSX_DEPLOYMENT_TARGET environment variable
to the minimal OS version the binaries should be able to run on, e.g:
export MACOSX_DEPLOYMENT_TARGET=10.6
This requires at least gcc 3.1; with gcc 4 or later, set/add to CFLAGS instead:
export CFLAGS="-mmacosx-version-min=10.6"
Support for weak-linking was added with 8.4.14/8.5a5.

Detailed Instructions for building with macosx/GNUmakefile
----------------------------------------------------------

Expand All @@ -390,8 +383,8 @@ Tcl/Tk version number, e.g. '8.7').
Setup this shell variable as follows:
ver="8.7"

- Setup environment variables as desired, e.g. for a universal build on 10.5:
CFLAGS="-arch x86_64 -arch arm64 -mmacosx-version-min=10.5"
- Setup environment variables as desired, e.g. for a universal build on 10.9:
CFLAGS="-arch x86_64 -arch arm64 -mmacosx-version-min=10.9"
export CFLAGS

- Change to the directory containing the Tcl and Tk source trees and build:
Expand Down
45 changes: 0 additions & 45 deletions macosx/Tk-Common.xcconfig

This file was deleted.

19 changes: 0 additions & 19 deletions macosx/Tk-Debug.xcconfig

This file was deleted.

19 changes: 0 additions & 19 deletions macosx/Tk-Release.xcconfig

This file was deleted.

Loading

0 comments on commit df141fa

Please sign in to comment.