Add some small touch-ups to in_app_purchase patch.

OrchidTechnologies · Oct 8, 2020 · e020c6e · e020c6e
1 parent d0b5f48
commit e020c6e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/app-shared/iap-ios-macos.patch → gui-orchid/iap-ios-macos.patch b/app-shared/iap-ios-macos.patch → gui-orchid/iap-ios-macos.patch
diff --git 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
@@ -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