From 29e60c687602f1a2d297242ef0ab1a1a88e02d86 Mon Sep 17 00:00:00 2001 From: Allin Cottrell Date: Tue, 24 Dec 2024 15:31:52 -0500 Subject: [PATCH] adjustments for macos gnuplot update --- ChangeLog | 1 + gui/osx_env.c | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 47f57c8fe..064e7b709 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ version 2025a, in progress - "meantest" and "vartest" commands: support a variant where the second series is a dummy with which to split the first into two samples +- macOS builds: update gnuplot to version 6.0.2 2024-12-12 version 2024d - "append" command: make the help text more explicit diff --git a/gui/osx_env.c b/gui/osx_env.c index 5417e4c14..8af351459 100644 --- a/gui/osx_env.c +++ b/gui/osx_env.c @@ -10,16 +10,11 @@ void osx_setup_paths (void) { char userpath[MAXPATHLEN + 1]; char execpath[MAXPATHLEN + 1]; + const char *gpshare = "6.0"; uint32_t pathsz = sizeof execpath; gchar *tmp, *respath = NULL; char *c, *rhome; -#if GTK_MAJOR_VERSION == 3 - const char *gpshare = "6.0"; -#else - const char *gpshare = "5.4"; -#endif - /* record the initial working directory */ getcwd(userpath, sizeof userpath); setenv("GRETL_STARTDIR", userpath, 1);