File signal-desktop-better-sqlite3-dependencies.patch of Package signal-desktop

Overview Repositories Revisions Requests Users Attributes Meta

File signal-desktop-better-sqlite3-dependencies.patch of Package signal-desktop

- Link with system copy of openssl
- Correct path to signal-fts5-tokenizer

Index: Signal-Desktop-5.40.1/node_modules/better-sqlite3/deps/sqlite3.gyp
===================================================================
--- Signal-Desktop-5.40.1.orig/node_modules/@signalapp/better-sqlite3/deps/sqlite3.gyp	2022-04-26 19:46:05.726776422 +0200
+++ Signal-Desktop-5.40.1/node_modules/@signalapp/better-sqlite3/deps/sqlite3.gyp	2022-04-26 19:46:59.242083847 +0200
@@ -56,12 +56,10 @@
       'sources': ['<(SHARED_INTERMEDIATE_DIR)/sqlite3/sqlite3.c'],
       'include_dirs': [
         '<(SHARED_INTERMEDIATE_DIR)/sqlite3/',
-        '<(SHARED_INTERMEDIATE_DIR)/sqlite3/openssl-include',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '<(SHARED_INTERMEDIATE_DIR)/sqlite3/',
-          '<(SHARED_INTERMEDIATE_DIR)/sqlite3/openssl-include',
           '<(SHARED_INTERMEDIATE_DIR)/sqlite3/signal-tokenizer/include',
         ],
       },
@@ -103,9 +103,10 @@
         { # Linux
           'link_settings': {
             'libraries': [
-              # This statically links libcrypto, whereas -lcrypto would dynamically link it
-              '<(SHARED_INTERMEDIATE_DIR)/sqlite3/OpenSSL-linux-<(target_arch)/libcrypto.a',
-              '<(SHARED_INTERMEDIATE_DIR)/sqlite3/signal-tokenizer/>(rust_arch)-unknown-linux-gnu/libsignal_tokenizer.a',
+              '-lcrypto',
+              '-Wl,-u,signal_fts5_tokenize', #ld seems to have a bug reordering objects when mixing LTO toolchains
+              '-lm', '-lgcc_s', '-lpthread', '-lc', #ensure rust libcompiler-builtins does not accidentally shadow system symbols
+              '<(SHARED_INTERMEDIATE_DIR)/sqlite3/signal-tokenizer/target/release/libsignal_tokenizer.a',
             ]
           }
         }],

Places

File signal-desktop-better-sqlite3-dependencies.patch of Package signal-desktop

Places