[arch-commits] Commit in apm/trunk (5 files)
Nicola Squartini
tensor5 at archlinux.org
Fri Nov 29 14:26:11 UTC 2019
Date: Friday, November 29, 2019 @ 14:26:11
Author: tensor5
Revision: 534353
upgpkg: apm 2.4.5-1
Added:
apm/trunk/git-utils.patch
Modified:
apm/trunk/PKGBUILD
Deleted:
apm/trunk/0001-git-utils-nodejs-12-update.patch
apm/trunk/apm-nodejs-12-update.patch
apm/trunk/git-utils-nodejs-13.patch
---------------------------------------+
0001-git-utils-nodejs-12-update.patch | 273 --------------------------------
PKGBUILD | 37 +---
apm-nodejs-12-update.patch | 28 ---
git-utils-nodejs-13.patch | 186 ---------------------
git-utils.patch | 10 +
5 files changed, 22 insertions(+), 512 deletions(-)
Deleted: 0001-git-utils-nodejs-12-update.patch
===================================================================
--- 0001-git-utils-nodejs-12-update.patch 2019-11-29 14:09:44 UTC (rev 534352)
+++ 0001-git-utils-nodejs-12-update.patch 2019-11-29 14:26:11 UTC (rev 534353)
@@ -1,273 +0,0 @@
-From aea3de850594dba287083b6906312ff86ebf4867 Mon Sep 17 00:00:00 2001
-From: "Xl.W" <shawlix+git at gmail.com>
-Date: Thu, 22 Aug 2019 13:40:59 +0800
-Subject: [PATCH] git-utils: nodejs 12 update
-
----
- binding.gyp | 1 +
- package-lock.json | 2 +-
- package.json | 4 ++--
- src/repository.cc | 56 +++++++++++++++++++++++------------------------
- 4 files changed, 32 insertions(+), 31 deletions(-)
-
-diff --git a/binding.gyp b/binding.gyp
-index 71fafac..3bb9c0e 100644
---- a/binding.gyp
-+++ b/binding.gyp
-@@ -162,6 +162,7 @@
- 'deps/libgit2/src/message.h',
- 'deps/libgit2/src/mwindow.c',
- 'deps/libgit2/src/mwindow.h',
-+ 'deps/libgit2/src/net.c',
- 'deps/libgit2/src/netops.c',
- 'deps/libgit2/src/netops.h',
- 'deps/libgit2/src/notes.c',
-diff --git a/package-lock.json b/package-lock.json
-index c4ff155..9ca5d82 100644
---- a/package-lock.json
-+++ b/package-lock.json
-@@ -1595,7 +1595,7 @@
- "integrity": "sha1-uDx1fIAOaOHW78GjoaE/85/23NI=",
- "dev": true,
- "requires": {
-- "jasmine-node": "jasmine-node at git+https://github.com/kevinsawicki/jasmine-node.git#81af4f953a2b7dfb5bde8331c05362a4b464c5ef",
-+ "jasmine-node": "git+https://github.com/kevinsawicki/jasmine-node.git#81af4f953a2b7dfb5bde8331c05362a4b464c5ef",
- "underscore-plus": "1.x",
- "walkdir": "0.0.7"
- },
-diff --git a/package.json b/package.json
-index 93ea078..ec43547 100644
---- a/package.json
-+++ b/package.json
-@@ -36,8 +36,8 @@
- "wrench": "~1.4.4"
- },
- "dependencies": {
-- "nan": "^2.0.0",
-- "fs-plus": "^3.0.0"
-+ "fs-plus": "^3.0.0",
-+ "nan": "^2.14.0"
- },
- "scripts": {
- "prepublish": "standard src spec",
-diff --git a/src/repository.cc b/src/repository.cc
-index 103e2ba..4f9b423 100644
---- a/src/repository.cc
-+++ b/src/repository.cc
-@@ -64,7 +64,7 @@ void Repository::Init(Local<Object> target) {
- Nan::SetMethod(proto, "add", Repository::Add);
-
- target->Set(Nan::New<String>("Repository").ToLocalChecked(),
-- newTemplate->GetFunction());
-+ Nan::GetFunction(newTemplate).ToLocalChecked());
- }
-
- NODE_MODULE(git, Repository::Init)
-@@ -87,13 +87,13 @@ git_repository* Repository::GetAsyncRepository(Nan::NAN_METHOD_ARGS_TYPE args) {
-
- int Repository::GetBlob(Nan::NAN_METHOD_ARGS_TYPE args,
- git_repository* repo, git_blob*& blob) {
-- std::string path(*String::Utf8Value(args[0]));
-+ std::string path(*Nan::Utf8String(args[0]));
-
- int useIndex = false;
- if (args.Length() >= 3) {
- Local<Object> optionsArg(Local<Object>::Cast(args[2]));
-- if (optionsArg->Get(
-- Nan::New<String>("useIndex").ToLocalChecked())->BooleanValue())
-+ if (Nan::To<bool>(optionsArg->Get(
-+ Nan::New<String>("useIndex").ToLocalChecked())).FromJust())
- useIndex = true;
- }
-
-@@ -266,7 +266,7 @@ NAN_METHOD(Repository::IsIgnored) {
- return info.GetReturnValue().Set(Nan::New<Boolean>(false));
-
- git_repository* repository = GetRepository(info);
-- std::string path(*String::Utf8Value(info[0]));
-+ std::string path(*Nan::Utf8String(info[0]));
- int ignored;
- if (git_ignore_path_is_ignored(&ignored,
- repository,
-@@ -284,7 +284,7 @@ NAN_METHOD(Repository::IsSubmodule) {
- git_index* index;
- git_repository* repository = GetRepository(info);
- if (git_repository_index(&index, repository) == GIT_OK) {
-- std::string path(*String::Utf8Value(info[0]));
-+ std::string path(*Nan::Utf8String(info[0]));
- const git_index_entry* entry = git_index_get_bypath(index, path.c_str(), 0);
- Local<Boolean> isSubmodule = Nan::New<Boolean>(
- entry != NULL && (entry->mode & S_IFMT) == GIT_FILEMODE_COMMIT);
-@@ -305,7 +305,7 @@ NAN_METHOD(Repository::GetConfigValue) {
- if (git_repository_config_snapshot(&config, repository) != GIT_OK)
- return info.GetReturnValue().Set(Nan::Null());
-
-- std::string configKey(*String::Utf8Value(info[0]));
-+ std::string configKey(*Nan::Utf8String(info[0]));
- const char* configValue;
- if (git_config_get_string(
- &configValue, config, configKey.c_str()) == GIT_OK) {
-@@ -328,8 +328,8 @@ NAN_METHOD(Repository::SetConfigValue) {
- if (git_repository_config(&config, repository) != GIT_OK)
- return info.GetReturnValue().Set(Nan::New<Boolean>(false));
-
-- std::string configKey(*String::Utf8Value(info[0]));
-- std::string configValue(*String::Utf8Value(info[1]));
-+ std::string configKey(*Nan::Utf8String(info[0]));
-+ std::string configValue(*Nan::Utf8String(info[1]));
-
- int errorCode = git_config_set_string(
- config, configKey.c_str(), configValue.c_str());
-@@ -386,8 +386,8 @@ class StatusWorker {
- paths = reinterpret_cast<char **>(malloc(path_count * sizeof(char *)));
- for (unsigned i = 0; i < path_count; i++) {
- auto js_path = Local<String>::Cast(js_paths->Get(i));
-- paths[i] = reinterpret_cast<char *>(malloc(js_path->Utf8Length() + 1));
-- js_path->WriteUtf8(paths[i]);
-+ paths[i] = reinterpret_cast<char *>(malloc(Nan::Utf8String(js_path).length() + 1));
-+ js_path->WriteUtf8(v8::Isolate::GetCurrent(), paths[i]);
- }
- } else {
- paths = NULL;
-@@ -434,7 +434,7 @@ NAN_METHOD(Repository::GetStatus) {
-
- NAN_METHOD(Repository::GetStatusForPath) {
- git_repository* repository = GetRepository(info);
-- String::Utf8Value path(info[0]);
-+ Nan::Utf8String path(info[0]);
- unsigned int status = 0;
- if (git_status_file(&status, repository, *path) == GIT_OK)
- return info.GetReturnValue().Set(Nan::New<Number>(status));
-@@ -447,7 +447,7 @@ NAN_METHOD(Repository::CheckoutHead) {
- if (info.Length() < 1)
- return info.GetReturnValue().Set(Nan::New<Boolean>(false));
-
-- String::Utf8Value utf8Path(info[0]);
-+ Nan::Utf8String utf8Path(info[0]);
- char* path = *utf8Path;
-
- git_checkout_options options = GIT_CHECKOUT_OPTIONS_INIT;
-@@ -467,7 +467,7 @@ NAN_METHOD(Repository::GetReferenceTarget) {
- if (info.Length() < 1)
- return info.GetReturnValue().Set(Nan::Null());
-
-- std::string refName(*String::Utf8Value(info[0]));
-+ std::string refName(*Nan::Utf8String(info[0]));
- git_oid sha;
- if (git_reference_name_to_id(
- &sha, GetRepository(info), refName.c_str()) == GIT_OK) {
-@@ -512,7 +512,7 @@ NAN_METHOD(Repository::GetDiffStats) {
- if (treeStatus != GIT_OK)
- return info.GetReturnValue().Set(result);
-
-- String::Utf8Value utf8Path(info[0]);
-+ Nan::Utf8String utf8Path(info[0]);
- char* path = *utf8Path;
-
- git_diff_options options = CreateDefaultGitDiffOptions();
-@@ -573,7 +573,7 @@ NAN_METHOD(Repository::GetHeadBlob) {
- if (info.Length() < 1)
- return info.GetReturnValue().Set(Nan::Null());
-
-- std::string path(*String::Utf8Value(info[0]));
-+ std::string path(*Nan::Utf8String(info[0]));
-
- git_repository* repo = GetRepository(info);
- git_reference* head;
-@@ -619,7 +619,7 @@ NAN_METHOD(Repository::GetIndexBlob) {
- if (info.Length() < 1)
- return info.GetReturnValue().Set(Nan::Null());
-
-- std::string path(*String::Utf8Value(info[0]));
-+ std::string path(*Nan::Utf8String(info[0]));
-
- git_repository* repo = GetRepository(info);
- git_index* index;
-@@ -713,8 +713,8 @@ class CompareCommitsWorker {
-
- CompareCommitsWorker(git_repository *repository, Local<Value> js_left_id,
- Local<Value> js_right_id) : repository(repository) {
-- left_id = *String::Utf8Value(js_left_id);
-- right_id = *String::Utf8Value(js_right_id);
-+ left_id = *Nan::Utf8String(js_left_id);
-+ right_id = *Nan::Utf8String(js_right_id);
- }
- };
-
-@@ -772,7 +772,7 @@ NAN_METHOD(Repository::GetLineDiffs) {
- if (info.Length() < 2)
- return info.GetReturnValue().Set(Nan::Null());
-
-- std::string text(*String::Utf8Value(info[1]));
-+ std::string text(*Nan::Utf8String(info[1]));
-
- git_repository* repo = GetRepository(info);
-
-@@ -793,7 +793,7 @@ NAN_METHOD(Repository::GetLineDiffs) {
- ignoreEolWhitespace = optionsArg->Get(
- Nan::New<String>("ignoreEolWhitespace").ToLocalChecked());
-
-- if (ignoreEolWhitespace->BooleanValue())
-+ if (Nan::To<bool>(ignoreEolWhitespace).FromJust())
- options.flags = GIT_DIFF_IGNORE_WHITESPACE_EOL;
- }
-
-@@ -845,7 +845,7 @@ NAN_METHOD(Repository::GetLineDiffDetails) {
- if (info.Length() < 2)
- return info.GetReturnValue().Set(Nan::Null());
-
-- std::string text(*String::Utf8Value(info[1]));
-+ std::string text(*Nan::Utf8String(info[1]));
-
- git_repository* repo = GetRepository(info);
-
-@@ -866,7 +866,7 @@ NAN_METHOD(Repository::GetLineDiffDetails) {
- ignoreEolWhitespace = optionsArg->Get(
- Nan::New<String>("ignoreEolWhitespace").ToLocalChecked());
-
-- if (ignoreEolWhitespace->BooleanValue())
-+ if (Nan::To<bool>(ignoreEolWhitespace).FromJust())
- options.flags = GIT_DIFF_IGNORE_WHITESPACE_EOL;
- }
-
-@@ -971,12 +971,12 @@ NAN_METHOD(Repository::CheckoutReference) {
- return info.GetReturnValue().Set(Nan::New<Boolean>(false));
-
- bool shouldCreateNewRef;
-- if (info.Length() > 1 && info[1]->BooleanValue())
-+ if (info.Length() > 1 && Nan::To<bool>(info[1]).FromJust())
- shouldCreateNewRef = true;
- else
- shouldCreateNewRef = false;
-
-- std::string strRefName(*String::Utf8Value(info[0]));
-+ std::string strRefName(*Nan::Utf8String(info[0]));
- const char* refName = strRefName.c_str();
-
- git_repository* repo = GetRepository(info);
-@@ -1021,7 +1021,7 @@ NAN_METHOD(Repository::Add) {
- Nan::HandleScope scope;
-
- git_repository* repository = GetRepository(info);
-- std::string path(*String::Utf8Value(info[0]));
-+ std::string path(*Nan::Utf8String(info[0]));
-
- git_index* index;
- if (git_repository_index(&index, repository) != GIT_OK) {
-@@ -1057,11 +1057,11 @@ Repository::Repository(Local<String> path, Local<Boolean> search) {
- Nan::HandleScope scope;
-
- int flags = 0;
-- if (!search->BooleanValue()) {
-+ if (!Nan::To<bool>(search).FromJust()) {
- flags |= GIT_REPOSITORY_OPEN_NO_SEARCH;
- }
-
-- String::Utf8Value repository_path(path);
-+ Nan::Utf8String repository_path(path);
- int result = git_repository_open_ext(&repository, *repository_path, flags, NULL);
- if (result != GIT_OK) {
- repository = NULL;
---
-2.23.0
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-29 14:09:44 UTC (rev 534352)
+++ PKGBUILD 2019-11-29 14:26:11 UTC (rev 534353)
@@ -1,8 +1,8 @@
# Maintainer: Nicola Squartini <tensor5 at gmail.com>
pkgname=apm
-pkgver=2.4.3
-pkgrel=3
+pkgver=2.4.5
+pkgrel=1
pkgdesc='Atom package manager'
arch=('x86_64')
url='https://github.com/atom/apm'
@@ -15,21 +15,15 @@
options=(!emptydirs)
_gitutils_tag=5.6.1
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/apm/archive/v${pkgver}.tar.gz"
- "git+https://github.com/atom/git-utils#tag=v${_gitutils_tag}"
'apm.js'
'no-scripts.patch'
'use-system-npm.patch'
- '0001-git-utils-nodejs-12-update.patch'
- 'git-utils-nodejs-13.patch'
- 'apm-nodejs-12-update.patch')
-sha256sums=('cb57299f534b6b3422e17346be61b14577f062478d729fdb666af7660dcd2c40'
- 'SKIP'
+ 'git-utils.patch')
+sha256sums=('72487254ac0ee27074c7287c54cc922cc8f79cd1f9eed5bbf57c52792def8eb6'
'acbe133eb67d603e815605b1f3d9056a03bfc4a22a7e9db081126b289b385f77'
'897a82cd23ed5a4f226635dabe56ad28e533cb0949593e2b771ad7928c058bcb'
'cf17bd31f70079fe2a17958712c1a515ce83623dd3f97557a3f01d346da09f19'
- '06d3404160990aaaa7b1b18f50d566f4c98a0456ffeee57d583c5bc36f26755d'
- '0b6c2a371af1c8d581f91dfe0bd555840cf7ec9cca6ae813b29b1cd4929a5e43'
- '53c59f698809598b1afcf0c0a77bfeaa3dc113a73852af0def95b284162ee2fc')
+ 'd596792d82a10e40d9365d1357ca5b3aa75568c0c687313abdd72fe6af5f8aea')
_apmdir='/usr/lib/node_modules/atom-package-manager'
@@ -36,15 +30,8 @@
prepare() {
rm -rf "${srcdir}"/apm-build
- cd "${srcdir}"/git-utils
- git submodule update --init --recursive
- git apply ../0001-git-utils-nodejs-12-update.patch
- patch -Np1 -i ../git-utils-nodejs-13.patch
- npm install standard
- npm pack
+ cd apm-${pkgver}
- cd "${srcdir}"/apm-${pkgver}
-
# Use custom launcher
rm bin/apm{,.cmd} bin/npm{,.cmd}
rm src/cli.coffee
@@ -56,18 +43,20 @@
# Don't download binary Node
patch -Np1 -i "${srcdir}"/no-scripts.patch
rm BUNDLED_NODE_VERSION script/*
-
- # patch apm to support nodejs 12
- patch -Np1 -i "${srcdir}"/apm-nodejs-12-update.patch
}
build() {
cd apm-${pkgver}
+ npm update keytar # Node 12
npm install coffee-script
npx coffee -c --no-header -o lib src/*.coffee
rm -r node_modules
npm install --user root -g --prefix="${srcdir}"/apm-build/usr $(npm pack | tail -1)
+
+ cd "${srcdir}/apm-build/usr/lib/node_modules/atom-package-manager/node_modules/git-utils"
+ patch -Np1 -i "${srcdir}/git-utils.patch"
+ node-gyp rebuild
}
package() {
@@ -94,9 +83,7 @@
-or -name "*.bat" -exec rm '{}' \; \
-or -name "*.mk" -exec rm '{}' \; \
-or -path "*/git-utils/binding.gyp" -exec rm '{}' \; \
- -or -path "*/git-utils/*.tgz" -prune -exec rm -r '{}' \; \
- -or -path "*/git-utils/src/*.cc" -prune -exec rm -r '{}' \; \
- -or -path "*/git-utils/src/*.h" -prune -exec rm -r '{}' \; \
+ -or -path "*/git-utils/src/*.{cc,h}" -prune -exec rm -r '{}' \; \
-or -path "*/keytar/binding.gyp" -exec rm '{}' \; \
-or -path "*/keytar/src" -prune -exec rm -r '{}' \; \
-or -path "*/oniguruma/binding.gyp" -exec rm '{}' \; \
Deleted: apm-nodejs-12-update.patch
===================================================================
--- apm-nodejs-12-update.patch 2019-11-29 14:09:44 UTC (rev 534352)
+++ apm-nodejs-12-update.patch 2019-11-29 14:26:11 UTC (rev 534353)
@@ -1,28 +0,0 @@
-diff --git a/package.json b/package.json
-index 1537e3f..dcec344 100644
---- a/package.json
-+++ b/package.json
-@@ -19,11 +19,11 @@
- "asar-require": "0.3.0",
- "async": "~0.2.8",
- "colors": "~0.6.1",
-- "first-mate": "6.2.0",
-+ "first-mate": "7.4.0",
- "fs-plus": "2.x",
-- "git-utils": "^4.0",
-+ "git-utils": "file:../../git-utils/git-utils-5.6.1.tgz",
- "hosted-git-info": "^2.1.4",
-- "keytar": "^4.0",
-+ "keytar": "^4.13.0",
- "mv": "2.0.0",
- "ncp": "~0.5.1",
- "open": "0.0.5",
-@@ -41,7 +41,7 @@
- "yargs": "^3.23.0"
- },
- "devDependencies": {
-- "coffee-script": "^1.8.0",
-+ "coffee-script": "^1.12.7",
- "express": "^4.16.3",
- "grunt": "^1.0.3",
- "grunt-cli": "^1.2.0",
Deleted: git-utils-nodejs-13.patch
===================================================================
--- git-utils-nodejs-13.patch 2019-11-29 14:09:44 UTC (rev 534352)
+++ git-utils-nodejs-13.patch 2019-11-29 14:26:11 UTC (rev 534353)
@@ -1,186 +0,0 @@
-diff --git a/src/repository.cc b/src/repository.cc
-index 4f9b423..c6948d3 100644
---- a/src/repository.cc
-+++ b/src/repository.cc
-@@ -63,7 +63,7 @@ void Repository::Init(Local<Object> target) {
- Nan::SetMethod(proto, "checkoutRef", Repository::CheckoutReference);
- Nan::SetMethod(proto, "add", Repository::Add);
-
-- target->Set(Nan::New<String>("Repository").ToLocalChecked(),
-+ Nan::Set(target, Nan::New<String>("Repository").ToLocalChecked(),
- Nan::GetFunction(newTemplate).ToLocalChecked());
- }
-
-@@ -92,8 +92,8 @@ int Repository::GetBlob(Nan::NAN_METHOD_ARGS_TYPE args,
- int useIndex = false;
- if (args.Length() >= 3) {
- Local<Object> optionsArg(Local<Object>::Cast(args[2]));
-- if (Nan::To<bool>(optionsArg->Get(
-- Nan::New<String>("useIndex").ToLocalChecked())).FromJust())
-+ if (Nan::To<bool>(Nan::Get(optionsArg,
-+ Nan::New<String>("useIndex").ToLocalChecked()).ToLocalChecked()).FromJust())
- useIndex = true;
- }
-
-@@ -186,7 +186,7 @@ NAN_METHOD(Repository::GetSubmodulePaths) {
- git_submodule_foreach(repository, SubmoduleCallback, &paths);
- Local<Object> v8Paths = Nan::New<Array>(paths.size());
- for (size_t i = 0; i < paths.size(); i++)
-- v8Paths->Set(i, Nan::New<String>(paths[i].data()).ToLocalChecked());
-+ Nan::Set(v8Paths, i, Nan::New<String>(paths[i].data()).ToLocalChecked());
- info.GetReturnValue().Set(v8Paths);
- }
-
-@@ -368,7 +368,7 @@ class StatusWorker {
- if (code == GIT_OK) {
- Local<Object> result = Nan::New<Object>();
- for (auto iter = statuses.begin(), end = statuses.end(); iter != end; ++iter) {
-- result->Set(
-+ Nan::Set(result,
- Nan::New<String>(iter->first.c_str()).ToLocalChecked(),
- Nan::New<Number>(iter->second)
- );
-@@ -385,7 +385,7 @@ class StatusWorker {
- path_count = js_paths->Length();
- paths = reinterpret_cast<char **>(malloc(path_count * sizeof(char *)));
- for (unsigned i = 0; i < path_count; i++) {
-- auto js_path = Local<String>::Cast(js_paths->Get(i));
-+ auto js_path = Local<String>::Cast(Nan::Get(js_paths, i).ToLocalChecked());
- paths[i] = reinterpret_cast<char *>(malloc(Nan::Utf8String(js_path).length() + 1));
- js_path->WriteUtf8(v8::Isolate::GetCurrent(), paths[i]);
- }
-@@ -486,9 +486,9 @@ NAN_METHOD(Repository::GetDiffStats) {
- int added = 0;
- int deleted = 0;
- Local<Object> result = Nan::New<Object>();
-- result->Set(Nan::New<String>("added").ToLocalChecked(),
-+ Nan::Set(result, Nan::New<String>("added").ToLocalChecked(),
- Nan::New<Number>(added));
-- result->Set(Nan::New<String>("deleted").ToLocalChecked(),
-+ Nan::Set(result, Nan::New<String>("deleted").ToLocalChecked(),
- Nan::New<Number>(deleted));
-
- if (info.Length() < 1)
-@@ -560,9 +560,9 @@ NAN_METHOD(Repository::GetDiffStats) {
- }
- git_patch_free(patch);
-
-- result->Set(Nan::New<String>("added").ToLocalChecked(),
-+ Nan::Set(result, Nan::New<String>("added").ToLocalChecked(),
- Nan::New<Number>(added));
-- result->Set(Nan::New<String>("deleted").ToLocalChecked(),
-+ Nan::Set(result, Nan::New<String>("deleted").ToLocalChecked(),
- Nan::New<Number>(deleted));
-
- return info.GetReturnValue().Set(result);
-@@ -706,8 +706,8 @@ class CompareCommitsWorker {
-
- std::pair<Local<Value>, Local<Value>> Finish() {
- Local<Object> result = Nan::New<Object>();
-- result->Set(Nan::New("ahead").ToLocalChecked(), Nan::New<Integer>(ahead_count));
-- result->Set(Nan::New("behind").ToLocalChecked(), Nan::New<Integer>(behind_count));
-+ Nan::Set(result, Nan::New("ahead").ToLocalChecked(), Nan::New<Integer>(ahead_count));
-+ Nan::Set(result, Nan::New("behind").ToLocalChecked(), Nan::New<Integer>(behind_count));
- return {Nan::Null(), result};
- }
-
-@@ -790,8 +790,8 @@ NAN_METHOD(Repository::GetLineDiffs) {
- if (info.Length() >= 3) {
- Local<Object> optionsArg(Local<Object>::Cast(info[2]));
- Local<Value> ignoreEolWhitespace;
-- ignoreEolWhitespace = optionsArg->Get(
-- Nan::New<String>("ignoreEolWhitespace").ToLocalChecked());
-+ ignoreEolWhitespace = Nan::Get(optionsArg,
-+ Nan::New<String>("ignoreEolWhitespace").ToLocalChecked()).ToLocalChecked();
-
- if (Nan::To<bool>(ignoreEolWhitespace).FromJust())
- options.flags = GIT_DIFF_IGNORE_WHITESPACE_EOL;
-@@ -804,15 +804,15 @@ NAN_METHOD(Repository::GetLineDiffs) {
- Local<Object> v8Ranges = Nan::New<Array>(ranges.size());
- for (size_t i = 0; i < ranges.size(); i++) {
- Local<Object> v8Range = Nan::New<Object>();
-- v8Range->Set(Nan::New<String>("oldStart").ToLocalChecked(),
-+ Nan::Set(v8Range, Nan::New<String>("oldStart").ToLocalChecked(),
- Nan::New<Number>(ranges[i].old_start));
-- v8Range->Set(Nan::New<String>("oldLines").ToLocalChecked(),
-+ Nan::Set(v8Range, Nan::New<String>("oldLines").ToLocalChecked(),
- Nan::New<Number>(ranges[i].old_lines));
-- v8Range->Set(Nan::New<String>("newStart").ToLocalChecked(),
-+ Nan::Set(v8Range, Nan::New<String>("newStart").ToLocalChecked(),
- Nan::New<Number>(ranges[i].new_start));
-- v8Range->Set(Nan::New<String>("newLines").ToLocalChecked(),
-+ Nan::Set(v8Range, Nan::New<String>("newLines").ToLocalChecked(),
- Nan::New<Number>(ranges[i].new_lines));
-- v8Ranges->Set(i, v8Range);
-+ Nan::Set(v8Range, i, v8Range);
- }
- git_blob_free(blob);
- return info.GetReturnValue().Set(v8Ranges);
-@@ -863,8 +863,8 @@ NAN_METHOD(Repository::GetLineDiffDetails) {
- if (info.Length() >= 3) {
- Local<Object> optionsArg(Local<Object>::Cast(info[2]));
- Local<Value> ignoreEolWhitespace;
-- ignoreEolWhitespace = optionsArg->Get(
-- Nan::New<String>("ignoreEolWhitespace").ToLocalChecked());
-+ ignoreEolWhitespace = Nan::Get(optionsArg,
-+ Nan::New<String>("ignoreEolWhitespace").ToLocalChecked()).ToLocalChecked();
-
- if (Nan::To<bool>(ignoreEolWhitespace).FromJust())
- options.flags = GIT_DIFF_IGNORE_WHITESPACE_EOL;
-@@ -878,24 +878,24 @@ NAN_METHOD(Repository::GetLineDiffDetails) {
- for (size_t i = 0; i < lineDiffs.size(); i++) {
- Local<Object> v8Range = Nan::New<Object>();
-
-- v8Range->Set(Nan::New<String>("oldLineNumber").ToLocalChecked(),
-+ Nan::Set(v8Range, Nan::New<String>("oldLineNumber").ToLocalChecked(),
- Nan::New<Number>(lineDiffs[i].line.old_lineno));
-- v8Range->Set(Nan::New<String>("newLineNumber").ToLocalChecked(),
-+ Nan::Set(v8Range, Nan::New<String>("newLineNumber").ToLocalChecked(),
- Nan::New<Number>(lineDiffs[i].line.new_lineno));
-- v8Range->Set(Nan::New<String>("oldStart").ToLocalChecked(),
-+ Nan::Set(v8Range, Nan::New<String>("oldStart").ToLocalChecked(),
- Nan::New<Number>(lineDiffs[i].hunk.old_start));
-- v8Range->Set(Nan::New<String>("newStart").ToLocalChecked(),
-+ Nan::Set(v8Range, Nan::New<String>("newStart").ToLocalChecked(),
- Nan::New<Number>(lineDiffs[i].hunk.new_start));
-- v8Range->Set(Nan::New<String>("oldLines").ToLocalChecked(),
-+ Nan::Set(v8Range, Nan::New<String>("oldLines").ToLocalChecked(),
- Nan::New<Number>(lineDiffs[i].hunk.old_lines));
-- v8Range->Set(Nan::New<String>("newLines").ToLocalChecked(),
-+ Nan::Set(v8Range, Nan::New<String>("newLines").ToLocalChecked(),
- Nan::New<Number>(lineDiffs[i].hunk.new_lines));
-- v8Range->Set(Nan::New<String>("line").ToLocalChecked(),
-+ Nan::Set(v8Range, Nan::New<String>("line").ToLocalChecked(),
- Nan::New<String>(lineDiffs[i].line.content,
- lineDiffs[i].line.content_len)
- .ToLocalChecked());
-
-- v8Ranges->Set(i, v8Range);
-+ Nan::Set(v8Ranges, i, v8Range);
- }
- git_blob_free(blob);
- return info.GetReturnValue().Set(v8Ranges);
-@@ -910,7 +910,7 @@ Local<Value> Repository::ConvertStringVectorToV8Array(
- size_t i = 0, size = vector.size();
- Local<Object> array = Nan::New<Array>(size);
- for (i = 0; i < size; i++)
-- array->Set(i, Nan::New<String>(vector[i].c_str()).ToLocalChecked());
-+ Nan::Set(array, i, Nan::New<String>(vector[i].c_str()).ToLocalChecked());
-
- return array;
- }
-@@ -934,11 +934,11 @@ NAN_METHOD(Repository::GetReferences) {
-
- git_strarray_free(&strarray);
-
-- references->Set(Nan::New<String>("heads").ToLocalChecked(),
-+ Nan::Set(references, Nan::New<String>("heads").ToLocalChecked(),
- ConvertStringVectorToV8Array(heads));
-- references->Set(Nan::New<String>("remotes").ToLocalChecked(),
-+ Nan::Set(references, Nan::New<String>("remotes").ToLocalChecked(),
- ConvertStringVectorToV8Array(remotes));
-- references->Set(Nan::New<String>("tags").ToLocalChecked(),
-+ Nan::Set(references, Nan::New<String>("tags").ToLocalChecked(),
- ConvertStringVectorToV8Array(tags));
-
- info.GetReturnValue().Set(references);
Added: git-utils.patch
===================================================================
--- git-utils.patch (rev 0)
+++ git-utils.patch 2019-11-29 14:26:11 UTC (rev 534353)
@@ -0,0 +1,10 @@
+--- a/binding.gyp
++++ b/binding.gyp
+@@ -162,6 +162,7 @@
+ 'deps/libgit2/src/message.h',
+ 'deps/libgit2/src/mwindow.c',
+ 'deps/libgit2/src/mwindow.h',
++ 'deps/libgit2/src/net.c',
+ 'deps/libgit2/src/netops.c',
+ 'deps/libgit2/src/netops.h',
+ 'deps/libgit2/src/notes.c',
More information about the arch-commits
mailing list