-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #34119 from Expensify/marcaaron-patch-rn
Add patch for boost dependency to fix React Native native builds (cherry picked from commit 97d4acf)
- Loading branch information
Showing
3 changed files
with
53 additions
and
0 deletions.
There are no files selected for viewing
27 changes: 27 additions & 0 deletions
27
patches/react-native+0.72.4+005+fix-boost-dependency.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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. |
13 changes: 13 additions & 0 deletions
13
patches/react-native-reanimated+3.6.1+001+fix-boost-dependency.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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}" | ||
} |
13 changes: 13 additions & 0 deletions
13
patches/react-native-vision-camera+2.16.2+001+fix-boost-dependency.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" | ||
} |