Date: Saturday, November 9, 2019 @ 06:32:42 Author: tensor5 Revision: 524783
archrelease: copy trunk to community-x86_64 Added: apm/repos/community-x86_64/0001-git-utils-nodejs-12-update.patch (from rev 524782, apm/trunk/0001-git-utils-nodejs-12-update.patch) apm/repos/community-x86_64/PKGBUILD (from rev 524782, apm/trunk/PKGBUILD) apm/repos/community-x86_64/apm-nodejs-12-update.patch (from rev 524782, apm/trunk/apm-nodejs-12-update.patch) apm/repos/community-x86_64/apm.js (from rev 524782, apm/trunk/apm.js) apm/repos/community-x86_64/no-scripts.patch (from rev 524782, apm/trunk/no-scripts.patch) apm/repos/community-x86_64/use-system-npm.patch (from rev 524782, apm/trunk/use-system-npm.patch) Deleted: apm/repos/community-x86_64/0001-git-utils-nodejs-12-update.patch apm/repos/community-x86_64/PKGBUILD apm/repos/community-x86_64/apm-nodejs-12-update.patch apm/repos/community-x86_64/apm.js apm/repos/community-x86_64/no-scripts.patch apm/repos/community-x86_64/python2.patch apm/repos/community-x86_64/use-system-npm.patch ---------------------------------------+ 0001-git-utils-nodejs-12-update.patch | 546 ++++++++++++++++---------------- PKGBUILD | 235 ++++++------- apm-nodejs-12-update.patch | 56 +-- apm.js | 26 - no-scripts.patch | 32 - python2.patch | 14 use-system-npm.patch | 20 - 7 files changed, 455 insertions(+), 474 deletions(-) Deleted: 0001-git-utils-nodejs-12-update.patch =================================================================== --- 0001-git-utils-nodejs-12-update.patch 2019-11-09 06:31:44 UTC (rev 524782) +++ 0001-git-utils-nodejs-12-update.patch 2019-11-09 06:32:42 UTC (rev 524783) @@ -1,273 +0,0 @@ -From aea3de850594dba287083b6906312ff86ebf4867 Mon Sep 17 00:00:00 2001 -From: "Xl.W" <shawlix+...@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@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 - Copied: apm/repos/community-x86_64/0001-git-utils-nodejs-12-update.patch (from rev 524782, apm/trunk/0001-git-utils-nodejs-12-update.patch) =================================================================== --- 0001-git-utils-nodejs-12-update.patch (rev 0) +++ 0001-git-utils-nodejs-12-update.patch 2019-11-09 06:32:42 UTC (rev 524783) @@ -0,0 +1,273 @@ +From aea3de850594dba287083b6906312ff86ebf4867 Mon Sep 17 00:00:00 2001 +From: "Xl.W" <shawlix+...@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@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 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-11-09 06:31:44 UTC (rev 524782) +++ PKGBUILD 2019-11-09 06:32:42 UTC (rev 524783) @@ -1,120 +0,0 @@ -# Maintainer: Nicola Squartini <tens...@gmail.com> - -pkgname=apm -pkgver=2.4.3 -pkgrel=1 -pkgdesc='Atom package manager' -arch=('x86_64') -url='https://github.com/atom/apm' -license=('MIT') -depends=('libsecret' 'nodejs>=10' 'npm' 'python2') -makedepends=('git') -provides=('nodejs-atom-package-manager') -conflicts=('nodejs-atom-package-manager') -replaces=('nodejs-atom-package-manager') -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' - 'python2.patch' - 'use-system-npm.patch' - '0001-git-utils-nodejs-12-update.patch' - 'apm-nodejs-12-update.patch') -sha256sums=('cb57299f534b6b3422e17346be61b14577f062478d729fdb666af7660dcd2c40' - 'SKIP' - 'acbe133eb67d603e815605b1f3d9056a03bfc4a22a7e9db081126b289b385f77' - '897a82cd23ed5a4f226635dabe56ad28e533cb0949593e2b771ad7928c058bcb' - '621ae29f99c3fbc410a9a7dc143dd9c912ee94eaa48110ad32c40647f635e792' - 'cf17bd31f70079fe2a17958712c1a515ce83623dd3f97557a3f01d346da09f19' - '06d3404160990aaaa7b1b18f50d566f4c98a0456ffeee57d583c5bc36f26755d' - '53c59f698809598b1afcf0c0a77bfeaa3dc113a73852af0def95b284162ee2fc') - -_apmdir='/usr/lib/node_modules/atom-package-manager' - -prepare() { - rm -rf "${srcdir}"/apm-build - - cd "${srcdir}"/git-utils - git submodule update --init --recursive - git apply ../0001-git-utils-nodejs-12-update.patch - npm install standard - npm pack - - cd "${srcdir}"/apm-${pkgver} - - # Use custom launcher - rm bin/apm{,.cmd} bin/npm{,.cmd} - rm src/cli.coffee - install -m755 "${srcdir}"/apm.js bin/apm - - # Use system npm - patch -Np1 -i "${srcdir}"/use-system-npm.patch - - # Don't download binary Node - patch -Np1 -i "${srcdir}"/no-scripts.patch - rm BUNDLED_NODE_VERSION script/* - - # GYP needs Python2 - patch -Np1 -i "${srcdir}"/python2.patch - - # patch apm to support nodejs 12 - patch -Np1 -i "${srcdir}"/apm-nodejs-12-update.patch -} - -build() { - cd apm-${pkgver} - - 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) -} - -package() { - cp -r "${srcdir}"/apm-build/usr "${pkgdir}" - - cd "${pkgdir}"${_apmdir} - install -m644 "${srcdir}"/apm-${pkgver}/README.md ./ - - # Install license file - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - ln -s ../../../lib/node_modules/atom-package-manager/LICENSE.md \ - "${pkgdir}/usr/share/licenses/${pkgname}" - - # Remove occurrences of ${srcdir} - find "${pkgdir}" -name "package.json" \ - -exec sed -e "s|${srcdir}/apm-build||" \ - -e "s|${srcdir}/apm-${pkgver}|${_apmdir}|" \ - -i '{}' \; - - # Remove useless stuff - find "${pkgdir}"/usr/lib \ - -name ".*" -prune -exec rm -r '{}' \; \ - -or -name "*.a" -exec rm '{}' \; \ - -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 "*/keytar/binding.gyp" -exec rm '{}' \; \ - -or -path "*/keytar/src" -prune -exec rm -r '{}' \; \ - -or -path "*/oniguruma/binding.gyp" -exec rm '{}' \; \ - -or -path "*/oniguruma/src" -prune -exec rm -r '{}' \; \ - -or -name "appveyor.yml" -exec rm '{}' \; \ - -or -name "benchmark" -prune -exec rm -r '{}' \; \ - -or -name "binding.Makefile" -exec rm '{}' \; \ - -or -name "config.gypi" -exec rm '{}' \; \ - -or -name "deps" -prune -exec rm -r '{}' \; \ - -or -name "doc" -prune -exec rm -r '{}' \; \ - -or -name "html" -prune -exec rm -r '{}' \; \ - -or -name "Makefile" -exec rm '{}' \; \ - -or -name "man" -prune -exec rm -r '{}' \; \ - -or -name "obj.target" -prune -exec rm -r '{}' \; \ - -or -name "samples" -prune -exec rm -r '{}' \; \ - -or -name "scripts" -prune -exec rm -r '{}' \; \ - -or -name "test" -prune -exec rm -r '{}' \; \ - -or -name "tests" -prune -exec rm -r '{}' \; -} Copied: apm/repos/community-x86_64/PKGBUILD (from rev 524782, apm/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-11-09 06:32:42 UTC (rev 524783) @@ -0,0 +1,115 @@ +# Maintainer: Nicola Squartini <tens...@gmail.com> + +pkgname=apm +pkgver=2.4.3 +pkgrel=2 +pkgdesc='Atom package manager' +arch=('x86_64') +url='https://github.com/atom/apm' +license=('MIT') +depends=('libsecret' 'nodejs>=10' 'npm' 'python') +makedepends=('git') +provides=('nodejs-atom-package-manager') +conflicts=('nodejs-atom-package-manager') +replaces=('nodejs-atom-package-manager') +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' + 'apm-nodejs-12-update.patch') +sha256sums=('cb57299f534b6b3422e17346be61b14577f062478d729fdb666af7660dcd2c40' + 'SKIP' + 'acbe133eb67d603e815605b1f3d9056a03bfc4a22a7e9db081126b289b385f77' + '897a82cd23ed5a4f226635dabe56ad28e533cb0949593e2b771ad7928c058bcb' + 'cf17bd31f70079fe2a17958712c1a515ce83623dd3f97557a3f01d346da09f19' + '06d3404160990aaaa7b1b18f50d566f4c98a0456ffeee57d583c5bc36f26755d' + '53c59f698809598b1afcf0c0a77bfeaa3dc113a73852af0def95b284162ee2fc') + +_apmdir='/usr/lib/node_modules/atom-package-manager' + +prepare() { + rm -rf "${srcdir}"/apm-build + + cd "${srcdir}"/git-utils + git submodule update --init --recursive + git apply ../0001-git-utils-nodejs-12-update.patch + npm install standard + npm pack + + cd "${srcdir}"/apm-${pkgver} + + # Use custom launcher + rm bin/apm{,.cmd} bin/npm{,.cmd} + rm src/cli.coffee + install -m755 "${srcdir}"/apm.js bin/apm + + # Use system npm + patch -Np1 -i "${srcdir}"/use-system-npm.patch + + # 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 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) +} + +package() { + cp -r "${srcdir}"/apm-build/usr "${pkgdir}" + + cd "${pkgdir}"${_apmdir} + install -m644 "${srcdir}"/apm-${pkgver}/README.md ./ + + # Install license file + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + ln -s ../../../lib/node_modules/atom-package-manager/LICENSE.md \ + "${pkgdir}/usr/share/licenses/${pkgname}" + + # Remove occurrences of ${srcdir} + find "${pkgdir}" -name "package.json" \ + -exec sed -e "s|${srcdir}/apm-build||" \ + -e "s|${srcdir}/apm-${pkgver}|${_apmdir}|" \ + -i '{}' \; + + # Remove useless stuff + find "${pkgdir}"/usr/lib \ + -name ".*" -prune -exec rm -r '{}' \; \ + -or -name "*.a" -exec rm '{}' \; \ + -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 "*/keytar/binding.gyp" -exec rm '{}' \; \ + -or -path "*/keytar/src" -prune -exec rm -r '{}' \; \ + -or -path "*/oniguruma/binding.gyp" -exec rm '{}' \; \ + -or -path "*/oniguruma/src" -prune -exec rm -r '{}' \; \ + -or -name "appveyor.yml" -exec rm '{}' \; \ + -or -name "benchmark" -prune -exec rm -r '{}' \; \ + -or -name "binding.Makefile" -exec rm '{}' \; \ + -or -name "config.gypi" -exec rm '{}' \; \ + -or -name "deps" -prune -exec rm -r '{}' \; \ + -or -name "doc" -prune -exec rm -r '{}' \; \ + -or -name "html" -prune -exec rm -r '{}' \; \ + -or -name "Makefile" -exec rm '{}' \; \ + -or -name "man" -prune -exec rm -r '{}' \; \ + -or -name "obj.target" -prune -exec rm -r '{}' \; \ + -or -name "samples" -prune -exec rm -r '{}' \; \ + -or -name "scripts" -prune -exec rm -r '{}' \; \ + -or -name "test" -prune -exec rm -r '{}' \; \ + -or -name "tests" -prune -exec rm -r '{}' \; +} Deleted: apm-nodejs-12-update.patch =================================================================== --- apm-nodejs-12-update.patch 2019-11-09 06:31:44 UTC (rev 524782) +++ apm-nodejs-12-update.patch 2019-11-09 06:32:42 UTC (rev 524783) @@ -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", Copied: apm/repos/community-x86_64/apm-nodejs-12-update.patch (from rev 524782, apm/trunk/apm-nodejs-12-update.patch) =================================================================== --- apm-nodejs-12-update.patch (rev 0) +++ apm-nodejs-12-update.patch 2019-11-09 06:32:42 UTC (rev 524783) @@ -0,0 +1,28 @@ +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: apm.js =================================================================== --- apm.js 2019-11-09 06:31:44 UTC (rev 524782) +++ apm.js 2019-11-09 06:32:42 UTC (rev 524783) @@ -1,13 +0,0 @@ -#!/usr/bin/node - -"use strict"; - -process.env.ATOM_RESOURCE_PATH = process.env.ATOM_RESOURCE_PATH || "/usr/lib/atom"; - -process.env.ATOM_ELECTRON_VERSION = process.env.ATOM_ELECTRON_VERSION || require("fs").readFileSync("/usr/lib/electron4/version", "utf8"); - -process.env.npm_config_python = __dirname + "/python-interceptor.sh"; - -require("../lib/apm-cli.js").run(process.argv.slice(2), function (error) { - process.exitCode = Number(Boolean(error)); -}); Copied: apm/repos/community-x86_64/apm.js (from rev 524782, apm/trunk/apm.js) =================================================================== --- apm.js (rev 0) +++ apm.js 2019-11-09 06:32:42 UTC (rev 524783) @@ -0,0 +1,13 @@ +#!/usr/bin/node + +"use strict"; + +process.env.ATOM_RESOURCE_PATH = process.env.ATOM_RESOURCE_PATH || "/usr/lib/atom"; + +process.env.ATOM_ELECTRON_VERSION = process.env.ATOM_ELECTRON_VERSION || require("fs").readFileSync("/usr/lib/electron4/version", "utf8"); + +process.env.npm_config_python = __dirname + "/python-interceptor.sh"; + +require("../lib/apm-cli.js").run(process.argv.slice(2), function (error) { + process.exitCode = Number(Boolean(error)); +}); Deleted: no-scripts.patch =================================================================== --- no-scripts.patch 2019-11-09 06:31:44 UTC (rev 524782) +++ no-scripts.patch 2019-11-09 06:32:42 UTC (rev 524783) @@ -1,16 +0,0 @@ ---- a/package.json -+++ b/package.json -@@ -14,13 +14,6 @@ - "bin": { - "apm": "./bin/apm" - }, -- "scripts": { -- "build": "node script/check-version.js && grunt", -- "prepublish": "grunt prepublish", -- "install": "node script/postinstall.js", -- "test": "node script/check-version.js && grunt test", -- "check-version": "node version.js" -- }, - "dependencies": { - "@atom/plist": "0.4.4", - "asar-require": "0.3.0", Copied: apm/repos/community-x86_64/no-scripts.patch (from rev 524782, apm/trunk/no-scripts.patch) =================================================================== --- no-scripts.patch (rev 0) +++ no-scripts.patch 2019-11-09 06:32:42 UTC (rev 524783) @@ -0,0 +1,16 @@ +--- a/package.json ++++ b/package.json +@@ -14,13 +14,6 @@ + "bin": { + "apm": "./bin/apm" + }, +- "scripts": { +- "build": "node script/check-version.js && grunt", +- "prepublish": "grunt prepublish", +- "install": "node script/postinstall.js", +- "test": "node script/check-version.js && grunt test", +- "check-version": "node version.js" +- }, + "dependencies": { + "@atom/plist": "0.4.4", + "asar-require": "0.3.0", Deleted: python2.patch =================================================================== --- python2.patch 2019-11-09 06:31:44 UTC (rev 524782) +++ python2.patch 2019-11-09 06:32:42 UTC (rev 524783) @@ -1,14 +0,0 @@ ---- a/bin/python-interceptor.sh -+++ b/bin/python-interceptor.sh -@@ -34,9 +34,9 @@ - ARGS+=("--format=safemake.py") - fi - -- exec python "${ARGS[@]}" -+ exec python2 "${ARGS[@]}" - ;; - *) -- exec python "$@" -+ exec python2 "$@" - ;; - esac Deleted: use-system-npm.patch =================================================================== --- use-system-npm.patch 2019-11-09 06:31:44 UTC (rev 524782) +++ use-system-npm.patch 2019-11-09 06:32:42 UTC (rev 524783) @@ -1,10 +0,0 @@ ---- a/package.json -+++ b/package.json -@@ -33,7 +33,6 @@ - "keytar": "^4.0", - "mv": "2.0.0", - "ncp": "~0.5.1", -- "npm": "6.2.0", - "open": "0.0.5", - "q": "~0.9.7", - "read": "~1.0.5", Copied: apm/repos/community-x86_64/use-system-npm.patch (from rev 524782, apm/trunk/use-system-npm.patch) =================================================================== --- use-system-npm.patch (rev 0) +++ use-system-npm.patch 2019-11-09 06:32:42 UTC (rev 524783) @@ -0,0 +1,10 @@ +--- a/package.json ++++ b/package.json +@@ -33,7 +33,6 @@ + "keytar": "^4.0", + "mv": "2.0.0", + "ncp": "~0.5.1", +- "npm": "6.2.0", + "open": "0.0.5", + "q": "~0.9.7", + "read": "~1.0.5",