From 07e3f92b621464af884216366a9c8f4abbf81519 Mon Sep 17 00:00:00 2001
From: Stephan Witt <switt@lyx.org>
Date: Fri, 21 Feb 2020 09:45:09 +0100
Subject: [PATCH] Cleanup code signing of the LyX application bundle

(cherry picked from commit a47412b9de8feebc16f3878aceb591e57f6a5c33)
---
 development/LyX-Mac-binary-release.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh
index 5445e9b1c1..64d350ce7c 100644
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -880,9 +880,14 @@ code_sign() {
 	condir=$(content_directory "${target}"/lyx)
 	appdir=$(dirname "${condir}")
 	# have to sign frameworks first
+	for fwname in Aspell Hunspell LibMagic ; do
+		fwitem="${condir}"/$(framework_name "${fwname}")
+		if [ -d "${fwitem}" ]; then
+			codesign --verbose --force --sign "${CODESIGN_IDENTITY}" "${fwitem}"
+		fi
+	done
 	for csitem in \
 		"${condir}"/Frameworks/Qt*.framework/Versions/${QtFrameworkVersion} \
-		"${condir}"/Frameworks/*.framework/lib*.dylib \
 		"${condir}"/PlugIns/*/lib*.dylib \
 		"${condir}"/Library/Spotlight/* \
 		"${target}"/inkscape \
@@ -1060,7 +1065,7 @@ build_package() {
 if [ ${LyxOnlyPackage:-"no"} = "no" ]; then
 	build_lyx
 	convert_universal
-	test -n "${CODESIGN_IDENTITY}" && code_sign "${LYX_BUNDLE_PATH}"
 	copy_dictionaries
+	test -n "${CODESIGN_IDENTITY}" && code_sign "${LYX_BUNDLE_PATH}"
 fi
 build_package