mirror of
https://github.com/status-im/status-react.git
synced 2025-01-09 18:46:19 +00:00
ce69df19ac
fixes #19449 In this commit we change the way patches are applied. We no longer have to write patches in a patch phase like we used to, we can now place individual changes in a patch file inside the `patches` directory and they will be automatically applied. Because of this change we can get rid of forks and instead have those changes in patch files. To generate a patch file this make command can be used `make patch-file` This will open an interactive shell which will allow you to specify which file you want to patch and then wait till you make those changes and generate a patch for it. ``` make patch-file Configuring Nix shell for target 'default'... Enter the path of the file to patch: ./node_modules/is-glob/index.js File to patch: ./node_modules/is-glob/index.js Temporary directory created: /tmp/tmp-status-mobile-40bc588fa/tmp.xrXarXoTPZ Original file copied to temporary directory. Please make the necessary changes to the file: ./node_modules/is-glob/index.js Press any key when you are done with the changes... Generating patch file... Patch file created at /Users/siddarthkumar/code/status-im/PR/status-mobile/patches/index.js.patch Info: Please execute 'make run-clojure' to test if the patch file works as expected. ``` - Android - iOS
16 lines
573 B
Diff
Executable File
16 lines
573 B
Diff
Executable File
# Fix pod issue after upgrading to MacOS Sonoma and Xcode 15
|
|
# https://github.com/status-im/status-mobile/issues/17682
|
|
|
|
--- ./node_modules/react-native/scripts/ios-configure-glog.sh
|
|
+++ ./node_modules/react-native/scripts/ios-configure-glog-patched.sh
|
|
@@ -42,9 +42,6 @@
|
|
patch -p1 config.sub fix_glog_0.3.5_apple_silicon.patch
|
|
fi
|
|
|
|
-export CC="$(xcrun -find -sdk $PLATFORM_NAME cc) -arch $CURRENT_ARCH -isysroot $(xcrun -sdk $PLATFORM_NAME --show-sdk-path)"
|
|
-export CXX="$CC"
|
|
-
|
|
# Remove automake symlink if it exists
|
|
if [ -h "test-driver" ]; then
|
|
rm test-driver
|