[arch-commits] Commit in apm/trunk (PKGBUILD git-utils-nodejs-13.patch)
Evangelos Foutras
foutrelis at archlinux.org
Wed Nov 13 12:54:05 UTC 2019
Date: Wednesday, November 13, 2019 @ 12:54:04
Author: foutrelis
Revision: 527149
upgpkg: apm 2.4.3-3
rebuild with nodejs 13
Added:
apm/trunk/git-utils-nodejs-13.patch
Modified:
apm/trunk/PKGBUILD
---------------------------+
PKGBUILD | 5 -
git-utils-nodejs-13.patch | 186 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 190 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-13 11:11:05 UTC (rev 527148)
+++ PKGBUILD 2019-11-13 12:54:04 UTC (rev 527149)
@@ -2,7 +2,7 @@
pkgname=apm
pkgver=2.4.3
-pkgrel=2
+pkgrel=3
pkgdesc='Atom package manager'
arch=('x86_64')
url='https://github.com/atom/apm'
@@ -20,6 +20,7 @@
'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'
@@ -27,6 +28,7 @@
'897a82cd23ed5a4f226635dabe56ad28e533cb0949593e2b771ad7928c058bcb'
'cf17bd31f70079fe2a17958712c1a515ce83623dd3f97557a3f01d346da09f19'
'06d3404160990aaaa7b1b18f50d566f4c98a0456ffeee57d583c5bc36f26755d'
+ '0b6c2a371af1c8d581f91dfe0bd555840cf7ec9cca6ae813b29b1cd4929a5e43'
'53c59f698809598b1afcf0c0a77bfeaa3dc113a73852af0def95b284162ee2fc')
_apmdir='/usr/lib/node_modules/atom-package-manager'
@@ -37,6 +39,7 @@
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
Added: git-utils-nodejs-13.patch
===================================================================
--- git-utils-nodejs-13.patch (rev 0)
+++ git-utils-nodejs-13.patch 2019-11-13 12:54:04 UTC (rev 527149)
@@ -0,0 +1,186 @@
+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);
More information about the arch-commits
mailing list