From e020c6eae066e44f98c8c013ffceede26d063183 Mon Sep 17 00:00:00 2001
From: "Jay Freeman (saurik)" <saurik@saurik.com>
Date: Wed, 7 Oct 2020 18:40:56 -0700
Subject: [PATCH] Add some small touch-ups to in_app_purchase patch.

---
 {app-shared => gui-orchid}/iap-ios-macos.patch |  0
 gui-orchid/ios/Podfile.lock                    |  2 +-
 gui-orchid/target.mk                           | 10 ++++------
 3 files changed, 5 insertions(+), 7 deletions(-)
 rename {app-shared => gui-orchid}/iap-ios-macos.patch (100%)

diff --git a/app-shared/iap-ios-macos.patch b/gui-orchid/iap-ios-macos.patch
similarity index 100%
rename from app-shared/iap-ios-macos.patch
rename to gui-orchid/iap-ios-macos.patch
diff --git a/gui-orchid/ios/Podfile.lock b/gui-orchid/ios/Podfile.lock
index c97cbc82f..5226d6d08 100644
--- a/gui-orchid/ios/Podfile.lock
+++ b/gui-orchid/ios/Podfile.lock
@@ -68,7 +68,7 @@ SPEC CHECKSUMS:
   barcode_scan: 33f586d02270046fc6559135038b34b5754eaa4f
   Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  in_app_purchase: ccb2f18b9eb7c3d04f7d3d994a1c2c88a59a573d
+  in_app_purchase: 3e2155afa9d03d4fa32d9e62d567885080ce97d6
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   shared_preferences: 430726339841afefe5142b9c1f50cb6bd7793e01
   shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
diff --git a/gui-orchid/target.mk b/gui-orchid/target.mk
index d6090789c..bec5ab31b 100644
--- a/gui-orchid/target.mk
+++ b/gui-orchid/target.mk
@@ -18,16 +18,14 @@
 # }}}
 
 
-shared/gui/in_app_purchase/pubspec.yaml: shared/gui/plugins/packages/in_app_purchase/pubspec.yaml shared/gui/target.mk
-	rsync -a --delete $(dir $<) $(dir $@)
+shared/gui/in_app_purchase/pubspec.yaml: $(call head,shared/gui/plugins) shared/gui/target.mk shared/gui/iap-ios-macos.patch
+	rsync -a --delete shared/gui/plugins/packages/in_app_purchase/ $(dir $@)
 	rsync -a --delete $(dir $@){ios,macos}/
 	sed -ie 's@Flutter/Flutter@FlutterMacOS/FlutterMacOS@g' $(dir $@)macos/Classes/*.[hm]
 	sed -ie 's/Platform\.isIOS/Platform.isIOS || Platform.isMacOS/g' $(dir $@)lib/src/in_app_purchase/in_app_purchase_connection.dart
 	sed -ie "s/'Flutter'/'FlutterMacOS'/g; s/:ios, '[^']*'/:osx, '10.11'/g; s/, 'VALID_ARCHS' => '[^']*'//g" $(dir $@)macos/*.podspec
 	sed -ie 'x;/./{G;};x;/^ *ios:/h;/^$$/{x;s/ios:/macos:/g;}' $(dir $@)pubspec.yaml
-	#git apply --directory=$(dir $@)ios ../app-shared/iap-ios-macos.patch
-	#git apply --directory=$(dir $@)macos ../app-shared/iap-ios-macos.patch
-	cd in_app_purchase/ios && git apply --verbose ../../../app-shared/iap-ios-macos.patch
-	cd in_app_purchase/macos && git apply --verbose ../../../app-shared/iap-ios-macos.patch
+	cd $(dir $@) && git apply --directory=ios $(CURDIR)/shared/gui/iap-ios-macos.patch
+	cd $(dir $@) && git apply --directory=macos $(CURDIR)/shared/gui/iap-ios-macos.patch
 	@touch $@
 forks += shared/gui/in_app_purchase/pubspec.yaml