From c147c222634b5c1c362878c9e5f6fe91c3f10443 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Sat, 10 Jan 2026 19:36:12 +0800
Subject: [PATCH] Fix pkg packaging

---
 Makefile                   | 21 ++++++++++++++++++---
 SFM.System/component.plist | 12 ++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 SFM.System/component.plist

diff --git a/Makefile b/Makefile
index 732d78d..9fd4d5c 100644
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,11 @@ release_macos_dmg: release_macos_dmg_apple release_macos_dmg_intel release_macos
 # PKG commands
 build_macos_pkg_apple: archive_macos_standalone_apple export_macos_standalone_apple
 	rm -f build/SFM-Apple.pkg
-	pkgbuild --component "build/SFM.System-arm64/SFM.app" \
+	rm -rf build/pkgroot-arm64
+	mkdir -p build/pkgroot-arm64
+	ditto "build/SFM.System-arm64/SFM.app" "build/pkgroot-arm64/SFM.app"
+	pkgbuild --root "build/pkgroot-arm64" \
+		--component-plist SFM.System/component.plist \
 		--identifier io.nekohasekai.sfavt.standalone \
 		--install-location /Applications \
 		build/component-arm64.pkg
@@ -143,11 +147,16 @@ build_macos_pkg_apple: archive_macos_standalone_apple export_macos_standalone_ap
 		--resources SFM.System/Resources \
 		--sign "$(INSTALLER_SIGN_IDENTITY)" \
 		build/SFM-Apple.pkg
+	rm -rf build/pkgroot-arm64
 	rm -f build/component-arm64.pkg
 
 build_macos_pkg_intel: archive_macos_standalone_intel export_macos_standalone_intel
 	rm -f build/SFM-Intel.pkg
-	pkgbuild --component "build/SFM.System-x86_64/SFM.app" \
+	rm -rf build/pkgroot-x86_64
+	mkdir -p build/pkgroot-x86_64
+	ditto "build/SFM.System-x86_64/SFM.app" "build/pkgroot-x86_64/SFM.app"
+	pkgbuild --root "build/pkgroot-x86_64" \
+		--component-plist SFM.System/component.plist \
 		--identifier io.nekohasekai.sfavt.standalone \
 		--install-location /Applications \
 		build/component-x86_64.pkg
@@ -156,11 +165,16 @@ build_macos_pkg_intel: archive_macos_standalone_intel export_macos_standalone_in
 		--resources SFM.System/Resources \
 		--sign "$(INSTALLER_SIGN_IDENTITY)" \
 		build/SFM-Intel.pkg
+	rm -rf build/pkgroot-x86_64
 	rm -f build/component-x86_64.pkg
 
 build_macos_pkg_universal: archive_macos_standalone_universal export_macos_standalone_universal
 	rm -f build/SFM-Universal.pkg
-	pkgbuild --component "build/SFM.System-universal/SFM.app" \
+	rm -rf build/pkgroot-universal
+	mkdir -p build/pkgroot-universal
+	ditto "build/SFM.System-universal/SFM.app" "build/pkgroot-universal/SFM.app"
+	pkgbuild --root "build/pkgroot-universal" \
+		--component-plist SFM.System/component.plist \
 		--identifier io.nekohasekai.sfavt.standalone \
 		--install-location /Applications \
 		build/component-universal.pkg
@@ -169,6 +183,7 @@ build_macos_pkg_universal: archive_macos_standalone_universal export_macos_stand
 		--resources SFM.System/Resources \
 		--sign "$(INSTALLER_SIGN_IDENTITY)" \
 		build/SFM-Universal.pkg
+	rm -rf build/pkgroot-universal
 	rm -f build/component-universal.pkg
 
 build_macos_pkg: build_macos_pkg_apple build_macos_pkg_intel build_macos_pkg_universal
diff --git a/SFM.System/component.plist b/SFM.System/component.plist
new file mode 100644
index 0000000..e986468
--- /dev/null
+++ b/SFM.System/component.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<dict>
+		<key>RootRelativeBundlePath</key>
+		<string>SFM.app</string>
+		<key>BundleIsRelocatable</key>
+		<false/>
+	</dict>
+</array>
+</plist>