From 401adfb9e97c716f08d8ea388080657e1b73bb5c Mon Sep 17 00:00:00 2001 From: Yee Cheng Chin Date: Tue, 2 Jan 2024 16:27:24 -0800 Subject: [PATCH] Fix MacVim configure scripts to parse Vim version without 0 patches Vim 9.1 just landed with 0 patches (i.e. 9.1.0) and existing configure scripts weren't set up to deal with this. --- src/auto/configure | 5 ++++- src/configure.ac | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/auto/configure b/src/auto/configure index 1e77636070..defa5c1df3 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -10700,9 +10700,12 @@ system ("touch conf.gtktest"); tmp_version = g_strdup("$min_gtk_version"); if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { printf("%s, bad version string\n", "$min_gtk_version"); + g_free(tmp_version); exit(1); } +g_free(tmp_version); + if ((gtk_major_version > major) || ((gtk_major_version == major) && (gtk_minor_version > minor)) || ((gtk_major_version == major) && (gtk_minor_version == minor) && @@ -16560,7 +16563,7 @@ fi vim_major_version_string=`/usr/bin/grep -m 1 'define.*VIM_VERSION_MAJOR' $srcdir/version.h|sed -E -e 's/^.*([0-9]+).*/\1/'` vim_minor_version_string=`/usr/bin/grep -m 1 'define.*VIM_VERSION_MINOR' $srcdir/version.h|sed -E -e 's/^.*([0-9]+).*/\1/'` - snapshot=`/usr/bin/grep -C2 "Add new patch number below this line" $srcdir/version.c|tail -1|sed -E -e 's/^ *([0-9]+),.*/\1/'` + snapshot=`/usr/bin/grep -C2 "Add new patch number below this line" $srcdir/version.c|tail -1|sed -E -e 's/^ *([0-9]+).*/\1/'` vim_short_version_string="$vim_major_version_string.$vim_minor_version_string.$snapshot" if echo "$vim_short_version_string" | /usr/bin/grep -q "^[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+$"; then diff --git a/src/configure.ac b/src/configure.ac index ae159f3a75..42ce2e8ccd 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -4894,7 +4894,7 @@ if test "x$MACOS_X" = "xyes"; then dnl Set CFBundleShortVersionString of Info.plist vim_major_version_string=`/usr/bin/grep -m 1 'define.*VIM_VERSION_MAJOR' $srcdir/version.h|sed -E -e 's/^.*([[0-9]]+).*/\1/'` vim_minor_version_string=`/usr/bin/grep -m 1 'define.*VIM_VERSION_MINOR' $srcdir/version.h|sed -E -e 's/^.*([[0-9]]+).*/\1/'` - snapshot=`/usr/bin/grep -C2 "Add new patch number below this line" $srcdir/version.c|tail -1|sed -E -e 's/^ *([[0-9]]+),.*/\1/'` + snapshot=`/usr/bin/grep -C2 "Add new patch number below this line" $srcdir/version.c|tail -1|sed -E -e 's/^ *([[0-9]]+).*/\1/'` vim_short_version_string="$vim_major_version_string.$vim_minor_version_string.$snapshot" if echo "$vim_short_version_string" | /usr/bin/grep -q "^[[[:digit:]]]\+\.[[[:digit:]]]\+\.[[[:digit:]]]\+$"; then