ptrcnull/ptrcports
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

electron: upgrade to 19.0.5

Browse source
This commit is contained in:
psykose 2022-06-21 01:16:14 +00:00
parent 6c5a55f2d7
commit 75b6b8df5f
Signed by: psykose
SSH key fingerprint: SHA256:HwlGVJNLZqHoOvMtkshyGaXLkcdbEJahYMlepHFL+Uk
2 changed files with 85 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
electron/APKBUILD
View file

@ -1,8 +1,8 @@
# Maintainer: psykose <alice@ayaya.dev> # Maintainer: psykose <alice@ayaya.dev>
pkgname=electron pkgname=electron
pkgver=19.0.4 pkgver=19.0.5
pkgrel=0 pkgrel=0
_gitrev=def1ec7f991df8e47f00c6fcbe68ece68d09107a _gitrev=c0588770eac69e56c457063d29a5e4077b9a188a
_chromium=102.0.5005.115 _chromium=102.0.5005.115
_depot_tools=9b9f451addeb3ad230e9385d5e2c20cd1632c491 _depot_tools=9b9f451addeb3ad230e9385d5e2c20cd1632c491
pkgdesc="Electron" pkgdesc="Electron"
@ -171,16 +171,13 @@ prepare() {
ln -sfv /usr/bin/clang-format src/buildtools/linux64/clang-format ln -sfv /usr/bin/clang-format src/buildtools/linux64/clang-format
mkdir -p src/third_party/node/linux/node-linux-x64/bin mkdir -p src/third_party/node/linux/node-linux-x64/bin
ln -sfv /usr/bin/node src/third_party/node/linux/node-linux-x64/bin/node ln -sfv /usr/bin/node src/third_party/node/linux/node-linux-x64/bin/node
python3 src/third_party/depot_tools/download_from_google_storage.py \ python3 electron/script/apply_all_patches.py \
--no_resume --extract --no_auth --bucket chromium-nodejs \ electron/patches/config.json
-s src/third_party/node/node_modules.tar.gz.sha1
python3 src/tools/download_optimization_profile.py \ python3 src/tools/download_optimization_profile.py \
--newest_state=src/chrome/android/profiles/newest.txt \ --newest_state=src/chrome/android/profiles/newest.txt \
--local_state=src/chrome/android/profiles/local.txt \ --local_state=src/chrome/android/profiles/local.txt \
--output_name=src/chrome/android/profiles/afdo.prof \ --output_name=src/chrome/android/profiles/afdo.prof \
--gs_url_base=chromeos-prebuilt/afdo-job/llvm --gs_url_base=chromeos-prebuilt/afdo-job/llvm
python3 src/electron/script/apply_all_patches.py \
src/electron/patches/config.json
ln -sfv /usr/bin/java src/third_party/jdk/current/bin/java ln -sfv /usr/bin/java src/third_party/jdk/current/bin/java
( (
@ -318,13 +315,13 @@ build() {
use_system_libpng=true \ use_system_libpng=true \
use_system_zlib=true \ use_system_zlib=true \
use_thin_lto=false \ use_thin_lto=false \
usr_vaapi=true \ use_vaapi=true \
) )
gn gen out/Release --args="$_gn_args" gn gen out/Release --args="$_gn_args"
ninja -C out/Release electron # ninja -C out/Release electron
strip -s out/Release/electron # strip -s out/Release/electron
ninja -C out/Release electron_dist_zip ninja -C out/Release electron_dist_zip
} }
@ -376,5 +373,5 @@ cd7719c30518aeb659e9b7dc126241f897afe1a231e601271b63ba170e811a93b514c4d2a77680cd
8d11b2ba811fdd6280784bfafcef073238324941b4c33e7c9a5ccfde8506242d06e5136d697f047bab3838b43a666f1da404af7b4f4ff9a0c6bf6bdb8448e5b2 scoped-file.patch.chromium 8d11b2ba811fdd6280784bfafcef073238324941b4c33e7c9a5ccfde8506242d06e5136d697f047bab3838b43a666f1da404af7b4f4ff9a0c6bf6bdb8448e5b2 scoped-file.patch.chromium
26a8e4040e69f335a7104f42d012b9d933a40985b33a7be02add27a801c097c5a2be4c6e69faf9175ce8945210ae4c5592ecad2123ccff2beee5473194a765e3 system-node.patch.electron 26a8e4040e69f335a7104f42d012b9d933a40985b33a7be02add27a801c097c5a2be4c6e69faf9175ce8945210ae4c5592ecad2123ccff2beee5473194a765e3 system-node.patch.electron
e05180199ee1d559e4e577cedd3e589844ecf40d98a86321bf1bea5607b02eeb5feb486deddae40e1005b644550331f6b8500177aa7e79bcb3750d3c1ceb76c3 python-jinja-3.10.patch.electron e05180199ee1d559e4e577cedd3e589844ecf40d98a86321bf1bea5607b02eeb5feb486deddae40e1005b644550331f6b8500177aa7e79bcb3750d3c1ceb76c3 python-jinja-3.10.patch.electron
89a5d6ff62071247595d22a9512ef32d53ac35ab60ae7e64c198fd3dffecaaeb35134d42edb53540d9000a62007821fe8e9bb3e5602b116b1fc28eefd3fe851b vector-const.patch.electron 4594b6f270b5b8d96904bf9befef3cfe54579b27559779694337e02ae5dfb02ab25525e90d0d075b65825605ffed6cb499be564139855a9e7693c27961b247f4 vector-const.patch.electron
" "

