c24c7a428a
With 1.41 release Atom has been switched to version 5.6 of git-utils package. This version has a bug with symbol resolving as it does not include new required C source files from libgit2 when building Node native module. This can be fixed by adding them to the gyp bindings of git-utils. As most of Atom packages are downloaded during building, the easiest way to modify them is to download them separately and ship as local packages. Signed-off-by: Alexander Lobakin <bloodyreaper@yandex.ru>
23 lines
1.1 KiB
Diff
23 lines
1.1 KiB
Diff
diff -Naurp0 a/package.json b/package.json
|
|
--- a/package.json 2019-12-13 22:07:42.000000000 +0300
|
|
+++ b/package.json 2019-12-19 13:26:20.083698872 +0300
|
|
@@ -67 +67 @@
|
|
- "git-utils": "5.6.1",
|
|
+ "git-utils": "file:packages/git-utils",
|
|
diff -Naurp0 a/package-lock.json b/package-lock.json
|
|
--- a/package-lock.json 2019-12-13 22:07:42.000000000 +0300
|
|
+++ b/package-lock.json 2019-12-19 16:45:30.215685265 +0300
|
|
@@ -3187,3 +3187 @@
|
|
- "version": "5.6.1",
|
|
- "resolved": "https://registry.npmjs.org/git-utils/-/git-utils-5.6.1.tgz",
|
|
- "integrity": "sha512-wDF7vSbH940NupuMFC87As0x/VSke51P7xTnkdSlk96YN3tzOagXzBUNq5Nq16KOVuMSxcGj1l3qHF5VXl39Ng==",
|
|
+ "version": "file:packages/git-utils",
|
|
@@ -5761 +5759 @@
|
|
- "git-utils": "^5.6.0",
|
|
+ "git-utils": "file:packages/git-utils",
|
|
diff -Naurp0 a/packages/git-utils/binding.gyp b/packages/git-utils/binding.gyp
|
|
--- a/packages/git-utils/binding.gyp 2019-06-20 18:40:36.000000000 +0300
|
|
+++ b/packages/git-utils/binding.gyp 2019-12-19 13:28:15.623981924 +0300
|
|
@@ -164,0 +165,2 @@
|
|
+ 'deps/libgit2/src/net.c',
|
|
+ 'deps/libgit2/src/net.h',
|