From 65cc548fa2f1e9f1361898a7516543e109ef93df Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Mon, 10 Apr 2023 15:41:55 +0300
Subject: [PATCH 24/24] Set followtag for macos builds

See osdn #47604

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 fc_version                            | 1 +
 platforms/macos/homebrew-appbundle.sh | 6 +++++-
 translations/Strings.txt              | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/fc_version b/fc_version
index 3b09f06e0c..334f2c9d8b 100755
--- a/fc_version
+++ b/fc_version
@@ -52,6 +52,7 @@ fi
 # 5) Final.
 # Update DEFAULT_FOLLOW_TAG to "stable", and also
 # windows/installer_msys2/Makefile --with-followtag to "windows"
+# platforms/macos/homebrew-appbundle.sh -Dfollowtag to "macos"
 
 IS_DEVEL_VERSION=0
 IS_FREEZE_VERSION=0
diff --git a/platforms/macos/homebrew-appbundle.sh b/platforms/macos/homebrew-appbundle.sh
index 3454c3a376..2d0413da46 100755
--- a/platforms/macos/homebrew-appbundle.sh
+++ b/platforms/macos/homebrew-appbundle.sh
@@ -11,6 +11,9 @@
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
 
+# TODO: Remove this if not needed here, and if it IS needed,
+#       investigate why meson.build isn't using proper definition
+#       by itself.
 export CXXFLAGS=-std=c++17
 export CPPFLAGS="-I$(brew --prefix readline)/include"
 export LDFLAGS="-L$(brew --prefix icu4c)/lib -L$(brew --prefix readline)/lib"
@@ -77,7 +80,7 @@ if ! [ -e "${CONTENTSDIR}" ] ; then
 
 	VSTRING=`./fc_version`
 
-	# substitute VSTRING into Info.plist
+	# Substitute VSTRING into Info.plist
 	sed -i '' -e "s/VER/${VSTRING}/g" "${CONTENTSDIR}Info.plist"
 
 	if ! echo -n "APPL????" > "${CONTENTSDIR}PkgInfo" ; then
@@ -105,6 +108,7 @@ if ! meson setup .. \
        -Ddebug=false \
        -Dclients=gtk4,qt \
        -Dfcmp=qt \
+       -Dfollowtag=macos \
        -Dprefix="$CONTENTSDIR" ||
    ! ninja ||
    ! ninja install
diff --git a/translations/Strings.txt b/translations/Strings.txt
index 0186c5e007..6b0b3f4e21 100644
--- a/translations/Strings.txt
+++ b/translations/Strings.txt
@@ -14,6 +14,7 @@ added to gettext to get the translation.
 /* TRANS: Version tag name received from metaserver */
 _("?vertag:stable")
 _("?vertag:windows")
+_("?vertag:macos")
 _("?vertag:S3_0")
 _("?vertag:S3_1")
 _("?vertag:crosser")
-- 
2.39.2