-
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
net-im/element-desktop: bump to 1.11.14
- Loading branch information
Showing
7 changed files
with
94 additions
and
41 deletions.
There are no files selected for viewing
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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| DIST element-desktop-1.11.13.tar.gz 2013021 BLAKE2B b4345dab5bf697427a20423864e1aeacd66c156970e98f4af04e3015c8df781a04ab4fbb7c1dd34515aa09c666e111f13648ae8eddc314de534aa7bf8a46f295 SHA512 b40b6971acecc2cea9e7f4a5335ce5a317971502a0fb5b1b46815c15ccea63bee82e538a58dbc2e050083bb858f990c229b7ceb5361811b96dd07f076194275c | ||
| DIST element-desktop-1.11.14.tar.gz 2010513 BLAKE2B 45be06b1e389f394d0c990ff65566aa7a1211a24db3e43176c59fcb1b2f6b14f2513508e74ee3da630e7bf8d118ab4925f40d5bd94066dac5c293d1f48d3a173 SHA512 4eda9ba41b310cae5c57cceff32317a87d3300a0c7be200007408283b7928a806cb7f474b8275ac6cd7d8cc661debd9de7e3ba37bcb277a510528f606bea478c |
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
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,19 @@ | ||
| --- a/node_modules/node-gyp/gyp/gyp_main.py 2022-11-16 14:17:56.957243192 +0100 | ||
| +++ b/node_modules/node-gyp/gyp/gyp_main.py 2022-11-16 14:20:42.203568020 +0100 | ||
| @@ -42,4 +42,16 @@ | ||
| import gyp # noqa: E402 | ||
|
|
||
| if __name__ == "__main__": | ||
| + # really ugly workaround fix for https://github.com/nodejs/node-gyp/issues/2750 | ||
| + # roughly the same as https://github.com/nodejs/node/pull/45076 | ||
| + savepwd = os.getcwd() | ||
| + | ||
| + import glob | ||
| + # go to the funny electron-headers directory in the homedir | ||
| + os.chdir(os.environ["HOME"]) | ||
| + os.chdir(glob.glob(".electron-gyp/*/.")[0]) | ||
| + subprocess.run("patch -p1 -i ${FILESDIR}/ignore_openssl_fips.patch", shell=True) | ||
| + | ||
| + os.chdir(savepwd) | ||
| + | ||
| sys.exit(gyp.script_main()) |
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 @@ | ||
| --- a/hak/keytar/build.ts 2022-11-16 13:53:20.727247977 +0100 | ||
| +++ b/hak/keytar/build.ts 2022-11-16 13:53:22.857327151 +0100 | ||
| @@ -23,6 +23,24 @@ | ||
| export default async function buildKeytar(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> { | ||
| const env = hakEnv.makeGypEnv(); | ||
|
|
||
| + // patch gyp so it patches the node-headers file | ||
| + // we have to do it here because node-gyp is fetched independently of the | ||
| + // yarn install run in the ebuild's src_prepare phase wtf | ||
| + console.log("Patching node-gyp to patch node headers in " + moduleInfo.moduleBuildDir); | ||
| + await new Promise<void>((resolve, reject) => { | ||
| + const proc = childProcess.spawn( | ||
| + 'sh', | ||
| + ['-c', 'patch -p1 -i ${FILESDIR}/gyp_apply_patch.patch'], | ||
| + { | ||
| + stdio: 'inherit', | ||
| + cwd: moduleInfo.moduleBuildDir, | ||
| + }, | ||
| + ); | ||
| + proc.on('exit', code => { | ||
| + code ? reject(code) : resolve(); | ||
| + }); | ||
| + }); | ||
| + | ||
| console.log("Running yarn with env", env); | ||
| await new Promise<void>((resolve, reject) => { | ||
| const proc = childProcess.spawn( |
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,22 @@ | ||
| --- a/include/node/common.gypi 2022-11-16 12:59:09.485683884 +0100 | ||
| +++ b/include/node/common.gypi 2022-11-16 13:16:32.245949353 +0100 | ||
| @@ -30,6 +30,7 @@ | ||
|
|
||
| 'openssl_fips%': '', | ||
| 'openssl_no_asm%': 0, | ||
| + 'openssl_product': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)', | ||
|
|
||
| # Don't use ICU data file (icudtl.dat) from V8, we use our own. | ||
| 'icu_use_data_file_flag%': 0, | ||
| @@ -123,11 +124,6 @@ | ||
| 'obj_dir%': '<(PRODUCT_DIR)/obj.target', | ||
| 'v8_base': '<(PRODUCT_DIR)/obj.target/tools/v8_gypfiles/libv8_snapshot.a', | ||
| }], | ||
| - ['openssl_fips != ""', { | ||
| - 'openssl_product': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)', | ||
| - }, { | ||
| - 'openssl_product': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)', | ||
| - }], | ||
| ['OS=="mac"', { | ||
| 'clang%': 1, | ||
| 'obj_dir%': '<(PRODUCT_DIR)/obj.target', |
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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| DIST element-web-1.11.13.tar.gz 1469294 BLAKE2B 7af37353e80bdc93ad5855095f7482c61258675915f6098f5f82d64a5298be0daa8277868d9eb6114837e0a0d7d261e8186426deaad51f9c9ec3e2e48f05cd29 SHA512 7a7a04bf7adf9ba4b347dd41d24f2884f033b00f22024a48b4d4387d80758219b75f5105507879f9400520b98f3686ec6cb755fd8be9b5ea46648b8d170ad183 | ||
| DIST element-web-1.11.14.tar.gz 1471851 BLAKE2B 400ff431b9ca861f56c31713db9216f5ded8f40fad528bb8c01bd665843f91d3c887e78e200b4eec9ffbd2a3e094bcf29276f1eb07ef08901a526d87eebc9434 SHA512 de958749c7ccd27648eac270618f6d0912af7d70d7925e3defc6f00274b0f195f3a22b821115f5754d9f0172e992cf4c51dad313adb323b2a804cfd115eb3835 |
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