Page MenuHomePhabricator
Files F3244848

D10833.id36713.diff
No OneTemporary
Actions

D10833.id36713.diff
View Options

diff --git a/native/ios/Podfile.lock b/native/ios/Podfile.lock
--- a/native/ios/Podfile.lock
+++ b/native/ios/Podfile.lock
@@ -942,7 +942,7 @@
SDWebImageSVGCoder: 6fc109f9c2a82ab44510fff410b88b1a6c271ee8
SDWebImageWebPCoder: 18503de6621dd2c420d680e33d46bf8e1d5169b0
SPTPersistentCache: df36ea46762d7cf026502bbb86a8b79d0080dff4
- SQLCipher-Amalgamation: 69d60dc6e030cbc9ac2372c772a52c1793c863f7
+ SQLCipher-Amalgamation: 6de66399dc47d77fd51b327c5daa8b70096ed319
Yoga: dc109b79db907f0f589fc423e991b09ec42d2295
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
diff --git a/native/package.json b/native/package.json
--- a/native/package.json
+++ b/native/package.json
@@ -50,7 +50,7 @@
},
"dependencies": {
"@commapp/expo-package": "0.0.1",
- "@commapp/sqlcipher-amalgamation": "^4.5.5-b",
+ "@commapp/sqlcipher-amalgamation": "^4.5.5-c",
"@ethersproject/shims": "^5.7.0",
"@expo/react-native-action-sheet": "^3.14.0",
"@expo/vector-icons": "^13.0.0",
diff --git a/patches/@commapp+sqlcipher-amalgamation+4.5.5-c.patch b/patches/@commapp+sqlcipher-amalgamation+4.5.5-c.patch
new file mode 100644
--- /dev/null
+++ b/patches/@commapp+sqlcipher-amalgamation+4.5.5-c.patch
@@ -0,0 +1,29 @@
+diff --git a/node_modules/@commapp/sqlcipher-amalgamation/SQLCipher-Amalgamation.podspec.json b/node_modules/@commapp/sqlcipher-amalgamation/SQLCipher-Amalgamation.podspec.json
+index 392f1cb..845ea56 100644
+--- a/node_modules/@commapp/sqlcipher-amalgamation/SQLCipher-Amalgamation.podspec.json
++++ b/node_modules/@commapp/sqlcipher-amalgamation/SQLCipher-Amalgamation.podspec.json
+@@ -27,15 +27,21 @@
+ "compiler_flags": [
+ "-DNDEBUG",
+ "-DSQLITE_HAS_CODEC",
+- "-DSQLITE_TEMP_STORE=2"
++ "-DSQLITE_TEMP_STORE=2",
++ "-DSQLITE_ENABLE_SESSION",
++ "-DSQLITE_ENABLE_PREUPDATE_HOOK"
+ ],
+ "name": "common",
+ "source_files": "src/sqlite3.{h,c}",
+ "header_dir": "src",
++ "public_header_files": "src/sqlite3.h",
+ "xcconfig": {
+- "USE_HEADERMAP": "NO",
++ "USE_HEADERMAP": "YES",
+ "GCC_PREPROCESSOR_DEFINITIONS": "$(inherited) SQLITE_HAS_CODEC=1 SQLITE_TEMP_STORE=2",
+- "OTHER_CFLAGS": "$(inherited) -DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2 -DSQLCIPHER_CRYPTO_OPENSSL"
++ "OTHER_CFLAGS": "$(inherited) -DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2 -DSQLCIPHER_CRYPTO_OPENSSL -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_PREUPDATE_HOOK"
++ },
++ "user_target_xcconfig" :{
++ "HEADER_SEARCH_PATHS": "$(SRCROOT)/../node_modules/@commapp/sqlcipher-amalgamation/src"
+ }
+ },
+ {
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -1471,10 +1471,10 @@
resolved "https://registry.yarnpkg.com/@commapp/opaque-ke-wasm/-/opaque-ke-wasm-0.0.3.tgz#789b7351e593932461858658c61da5c2de51dc03"
integrity sha512-K88XPRnwKmpRCQqU26R7w1Syflp9IB1Ets1UPXTB3roumLweiHG8Y7UA+LrlpzCYd+8d8Tukp7i+/h4OFfovUw==
-"@commapp/sqlcipher-amalgamation@^4.5.5-b":
- version "4.5.5-b"
- resolved "https://registry.yarnpkg.com/@commapp/sqlcipher-amalgamation/-/sqlcipher-amalgamation-4.5.5-b.tgz#8afec045848c092a877c63ee6d4ac887074b74f4"
- integrity sha512-gXqbW9aupJ6GNdKncX5bIaHeSzZVCwQmgcnK/iJnCfLEx/bg6XnSKc9y1zEQ87EmaS6WF/AWhF/ZBcV5x6JKoA==
+"@commapp/sqlcipher-amalgamation@^4.5.5-c":
+ version "4.5.5-c"
+ resolved "https://registry.yarnpkg.com/@commapp/sqlcipher-amalgamation/-/sqlcipher-amalgamation-4.5.5-c.tgz#a0421940239fad4b09efe3aa43ddf8977955415c"
+ integrity sha512-J9Hcbk0yQI/7ugQHcCbQ4rLltVlByjcsrmoX7FvgsDp3MD9DaL2wDeitiTfYVePO8zWemXrkWti8UJT1jj1WOw==
"@commapp/windowspush@file:desktop/addons/windows-pushnotifications":
version "0.0.1"

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 15, 3:04 PM (19 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2494631
Default Alt Text
D10833.id36713.diff (3 KB)

Event Timeline