From 6fd8983e5baa197a3ef4e03d4557a9d5afeaaa5b Mon Sep 17 00:00:00 2001 From: Jack Nam <30609178+thienlnam@users.noreply.github.com> Date: Tue, 9 Jan 2024 12:00:16 +0800 Subject: [PATCH] Merge pull request #34119 from Expensify/marcaaron-patch-rn Add patch for boost dependency to fix React Native native builds (cherry picked from commit 97d4acf2099cc8ad7b121ac37ccf054b717bdc58) --- ...tive+0.72.4+005+fix-boost-dependency.patch | 27 +++++++++++++++++++ ...mated+3.6.1+001+fix-boost-dependency.patch | 13 +++++++++ ...mera+2.16.2+001+fix-boost-dependency.patch | 13 +++++++++ 3 files changed, 53 insertions(+) create mode 100644 patches/react-native+0.72.4+005+fix-boost-dependency.patch create mode 100644 patches/react-native-reanimated+3.6.1+001+fix-boost-dependency.patch create mode 100644 patches/react-native-vision-camera+2.16.2+001+fix-boost-dependency.patch diff --git a/patches/react-native+0.72.4+005+fix-boost-dependency.patch b/patches/react-native+0.72.4+005+fix-boost-dependency.patch new file mode 100644 index 000000000000..477cf97b4a02 --- /dev/null +++ b/patches/react-native+0.72.4+005+fix-boost-dependency.patch @@ -0,0 +1,27 @@ +diff --git a/node_modules/react-native/ReactAndroid/build.gradle b/node_modules/react-native/ReactAndroid/build.gradle +index f44b6e4..818833b 100644 +--- a/node_modules/react-native/ReactAndroid/build.gradle ++++ b/node_modules/react-native/ReactAndroid/build.gradle +@@ -243,7 +243,8 @@ task createNativeDepsDirectories { + } + + task downloadBoost(dependsOn: createNativeDepsDirectories, type: Download) { +- src("https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION.replace("_", ".")}/source/boost_${BOOST_VERSION}.tar.gz") ++ def transformedVersion = BOOST_VERSION.replace("_", ".") ++ src("https://archives.boost.io/release/${transformedVersion}/source/boost_${BOOST_VERSION}.tar.gz") + onlyIfModified(true) + overwrite(false) + retries(5) +diff --git a/node_modules/react-native/third-party-podspecs/boost.podspec b/node_modules/react-native/third-party-podspecs/boost.podspec +index 3d9331c..bbbb738 100644 +--- a/node_modules/react-native/third-party-podspecs/boost.podspec ++++ b/node_modules/react-native/third-party-podspecs/boost.podspec +@@ -10,7 +10,7 @@ Pod::Spec.new do |spec| + spec.homepage = 'http://www.boost.org' + spec.summary = 'Boost provides free peer-reviewed portable C++ source libraries.' + spec.authors = 'Rene Rivera' +- spec.source = { :http => 'https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2', ++ spec.source = { :http => 'https://archives.boost.io/release/1.76.0/source/boost_1_76_0.tar.bz2', + :sha256 => 'f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41' } + + # Pinning to the same version as React.podspec. diff --git a/patches/react-native-reanimated+3.6.1+001+fix-boost-dependency.patch b/patches/react-native-reanimated+3.6.1+001+fix-boost-dependency.patch new file mode 100644 index 000000000000..9a98cb7af85f --- /dev/null +++ b/patches/react-native-reanimated+3.6.1+001+fix-boost-dependency.patch @@ -0,0 +1,13 @@ +diff --git a/node_modules/react-native-reanimated/android/build.gradle b/node_modules/react-native-reanimated/android/build.gradle +index 3de90e5..42d9d1a 100644 +--- a/node_modules/react-native-reanimated/android/build.gradle ++++ b/node_modules/react-native-reanimated/android/build.gradle +@@ -567,7 +567,7 @@ if (REACT_NATIVE_MINOR_VERSION < 71) { + task downloadBoost(dependsOn: resolveBoost, type: Download) { + def transformedVersion = BOOST_VERSION.replace("_", ".") + def artifactLocalName = "boost_${BOOST_VERSION}.tar.gz" +- def srcUrl = "https://boostorg.jfrog.io/artifactory/main/release/${transformedVersion}/source/${artifactLocalName}" ++ def srcUrl = "https://archives.boost.io/release/${transformedVersion}/source/${artifactLocalName}" + if (REACT_NATIVE_MINOR_VERSION < 69) { + srcUrl = "https://github.com/react-native-community/boost-for-react-native/releases/download/v${transformedVersion}-0/${artifactLocalName}" + } diff --git a/patches/react-native-vision-camera+2.16.2+001+fix-boost-dependency.patch b/patches/react-native-vision-camera+2.16.2+001+fix-boost-dependency.patch new file mode 100644 index 000000000000..ef4fbf1d5084 --- /dev/null +++ b/patches/react-native-vision-camera+2.16.2+001+fix-boost-dependency.patch @@ -0,0 +1,13 @@ +diff --git a/node_modules/react-native-vision-camera/android/build.gradle b/node_modules/react-native-vision-camera/android/build.gradle +index d308e15..2d87d8e 100644 +--- a/node_modules/react-native-vision-camera/android/build.gradle ++++ b/node_modules/react-native-vision-camera/android/build.gradle +@@ -347,7 +347,7 @@ if (ENABLE_FRAME_PROCESSORS) { + + task downloadBoost(dependsOn: createNativeDepsDirectories, type: Download) { + def transformedVersion = BOOST_VERSION.replace("_", ".") +- def srcUrl = "https://boostorg.jfrog.io/artifactory/main/release/${transformedVersion}/source/boost_${BOOST_VERSION}.tar.gz" ++ def srcUrl = "https://archives.boost.io/release/${transformedVersion}/source/boost_${BOOST_VERSION}.tar.gz" + if (REACT_NATIVE_VERSION < 69) { + srcUrl = "https://github.com/react-native-community/boost-for-react-native/releases/download/v${transformedVersion}-0/boost_${BOOST_VERSION}.tar.gz" + }