181
electron/vector-const.patch.electron
View file

@ -1,109 +1,78 @@
--- a/electron/patches/chromium/feat_add_data_parameter_to_processsingleton.patch --- a/chrome/browser/process_singleton_posix.cc
+++ b/electron/patches/chromium/feat_add_data_parameter_to_processsingleton.patch +++ b/chrome/browser/process_singleton_posix.cc
@@ -32,7 +32,7 @@ @@ -607,7 +607,7 @@
- const base::FilePath& current_directory)>; // |reader| is for sending back ACK message.
+ base::RepeatingCallback<bool(const base::CommandLine& command_line, void HandleMessage(const std::string& current_dir,
+ const base::FilePath& current_directory, const std::vector<std::string>& argv,
-+ const std::vector<const uint8_t> additional_data)>; - const std::vector<const uint8_t> additional_data,
++ const std::vector<uint8_t> additional_data)>; + const std::vector<uint8_t> additional_data,
SocketReader* reader);
#if BUILDFLAG(IS_WIN) private:
ProcessSingleton(const std::string& program_name, @@ -664,7 +664,7 @@
@@ -73,7 +73,7 @@ void ProcessSingleton::LinuxWatcher::HandleMessage(
// |reader| is for sending back ACK message. const std::string& current_dir,
void HandleMessage(const std::string& current_dir, const std::vector<std::string>& argv,
const std::vector<std::string>& argv, - const std::vector<const uint8_t> additional_data,
-+ const std::vector<const uint8_t> additional_data, + const std::vector<uint8_t> additional_data,
++ const std::vector<uint8_t> additional_data, SocketReader* reader) {
SocketReader* reader); DCHECK(ui_task_runner_->BelongsToCurrentThread());
DCHECK(reader);
@@ -754,7 +754,7 @@
base::StringToSizeT(tokens[0], &num_args);
std::vector<std::string> command_line(tokens.begin() + 1, tokens.begin() + 1 + num_args);
private: - std::vector<const uint8_t> additional_data;
@@ -84,7 +84,7 @@ + std::vector<uint8_t> additional_data;
- const std::string& current_dir, const std::vector<std::string>& argv, if (tokens.size() >= 3 + num_args) {
+ const std::string& current_dir, size_t additional_data_size;
+ const std::vector<std::string>& argv, base::StringToSizeT(tokens[1 + num_args], &additional_data_size);
-+ const std::vector<const uint8_t> additional_data, @@ -763,7 +763,7 @@
++ const std::vector<uint8_t> additional_data, std::string(1, kTokenDelimiter));
SocketReader* reader) { const uint8_t* additional_data_bits =
DCHECK(ui_task_runner_->BelongsToCurrentThread()); reinterpret_cast<const uint8_t*>(remaining_args.c_str());
DCHECK(reader); - additional_data = std::vector<const uint8_t>(
@@ -114,7 +114,7 @@ + additional_data = std::vector<uint8_t>(
+ base::StringToSizeT(tokens[0], &num_args); additional_data_bits, additional_data_bits + additional_data_size);
+ std::vector<std::string> command_line(tokens.begin() + 1, tokens.begin() + 1 + num_args); }
+
-+ std::vector<const uint8_t> additional_data;
++ std::vector<uint8_t> additional_data;
+ if (tokens.size() >= 3 + num_args) {
+ size_t additional_data_size;
+ base::StringToSizeT(tokens[1 + num_args], &additional_data_size);
@@ -123,7 +123,7 @@
+ std::string(1, kTokenDelimiter));
+ const uint8_t* additional_data_bits =
+ reinterpret_cast<const uint8_t*>(remaining_args.c_str());
-+ additional_data = std::vector<const uint8_t>(
++ additional_data = std::vector<uint8_t>(
+ additional_data_bits, additional_data_bits + additional_data_size);
+ }
+
@@ -189,7 +189,7 @@
base::CommandLine* parsed_command_line,
- base::FilePath* current_directory) {
+ base::FilePath* current_directory,
-+ std::vector<const uint8_t>* parsed_additional_data) {
++ std::vector<uint8_t>* parsed_additional_data) {
// We should have enough room for the shortest command (min_message_size)
// and also be a multiple of wchar_t bytes. The shortest command
- // possible is L"START\0\0" (empty current directory and command line).
@@ -230,7 +230,7 @@
+ msg.substr(fourth_null + 1, fifth_null - fourth_null);
+ const uint8_t* additional_data_bytes =
+ reinterpret_cast<const uint8_t*>(additional_data.c_str());
-+ *parsed_additional_data = std::vector<const uint8_t>(additional_data_bytes,
++ *parsed_additional_data = std::vector<uint8_t>(additional_data_bytes,
+ additional_data_bytes + additional_data_length);
+
return true;
@@ -241,7 +241,7 @@
base::CommandLine parsed_command_line(base::CommandLine::NO_PROGRAM);
base::FilePath current_directory;
- if (!ParseCommandLine(cds, &parsed_command_line, &current_directory)) {
-+ std::vector<const uint8_t> additional_data;
++ std::vector<uint8_t> additional_data;
+ if (!ParseCommandLine(cds, &parsed_command_line, &current_directory, &additional_data)) {
*result = TRUE;
return true;
--- a/electron/shell/browser/api/electron_api_app.cc
+++ b/electron/shell/browser/api/electron_api_app.cc
@@ -519,10 +519,10 @@
const base::RepeatingCallback<
void(const base::CommandLine& command_line,
const base::FilePath& current_directory,
- const std::vector<const uint8_t> additional_data)>& callback,
+ const std::vector<uint8_t> additional_data)>& callback,
const base::CommandLine& cmd,
const base::FilePath& cwd,
- const std::vector<const uint8_t> additional_data) {
+ const std::vector<uint8_t> additional_data) {
// Make sure the callback is called after app gets ready.
if (Browser::Get()->is_ready()) {
callback.Run(cmd, cwd, std::move(additional_data));
@@ -1082,7 +1082,7 @@
void App::OnSecondInstance(const base::CommandLine& cmd, --- a/chrome/browser/process_singleton.h
const base::FilePath& cwd, +++ b/chrome/browser/process_singleton.h
- const std::vector<const uint8_t> additional_data) { @@ -102,7 +102,7 @@
+ const std::vector<uint8_t> additional_data) { using NotificationCallback =
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate(); base::RepeatingCallback<bool(const base::CommandLine& command_line,
v8::Locker locker(isolate); const base::FilePath& current_directory,
v8::HandleScope handle_scope(isolate); - const std::vector<const uint8_t> additional_data)>;
--- a/electron/shell/browser/api/electron_api_app.h + const std::vector<uint8_t> additional_data)>;
+++ b/electron/shell/browser/api/electron_api_app.h
@@ -195,7 +195,7 @@ #if BUILDFLAG(IS_WIN)
std::string GetLocaleCountryCode(); ProcessSingleton(const std::string& program_name,
void OnSecondInstance(const base::CommandLine& cmd, --- a/chrome/browser/process_singleton_win.cc
const base::FilePath& cwd, +++ b/chrome/browser/process_singleton_win.cc
- const std::vector<const uint8_t> additional_data); @@ -81,7 +81,7 @@
+ const std::vector<uint8_t> additional_data); bool ParseCommandLine(const COPYDATASTRUCT* cds,
bool HasSingleInstanceLock() const; base::CommandLine* parsed_command_line,
bool RequestSingleInstanceLock(gin::Arguments* args); base::FilePath* current_directory,
void ReleaseSingleInstanceLock(); - std::vector<const uint8_t>* parsed_additional_data) {
+ std::vector<uint8_t>* parsed_additional_data) {
// We should have enough room for the shortest command (min_message_size)
// and also be a multiple of wchar_t bytes. The shortest command
// possible is L"START\0\0" (empty command line, current directory,
@@ -163,7 +163,7 @@
msg.substr(fourth_null + 1, fifth_null - fourth_null);
const uint8_t* additional_data_bytes =
reinterpret_cast<const uint8_t*>(additional_data.c_str());
- *parsed_additional_data = std::vector<const uint8_t>(additional_data_bytes,
+ *parsed_additional_data = std::vector<uint8_t>(additional_data_bytes,
additional_data_bytes + additional_data_length);
return true;
@@ -187,7 +187,7 @@
base::CommandLine parsed_command_line(base::CommandLine::NO_PROGRAM);
base::FilePath current_directory;
- std::vector<const uint8_t> additional_data;
+ std::vector<uint8_t> additional_data;
if (!ParseCommandLine(cds, &parsed_command_line, &current_directory, &additional_data)) {
*result = TRUE;
return true;