diff --git a/patches/react-native-reanimated+3.0.0-rc.3.patch b/patches/react-native-reanimated+3.0.0-rc.3.patch index f312fdc6488a..321bcc07419f 100644 --- a/patches/react-native-reanimated+3.0.0-rc.3.patch +++ b/patches/react-native-reanimated+3.0.0-rc.3.patch @@ -1,3 +1,35 @@ +diff --git a/node_modules/react-native-reanimated/RNReanimated.podspec b/node_modules/react-native-reanimated/RNReanimated.podspec +index 3205c93..c7f2821 100644 +--- a/node_modules/react-native-reanimated/RNReanimated.podspec ++++ b/node_modules/react-native-reanimated/RNReanimated.podspec +@@ -49,7 +49,12 @@ rescue + end + end + +-reactCommonDir = File.join(nodeModulesDir, "react-native", "ReactCommon") ++ ++# From: https://github.com/software-mansion/react-native-reanimated/pull/3701/files ++pods_root = Pod::Config.instance.project_pods_root ++react_native_common_dir_absolute = File.join(nodeModulesDir, 'react-native', 'ReactCommon') ++react_native_common_dir_relative = Pathname.new(react_native_common_dir_absolute).relative_path_from(pods_root).to_s ++reactCommonDir = react_native_common_dir_relative + + if isUserApp + libInstances = %x[find ../../ -name "package.json" | grep "/react-native-reanimated/package.json" | grep -v "/.yarn/"] +@@ -111,9 +116,10 @@ Pod::Spec.new do |s| + "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + } + s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags + ' -DHERMES_ENABLE_DEBUGGER' +- s.xcconfig = { +- "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\" \"#{reactCommonDir}\"", +- "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags + " " + fabric_flags } ++ s.xcconfig = { ++ "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/Headers/Public/React-hermes\" \"$(PODS_ROOT)/Headers/Public/hermes-engine\" \"$(PODS_ROOT)/#{reactCommonDir}\"", ++ "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags + " " + fabric_flags ++ } + + s.requires_arc = true + diff --git a/node_modules/react-native-reanimated/ios/REAModule.mm b/node_modules/react-native-reanimated/ios/REAModule.mm index e1cd2f4..8ba248d 100644 --- a/node_modules/react-native-reanimated/ios/REAModule.mm