fix macos

clang and homebrew needed some help

cleanups

Author: jcupitt

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - fix kplot on win
 - build polishing
+- more debug info in "about"
 
 ## 9.0.1 2025/02/24
 

src/ientry.c

@@ -155,9 +155,11 @@ ientry_set_property(GObject *object,
 {
 	iEntry *ientry = (iEntry *) object;
 
+	const char *text;
+
 	switch (prop_id) {
 	case PROP_TEXT:
-		const char *text = g_value_get_string(value);
+		text = g_value_get_string(value);
 		if (text &&
 			!g_str_equal(text, ientry->text)) {
 			VIPS_SETSTR(ientry->text, text);

src/main.c

@@ -47,7 +47,7 @@ gboolean main_option_time_save = FALSE;
 gboolean main_option_profile = FALSE;
 gboolean main_option_no_load_menus = FALSE;
 
-static const char *main_argv0 = NULL; /* argv[0] */
+const char *main_argv0 = NULL; /* argv[0] */
 
 static char prefix_buffer[VIPS_PATH_MAX];
 static gboolean prefix_valid = FALSE;
@@ -70,9 +70,36 @@ const char *
 get_prefix(void)
 {
 	if (!prefix_valid) {
+		g_autofree char *basename = g_path_get_basename(main_argv0);
+		g_autofree char *argv0_path = NULL;
+
 		const char *prefix;
 
-		if (!(prefix = vips_guess_prefix(main_argv0, "VIPSHOME"))) {
+		prefix = vips_guess_prefix(main_argv0, "VIPSHOME");
+
+		if (!prefix ||
+			!existsf("%s/share/nip4", prefix)) {
+			/* The libvips guesser failed to find our install area ... try
+			 * searching the path for our exe name.
+			 *
+			 * This can happen with homebrew, for example, where the
+			 * compile-time libvips prefix will not match the nip4 prefix.
+			 */
+			GSList *path = path_parse(g_getenv("PATH"));
+			argv0_path =
+				(char *) path_map(path, basename, (path_map_fn) g_strdup, NULL);
+			g_slist_free_full(g_steal_pointer(&path), g_free);
+
+			g_autofree char *trailing = g_strjoin("/", "bin", basename, NULL);
+			if (argv0_path &&
+				is_postfix(trailing, argv0_path))
+				argv0_path[strlen(argv0_path) - strlen(trailing)] = '\0';
+
+			prefix = argv0_path;
+		}
+
+		if (!prefix ||
+			!existsf("%s/share/nip4", prefix)) {
 			error_top(_("Unable to find install area"));
 			error_vips();
 

src/main.h

@@ -27,6 +27,7 @@ extern Watchgroup *main_watchgroup;
 extern Imageinfogroup *main_imageinfogroup;
 
 extern void *main_c_stack_base;
+extern const char *main_argv0;
 
 extern gboolean main_option_time_save;
 extern gboolean main_option_profile;

src/mainwindow.c

@@ -1012,7 +1012,6 @@ void
 mainwindow_about(Mainwindow *main, VipsBuf *buf)
 {
 	double sz = find_space(PATH_TMP);
-
 	if (sz < 0)
 		vips_buf_appendf(buf, _("no temp area\n"));
 	else {

src/matrixview.c

@@ -205,6 +205,9 @@ matrixview_grid_refresh(Matrixview *matrixview)
 {
 	Matrix *matrix = MATRIX(VOBJECT(matrixview)->iobject);
 
+	Tslider *tslider;
+	const char *label;
+
 	int i;
 	i = 0;
 	for (GSList *p = matrixview->items; p; p = p->next, i++) {
@@ -217,14 +220,13 @@ matrixview_grid_refresh(Matrixview *matrixview)
 			break;
 
 		case MATRIX_DISPLAY_SLIDER:
-			Tslider *tslider = TSLIDER(item);
+			tslider = TSLIDER(item);
 			tslider->value = matrix->value.coeff[i];
 			tslider->svalue = matrix->value.coeff[i];
 			tslider_changed(TSLIDER(item));
 			break;
 
 		case MATRIX_DISPLAY_TOGGLE:
-			const char *label;
 			switch ((int) matrix->value.coeff[i]) {
 			case 0:
 				label = "0";

src/tilesource.c

@@ -829,6 +829,7 @@ tilesource_set_property(GObject *object,
 {
 	Tilesource *tilesource = (Tilesource *) object;
 
+	TilesourceMode mode;
 	int i;
 	double d;
 	gboolean b;
@@ -843,7 +844,7 @@ tilesource_set_property(GObject *object,
 
 	switch (prop_id) {
 	case PROP_MODE:
-		TilesourceMode mode = g_value_get_enum(value);
+		mode = g_value_get_enum(value);
 		if (mode >= 0 &&
 			mode < TILESOURCE_MODE_LAST &&
 			tilesource->mode != mode) {

src/workspaceview.c

@@ -1009,6 +1009,9 @@ workspaceview_drag_begin(GtkEventControllerMotion *self,
 {
 	Workspaceview *wview = WORKSPACEVIEW(user_data);
 
+	Columnview *title;
+	Columnview *cview;
+
 #ifdef DEBUG_VERBOSE
 	printf("workspaceview_drag_begin: %g x %g\n", start_x, start_y);
 #endif /*DEBUG_VERBOSE*/
@@ -1017,13 +1020,11 @@ workspaceview_drag_begin(GtkEventControllerMotion *self,
 	case WVIEW_WAIT:
 		/* Search for a column titlebar we could be hitting.
 		 */
-		Columnview *title = workspaceview_find_columnview_title(wview,
-			start_x, start_y);
+		title = workspaceview_find_columnview_title(wview, start_x, start_y);
 
 		/* Search for a click on any part of a columnview.
 		 */
-		Columnview *cview = workspaceview_find_columnview(wview,
-			start_x, start_y);
+		cview = workspaceview_find_columnview(wview, start_x, start_y);
 
 		if (title) {
 			wview->drag_cview = title;