Skip to content

Commit 3576e7d

Browse files
fix: update patch so it is resolved
1 parent f5e0561 commit 3576e7d

File tree

1 file changed

+69
-46
lines changed

1 file changed

+69
-46
lines changed

tests/patches/react-native-macos+0.78.6.patch

Lines changed: 69 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/node_modules/react-native-macos/Libraries/Blob/BlobManager.js b/node_modules/react-native-macos/Libraries/Blob/BlobManager.js
2-
index f4c5ed3..f7afaf4 100644
2+
index f4c5ed374..f7afaf4e9 100644
33
--- a/node_modules/react-native-macos/Libraries/Blob/BlobManager.js
44
+++ b/node_modules/react-native-macos/Libraries/Blob/BlobManager.js
55
@@ -9,7 +9,7 @@
@@ -11,7 +11,7 @@ index f4c5ed3..f7afaf4 100644
1111
import NativeBlobModule from './NativeBlobModule';
1212
import invariant from 'invariant';
1313

14-
@@ -67,9 +67,11 @@ class BlobManager {
14+
@@ -67,9 +67,11 @@
1515
const blobId = uuidv4();
1616
const items = parts.map(part => {
1717
if (part instanceof ArrayBuffer || ArrayBuffer.isView(part)) {
@@ -26,7 +26,7 @@ index f4c5ed3..f7afaf4 100644
2626
}
2727
if (part instanceof Blob) {
2828
return {
29-
@@ -92,6 +94,7 @@ class BlobManager {
29+
@@ -92,6 +94,7 @@
3030
}, 0);
3131

3232
NativeBlobModule.createFromParts(items, blobId);
@@ -35,18 +35,18 @@ index f4c5ed3..f7afaf4 100644
3535
return BlobManager.createFromOptions({
3636
blobId,
3737
diff --git a/node_modules/react-native-macos/Libraries/Blob/RCTBlobManager.mm b/node_modules/react-native-macos/Libraries/Blob/RCTBlobManager.mm
38-
index 9d4cde7..c9e6a81 100755
38+
index 9d4cde7c4..304638bf1 100755
3939
--- a/node_modules/react-native-macos/Libraries/Blob/RCTBlobManager.mm
4040
+++ b/node_modules/react-native-macos/Libraries/Blob/RCTBlobManager.mm
41-
@@ -95,6 +95,7 @@ RCT_EXPORT_MODULE(BlobModule)
41+
@@ -95,6 +95,7 @@
4242
- (void)store:(NSData *)data withId:(NSString *)blobId
4343
{
4444
std::lock_guard<std::mutex> lock(_blobsMutex);
4545
+ //RCTLogError(@"RCTBlobManager store inside mutex storing blob id %@", blobId);
4646
_blobs[blobId] = data;
4747
}
4848

49-
@@ -117,9 +118,13 @@ RCT_EXPORT_MODULE(BlobModule)
49+
@@ -117,9 +118,13 @@
5050
NSData *data;
5151
{
5252
std::lock_guard<std::mutex> lock(_blobsMutex);
@@ -60,15 +60,15 @@ index 9d4cde7..c9e6a81 100755
6060
return nil;
6161
}
6262
if (offset != 0 || (size != -1 && size != data.length)) {
63-
@@ -156,6 +161,7 @@ RCT_EXPORT_MODULE(BlobModule)
63+
@@ -156,6 +161,7 @@
6464
- (void)remove:(NSString *)blobId
6565
{
6666
std::lock_guard<std::mutex> lock(_blobsMutex);
6767
+ //RCTLogError(@"RCTBlobManager remove inside mutex removing blob id %@", blobId);
6868
[_blobs removeObjectForKey:blobId];
6969
}
7070

71-
@@ -217,15 +223,19 @@ RCT_EXPORT_METHOD(createFromParts : (NSArray<NSDictionary<NSString *, id> *> *)p
71+
@@ -217,15 +223,19 @@
7272
}
7373
}
7474

@@ -88,10 +88,10 @@ index 9d4cde7..c9e6a81 100755
8888
});
8989
}
9090

91-
@@ -297,13 +307,30 @@ RCT_EXPORT_METHOD(release : (NSString *)blobId)
91+
@@ -297,13 +307,30 @@
9292
// @lint-ignore FBOBJCUNTYPEDCOLLECTION1
9393
NSDictionary *blob = [RCTConvert NSDictionary:data[@"blob"]];
94-
94+
9595
+ // FIXME so here - we checked that data[@"blob"] was non-nil in canHandleHandleNetworkingRequest
9696
+
9797
NSString *contentType = @"application/octet-stream";
@@ -121,10 +121,10 @@ index 9d4cde7..c9e6a81 100755
121121

122122
- (BOOL)canHandleNetworkingResponse:(NSString *)responseType
123123
diff --git a/node_modules/react-native-macos/Libraries/Network/RCTNetworking.mm b/node_modules/react-native-macos/Libraries/Network/RCTNetworking.mm
124-
index 80d8c30..b68a67e 100644
124+
index 80d8c3058..b68a67e77 100644
125125
--- a/node_modules/react-native-macos/Libraries/Network/RCTNetworking.mm
126126
+++ b/node_modules/react-native-macos/Libraries/Network/RCTNetworking.mm
127-
@@ -417,9 +417,19 @@ RCT_EXPORT_MODULE()
127+
@@ -417,9 +417,19 @@
128128
for (id<RCTNetworkingRequestHandler> handler in _requestHandlers) {
129129
if ([handler canHandleNetworkingRequest:query]) {
130130
// @lint-ignore FBOBJCUNTYPEDCOLLECTION1
@@ -148,25 +148,23 @@ index 80d8c30..b68a67e 100644
148148
}
149149
}
150150
diff --git a/node_modules/react-native-macos/third-party-podspecs/RCT-Folly.podspec b/node_modules/react-native-macos/third-party-podspecs/RCT-Folly.podspec
151-
index 18ac2ad..31b1597 100644
151+
index b3c60a50a..d0cd7d498 100644
152152
--- a/node_modules/react-native-macos/third-party-podspecs/RCT-Folly.podspec
153153
+++ b/node_modules/react-native-macos/third-party-podspecs/RCT-Folly.podspec
154-
@@ -23,7 +23,7 @@ Pod::Spec.new do |spec|
155-
spec.dependency 'boost'
154+
@@ -24,7 +24,7 @@
156155
spec.dependency 'DoubleConversion'
157156
spec.dependency 'glog'
158-
- spec.dependency "fast_float", "6.1.4"
157+
spec.dependency "fast_float", "6.1.4"
159158
- spec.dependency "fmt", "11.0.2"
160-
+ spec.dependency "fast_float", "6.1.4"
161159
+ spec.dependency "fmt", "12.1.0"
162160
spec.compiler_flags = folly_compiler_flags + ' -DFOLLY_HAVE_PTHREAD=1 -Wno-documentation -faligned-new'
163161
spec.source_files = 'folly/String.cpp',
164162
'folly/Conv.cpp',
165163
diff --git a/node_modules/react-native-macos/third-party-podspecs/fmt.podspec b/node_modules/react-native-macos/third-party-podspecs/fmt.podspec
166-
index 77f369c..d8f73df 100644
164+
index 2f38990e2..a40c5755e 100644
167165
--- a/node_modules/react-native-macos/third-party-podspecs/fmt.podspec
168166
+++ b/node_modules/react-native-macos/third-party-podspecs/fmt.podspec
169-
@@ -8,14 +8,14 @@ fmt_git_url = fmt_config[:git]
167+
@@ -8,14 +8,14 @@
170168

171169
Pod::Spec.new do |spec|
172170
spec.name = "fmt"
@@ -184,145 +182,170 @@ index 77f369c..d8f73df 100644
184182
spec.pod_target_xcconfig = {
185183
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
186184
diff --git a/node_modules/react-native-macos/React/CoreModules/React-CoreModules.podspec b/node_modules/react-native-macos/React/CoreModules/React-CoreModules.podspec
187-
index b9fbc6e..b0fd9db 100644
185+
index ca1136800..71eb7ce9e 100644
188186
--- a/node_modules/react-native-macos/React/CoreModules/React-CoreModules.podspec
189187
+++ b/node_modules/react-native-macos/React/CoreModules/React-CoreModules.podspec
190-
@@ -66,7 +66,7 @@ Pod::Spec.new do |s|
188+
@@ -65,7 +65,7 @@
189+
# macOS]
191190
s.dependency "DoubleConversion"
192191
s.dependency "fast_float", "6.1.4"
193192
- s.dependency "fmt", "11.0.2"
194193
+ s.dependency "fmt", "12.1.0"
195194
s.dependency "RCT-Folly", folly_version
196195
s.dependency "RCTTypeSafety", version
196+
s.dependency "React-Core/CoreModulesHeaders", version
197197
diff --git a/node_modules/react-native-macos/Libraries/Blob/React-RCTBlob.podspec b/node_modules/react-native-macos/Libraries/Blob/React-RCTBlob.podspec
198-
index e5e64ae..f37974c 100644
198+
index 9d758c174..6dfb3ab9d 100644
199199
--- a/node_modules/react-native-macos/Libraries/Blob/React-RCTBlob.podspec
200200
+++ b/node_modules/react-native-macos/Libraries/Blob/React-RCTBlob.podspec
201-
@@ -51,7 +51,7 @@ Pod::Spec.new do |s|
201+
@@ -50,7 +50,7 @@
202+
202203
s.dependency "DoubleConversion"
203204
s.dependency "fast_float", "6.1.4"
204205
- s.dependency "fmt", "11.0.2"
205206
+ s.dependency "fmt", "12.1.0"
206207
s.dependency "RCT-Folly", folly_version
207208
s.dependency "React-jsi"
209+
s.dependency "React-Core/RCTBlobHeaders"
208210
diff --git a/node_modules/react-native-macos/ReactCommon/react/renderer/graphics/React-graphics.podspec b/node_modules/react-native-macos/ReactCommon/react/renderer/graphics/React-graphics.podspec
209-
index 1c84ea6..4468691 100644
211+
index aa624ac25..77c33c774 100644
210212
--- a/node_modules/react-native-macos/ReactCommon/react/renderer/graphics/React-graphics.podspec
211213
+++ b/node_modules/react-native-macos/ReactCommon/react/renderer/graphics/React-graphics.podspec
212-
@@ -71,7 +71,7 @@ Pod::Spec.new do |s|
214+
@@ -70,7 +70,7 @@
215+
s.dependency "React-Core" # [macOS] Needed for RCTUIKit
213216
s.dependency "DoubleConversion"
214217
s.dependency "fast_float", "6.1.4"
215218
- s.dependency "fmt", "11.0.2"
216219
+ s.dependency "fmt", "12.1.0"
217-
220+
218221
if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
222+
s.dependency "hermes-engine"
219223
diff --git a/node_modules/react-native-macos/ReactCommon/react/renderer/debug/React-rendererdebug.podspec b/node_modules/react-native-macos/ReactCommon/react/renderer/debug/React-rendererdebug.podspec
220-
index 39b2409..b22a7cf 100644
224+
index 52dc39c87..834a33ab6 100644
221225
--- a/node_modules/react-native-macos/ReactCommon/react/renderer/debug/React-rendererdebug.podspec
222226
+++ b/node_modules/react-native-macos/ReactCommon/react/renderer/debug/React-rendererdebug.podspec
223-
@@ -60,7 +60,7 @@ Pod::Spec.new do |s|
227+
@@ -59,6 +59,6 @@
228+
s.dependency "RCT-Folly", folly_version
224229
s.dependency "DoubleConversion"
225230
s.dependency "fast_float", "6.1.4"
226231
- s.dependency "fmt", "11.0.2"
227232
+ s.dependency "fmt", "12.1.0"
228233
add_dependency(s, "React-debug")
229234
end
230235
diff --git a/node_modules/react-native-macos/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec b/node_modules/react-native-macos/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec
231-
index 12255cc..4b88d3a 100644
236+
index 68b579a7b..229b5baf6 100644
232237
--- a/node_modules/react-native-macos/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec
233238
+++ b/node_modules/react-native-macos/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec
234-
@@ -70,7 +70,7 @@ Pod::Spec.new do |s|
239+
@@ -69,7 +69,7 @@
240+
s.dependency "RCT-Folly"
235241
s.dependency "DoubleConversion"
236242
s.dependency "fast_float", "6.1.4"
237243
- s.dependency "fmt", "11.0.2"
238244
+ s.dependency "fmt", "12.1.0"
239245
s.dependency "React-Core"
240246
s.dependency "React-cxxreact"
247+
s.dependency "React-jsi"
241248
diff --git a/node_modules/react-native-macos/ReactCommon/hermes/React-hermes.podspec b/node_modules/react-native-macos/ReactCommon/hermes/React-hermes.podspec
242-
index 8962122..597e65d 100644
249+
index 3a072cf9d..bb87ec8d9 100644
243250
--- a/node_modules/react-native-macos/ReactCommon/hermes/React-hermes.podspec
244251
+++ b/node_modules/react-native-macos/ReactCommon/hermes/React-hermes.podspec
245-
@@ -49,7 +49,7 @@ Pod::Spec.new do |s|
252+
@@ -48,7 +48,7 @@
253+
s.dependency "RCT-Folly", folly_version
246254
s.dependency "DoubleConversion"
247255
s.dependency "fast_float", "6.1.4"
248256
- s.dependency "fmt", "11.0.2"
249257
+ s.dependency "fmt", "12.1.0"
250258
s.dependency "glog"
251259
s.dependency "hermes-engine"
260+
s.dependency "React-jsi"
252261
diff --git a/node_modules/react-native-macos/ReactCommon/cxxreact/React-cxxreact.podspec b/node_modules/react-native-macos/ReactCommon/cxxreact/React-cxxreact.podspec
253-
index 6a4c577..ee5f4a7 100644
262+
index 2f05b75b7..00c51f48f 100644
254263
--- a/node_modules/react-native-macos/ReactCommon/cxxreact/React-cxxreact.podspec
255264
+++ b/node_modules/react-native-macos/ReactCommon/cxxreact/React-cxxreact.podspec
256-
@@ -45,7 +45,7 @@ Pod::Spec.new do |s|
265+
@@ -44,7 +44,7 @@
266+
s.dependency "boost"
257267
s.dependency "DoubleConversion"
258268
s.dependency "fast_float", "6.1.4"
259269
- s.dependency "fmt", "11.0.2"
260270
+ s.dependency "fmt", "12.1.0"
261271
s.dependency "RCT-Folly", folly_version
262272
s.dependency "glog"
273+
add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')
263274
diff --git a/node_modules/react-native-macos/ReactCommon/jsi/React-jsi.podspec b/node_modules/react-native-macos/ReactCommon/jsi/React-jsi.podspec
264-
index 226de4e..51a8080 100644
275+
index fb3cbe955..dc84e5da7 100644
265276
--- a/node_modules/react-native-macos/ReactCommon/jsi/React-jsi.podspec
266277
+++ b/node_modules/react-native-macos/ReactCommon/jsi/React-jsi.podspec
267-
@@ -48,7 +48,7 @@ Pod::Spec.new do |s|
278+
@@ -47,7 +47,7 @@
279+
s.dependency "boost"
268280
s.dependency "DoubleConversion"
269281
s.dependency "fast_float", "6.1.4"
270282
- s.dependency "fmt", "11.0.2"
271283
+ s.dependency "fmt", "12.1.0"
272284
s.dependency "RCT-Folly", folly_version
273285
s.dependency "glog"
286+
274287
diff --git a/node_modules/react-native-macos/ReactCommon/jsiexecutor/React-jsiexecutor.podspec b/node_modules/react-native-macos/ReactCommon/jsiexecutor/React-jsiexecutor.podspec
275-
index 6147342..f05c64b 100644
288+
index 17641842b..5b1af8066 100644
276289
--- a/node_modules/react-native-macos/ReactCommon/jsiexecutor/React-jsiexecutor.podspec
277290
+++ b/node_modules/react-native-macos/ReactCommon/jsiexecutor/React-jsiexecutor.podspec
278-
@@ -44,7 +44,7 @@ Pod::Spec.new do |s|
291+
@@ -43,7 +43,7 @@
292+
s.dependency "RCT-Folly", folly_version
279293
s.dependency "DoubleConversion"
280294
s.dependency "fast_float", "6.1.4"
281295
- s.dependency "fmt", "11.0.2"
282296
+ s.dependency "fmt", "12.1.0"
283297
s.dependency "glog"
284298
add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')
299+
285300
diff --git a/node_modules/react-native-macos/ReactCommon/React-Fabric.podspec b/node_modules/react-native-macos/ReactCommon/React-Fabric.podspec
286-
index 7b85ec6..8366505 100644
301+
index 08b5134be..b0db245c3 100644
287302
--- a/node_modules/react-native-macos/ReactCommon/React-Fabric.podspec
288303
+++ b/node_modules/react-native-macos/ReactCommon/React-Fabric.podspec
289-
@@ -56,7 +56,7 @@ Pod::Spec.new do |s|
304+
@@ -55,7 +55,7 @@
305+
s.dependency "glog"
290306
s.dependency "DoubleConversion"
291307
s.dependency "fast_float", "6.1.4"
292308
- s.dependency "fmt", "11.0.2"
293309
+ s.dependency "fmt", "12.1.0"
294310
s.dependency "React-Core"
295311
s.dependency "React-debug"
312+
s.dependency "React-featureflags"
296313
diff --git a/node_modules/react-native-macos/ReactCommon/React-FabricComponents.podspec b/node_modules/react-native-macos/ReactCommon/React-FabricComponents.podspec
297-
index 2ef353a..c574f87 100644
314+
index 33f4dd2ff..0263c53a8 100644
298315
--- a/node_modules/react-native-macos/ReactCommon/React-FabricComponents.podspec
299316
+++ b/node_modules/react-native-macos/ReactCommon/React-FabricComponents.podspec
300-
@@ -78,7 +78,7 @@ Pod::Spec.new do |s|
317+
@@ -77,7 +77,7 @@
318+
s.dependency "glog"
301319
s.dependency "DoubleConversion"
302320
s.dependency "fast_float", "6.1.4"
303321
- s.dependency "fmt", "11.0.2"
304322
+ s.dependency "fmt", "12.1.0"
305323
s.dependency "React-Core"
306324
s.dependency "React-debug"
325+
s.dependency "React-featureflags"
307326
diff --git a/node_modules/react-native-macos/ReactCommon/React-FabricImage.podspec b/node_modules/react-native-macos/ReactCommon/React-FabricImage.podspec
308-
index f443661..20f9d7e 100644
327+
index 0fa0a4017..87ad5f8b1 100644
309328
--- a/node_modules/react-native-macos/ReactCommon/React-FabricImage.podspec
310329
+++ b/node_modules/react-native-macos/ReactCommon/React-FabricImage.podspec
311-
@@ -78,7 +78,7 @@ Pod::Spec.new do |s|
330+
@@ -77,7 +77,7 @@
331+
s.dependency "glog"
312332
s.dependency "DoubleConversion"
313333
s.dependency "fast_float", "6.1.4"
314334
- s.dependency "fmt", "11.0.2"
315335
+ s.dependency "fmt", "12.1.0"
316336
s.dependency "React-featureflags"
317337
s.dependency "React-utils"
338+
s.dependency "Yoga"
318339
diff --git a/node_modules/react-native-macos/ReactCommon/ReactCommon.podspec b/node_modules/react-native-macos/ReactCommon/ReactCommon.podspec
319-
index b61a654..14a6707 100644
340+
index a6020da9f..080372dfa 100644
320341
--- a/node_modules/react-native-macos/ReactCommon/ReactCommon.podspec
321342
+++ b/node_modules/react-native-macos/ReactCommon/ReactCommon.podspec
322-
@@ -56,7 +56,7 @@ Pod::Spec.new do |s|
343+
@@ -55,7 +55,7 @@
344+
ss.dependency "React-logger", version
323345
ss.dependency "DoubleConversion"
324346
ss.dependency "fast_float", "6.1.4"
325347
- ss.dependency "fmt", "11.0.2"
326348
+ ss.dependency "fmt", "12.1.0"
327349
ss.dependency "glog"
328350
if using_hermes
351+
ss.dependency "hermes-engine"

0 commit comments

Comments
 (0)