Fix [1da19a69f8]: Backspace crashes 9.0 interpreter on FreeBSD

tcltk · Jan 25, 2025 · 070f068 · 070f068
2 parents 7f5b66f + 72c796d
commit 070f068
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/generic/tkIcu.c b/generic/tkIcu.c
@@ -287,6 +287,11 @@ Icu_Init(
 	    icu_fns.name = (fn_icu_ ## name)				\
 		Tcl_FindSymbol(NULL, icu_fns.lib, symbol)
 	    ICU_SYM(open);
+	    if (!icu_fns.open && *icuversion) {
+		/* FreeBSD doesn't append the ICU version to the symbol name, see [1da19a69f8] */
+		*icuversion = 0;
+		ICU_SYM(open); /* try again without version suffix */
+	    }
 	    ICU_SYM(close);
 	    ICU_SYM(preceding);
 	    ICU_SYM(following);

diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c
@@ -52,7 +52,7 @@ TkplatformtestInit(
      */
 
     testsAreRunning = 1;
-      
+
     /*
      * Add commands for platform specific tests on MacOS here.
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,7 +52,7 @@ TkplatformtestInit( @@
          */
         testsAreRunning = 1;
         /*
          * Add commands for platform specific tests on MacOS here.
          */
@@ Expand Down @@